summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-06-22 15:28:09 +0000
committerkaashoek <kaashoek>2006-06-22 15:28:09 +0000
commit8352b998019565946b8f5b3b8f72175c5076efec (patch)
treef5d4fde6840dd8868266e4880bdaa5c32c4d4745
parent21a88fd487177841c882d9017bd9f4476801c6f6 (diff)
downloadxv6-labs-8352b998019565946b8f5b3b8f72175c5076efec.tar.gz
xv6-labs-8352b998019565946b8f5b3b8f72175c5076efec.tar.bz2
xv6-labs-8352b998019565946b8f5b3b8f72175c5076efec.zip
oops
-rw-r--r--asm.h14
-rw-r--r--main.c2
2 files changed, 16 insertions, 0 deletions
diff --git a/asm.h b/asm.h
new file mode 100644
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 0a43b85..5b17297 100644
--- 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;