summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--README.md4
-rw-r--r--userspace/Makefile1
-rw-r--r--userspace/foolshell.c2
-rw-r--r--userspace/sys/Makefile4
5 files changed, 11 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3587e4e..c090265 100644
--- a/Makefile
+++ b/Makefile
@@ -155,6 +155,9 @@ run-bochs: all
run-qemu: all
qemu-system-i386 $(FOOLOS)
+run-qemu-debug: all
+ qemu-system-i386 -s -S $(FOOLOS)
+
run: run-bochs
newrun: clean run
diff --git a/README.md b/README.md
index 9ef5c7c..b4b0cbd 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ Todos
-----
* Implement Multiboot Spec.
-* Support some TTY standard
+* Support some TTY standard (xterm)
* Real User space
* /dev/console
* /dev/kb
@@ -99,6 +99,8 @@ Issues
* implement posix(?) getdents instead of our own readdir.
* Turning on some gcc optimizations breaks the kernel
* Assumed support for VESA mode 0x114 with linear addressing.
+* fixed size of process images!
+* ncurses tput crashes!?
Organization
diff --git a/userspace/Makefile b/userspace/Makefile
index 2434008..86c221e 100644
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -6,6 +6,7 @@ CFLAGS+=-I..
CFLAGS+=-w
CFLAGS+=-std=gnu11
CFLAGS+=-O3
+CFLAGS+=-g
PROGS=foolshell ls simple brainfuck add checker clear task1 task2 init
diff --git a/userspace/foolshell.c b/userspace/foolshell.c
index d44204c..3a87158 100644
--- a/userspace/foolshell.c
+++ b/userspace/foolshell.c
@@ -229,7 +229,7 @@ int process(char *buf)
exit(1);
}
int status;
- wait(&status);
+ if(strcmp(token[1],"branch"))wait(&status);
}
return 0;
diff --git a/userspace/sys/Makefile b/userspace/sys/Makefile
index e341312..5e217fa 100644
--- a/userspace/sys/Makefile
+++ b/userspace/sys/Makefile
@@ -1,5 +1,7 @@
CC=i686-foolos-gcc
-CFLAGS=-I../..
+
+CFLAGS=
+CFLAGS+=-I../..
CFLAGS+=-w