diff options
| author | Robert Morris <rtm@csail.mit.edu> | 2019-07-23 14:31:12 -0400 |
|---|---|---|
| committer | Robert Morris <rtm@csail.mit.edu> | 2019-07-23 14:31:12 -0400 |
| commit | 936afc6e1a2ac7149d956b000373f248d49d5196 (patch) | |
| tree | 95540ae5029133da4e9ba3411a440124fc2774dc | |
| parent | 54178ad94d758e557bfa369b7f137e2844e030e1 (diff) | |
| download | xv6-labs-936afc6e1a2ac7149d956b000373f248d49d5196.tar.gz xv6-labs-936afc6e1a2ac7149d956b000373f248d49d5196.tar.bz2 xv6-labs-936afc6e1a2ac7149d956b000373f248d49d5196.zip | |
mstart -> start
| -rw-r--r-- | kernel/entry.S | 6 | ||||
| -rw-r--r-- | kernel/main.c | 4 | ||||
| -rw-r--r-- | kernel/start.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/kernel/entry.S b/kernel/entry.S index 97eaf11..ef5a56a 100644 --- a/kernel/entry.S +++ b/kernel/entry.S @@ -6,7 +6,7 @@ .section .data .globl stack0 .section .text -.globl mstart +.globl start .section .text .globl _entry _entry: @@ -20,7 +20,7 @@ _entry: addi a1, a1, 1 mul a0, a0, a1 add sp, sp, a0 - # jump to mstart() in start.c - call mstart + # jump to start() in start.c + call start junk: j junk diff --git a/kernel/main.c b/kernel/main.c index f3c5ea6..17bd5d1 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -6,9 +6,7 @@ volatile static int started = 0; -// Bootstrap processor starts running C code here. -// Allocate a real stack and switch to it, first -// doing some setup required for memory allocator to work. +// start() jumps here in supervisor mode on all CPUs. void main() { diff --git a/kernel/start.c b/kernel/start.c index c4689dc..ea896eb 100644 --- a/kernel/start.c +++ b/kernel/start.c @@ -17,7 +17,7 @@ extern void machinevec(); // entry.S jumps here in machine mode on stack0. void -mstart() +start() { // set M Previous Privilege mode to Supervisor, for mret. unsigned long x = r_mstatus(); |