summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'main.c')
-rw-r--r--main.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/main.c b/main.c
index a1c08c9..7c3677e 100644
--- a/main.c
+++ b/main.c
@@ -14,8 +14,8 @@ main()
cprintf("\nxV6\n\n");
- // initialize physical memory allocator
- kinit();
+ kinit(); // physical memory allocator
+ tinit(); // traps and interrupts
// create fake process zero
p = &proc[0];
@@ -33,6 +33,10 @@ main()
p = newproc(&proc[0]);
// xxx copy instructions to p->mem
+ p->mem[0] = 0x90; // nop
+ p->mem[1] = 0x90; // nop
+ p->mem[2] = 0x42; // inc %edx
+ p->mem[3] = 0x42; // inc %edx
p->tf->tf_eip = 0;
p->tf->tf_esp = p->sz;