oops

diff --git a/asm.h b/asm.h
new file mode 100644 (file)
index 0000000..5986ec7
--- /dev/null
+++ b/asm.h
@@ -0,0 +1,14 @@
+#define SEG_NULL                                               \
+       .word 0, 0;                                             \
+       .byte 0, 0, 0, 0
+#define SEG(type,base,lim)                                     \
+       .word (((lim) >> 12) & 0xffff), ((base) & 0xffff);      \
+       .byte (((base) >> 16) & 0xff), (0x90 | (type)),         \
+               (0xC0 | (((lim) >> 28) & 0xf)), (((base) >> 24) & 0xff)
+
+#define STA_X          0x8         // Executable segment
+#define STA_E          0x4         // Expand down (non-executable segments)
+#define STA_C          0x4         // Conforming code segment (executable only)
+#define STA_W          0x2         // Writeable (non-executable segments)
+#define STA_R          0x2         // Readable (executable segments)
+#define STA_A          0x1         // Accessed

diff --git a/main.c b/main.c
index 0a43b8537380a476c93a2aca36e6819b46a72147..5b172976b99cd682812992e3f5ecc65e47929213 100644 (file)
--- a/main.c
+++ b/main.c
@@ -34,6 +34,8 @@ main()
   tinit(); // traps and interrupts
   pic_init();
 
+  while (1);
+
   // create fake process zero
   p = &proc[0];
   curproc = p;