summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2020-08-15 05:46:32 -0400
committerRobert Morris <[email protected]>2020-08-15 05:46:32 -0400
commitb154cf091c57db1b412a022490c0cec009b4cf6b (patch)
tree6a54ca874f00de6f66751ee4c7299cfb322b18c7 /kernel
parent4a87a0ae8bc4a186842fb5f57454412de56f52bc (diff)
downloadxv6-labs-b154cf091c57db1b412a022490c0cec009b4cf6b.tar.gz
xv6-labs-b154cf091c57db1b412a022490c0cec009b4cf6b.tar.bz2
xv6-labs-b154cf091c57db1b412a022490c0cec009b4cf6b.zip
x
Diffstat (limited to 'kernel')
-rw-r--r--kernel/entry.S18
1 files changed, 6 insertions, 12 deletions
diff --git a/kernel/entry.S b/kernel/entry.S
index 62fe1f2..b72ddbc 100644
--- a/kernel/entry.S
+++ b/kernel/entry.S
@@ -1,14 +1,8 @@
- # qemu -kernel starts at 0x1000. the instructions
- # there seem to be provided by qemu, as if it
- # were a ROM. the code at 0x1000 jumps to
- # 0x80000000, the _start function here,
- # in machine mode. each CPU starts here.
-.section .data
-.globl stack0
+ # qemu -kernel loads the kernel at 0x80000000
+ # and causes each CPU to jump there.
+ # kernel.ld causes the following code to
+ # be placed at 0x80000000.
.section .text
-.globl start
-.section .text
-.globl _entry
_entry:
# set up a stack for C.
# stack0 is declared in start.c,
@@ -22,5 +16,5 @@ _entry:
add sp, sp, a0
# jump to start() in start.c
call start
-junk:
- j junk
+spin:
+ j spin