diff options
author | rtm <rtm> | 2006-08-11 13:55:18 +0000 |
---|---|---|
committer | rtm <rtm> | 2006-08-11 13:55:18 +0000 |
commit | 17a856577f9db766b8ef7099d0575d378dff5dd1 (patch) | |
tree | 53d0c687d9c9bf83d097a2171c48d04a569c5a61 /main.c | |
parent | 5be0039ce9e22f140a29e167526c64c723c5be3c (diff) | |
download | xv6-labs-17a856577f9db766b8ef7099d0575d378dff5dd1.tar.gz xv6-labs-17a856577f9db766b8ef7099d0575d378dff5dd1.tar.bz2 xv6-labs-17a856577f9db766b8ef7099d0575d378dff5dd1.zip |
init creates console, opens 0/1/2, runs sh
sh accepts 0-argument commands (like userfs)
reads from console
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -11,9 +11,8 @@ #include "spinlock.h" extern char edata[], end[]; -extern uchar _binary_user1_start[], _binary_user1_size[]; -extern uchar _binary_usertests_start[], _binary_usertests_size[]; extern uchar _binary_userfs_start[], _binary_userfs_size[]; +extern uchar _binary_init_start[], _binary_init_size[]; // CPU 0 starts running C code here. // This is called main0 not main so that it can have @@ -96,9 +95,10 @@ main0(void) p = copyproc(&proc[0]); //load_icode(p, _binary_usertests_start, (uint) _binary_usertests_size); - load_icode(p, _binary_userfs_start, (uint) _binary_userfs_size); + //load_icode(p, _binary_userfs_start, (uint) _binary_userfs_size); + load_icode(p, _binary_init_start, (uint) _binary_init_size); p->state = RUNNABLE; - cprintf("loaded userfs\n"); + cprintf("loaded init\n"); scheduler(); } |