Skip to content
Snippets Groups Projects
Commit 5c292b3d authored by Robert Morris's avatar Robert Morris
Browse files

simplify the end of entry.S

parent 5e083578
No related branches found
No related tags found
No related merge requests found
...@@ -51,15 +51,14 @@ entry: ...@@ -51,15 +51,14 @@ entry:
orl $(CR0_PG|CR0_WP), %eax orl $(CR0_PG|CR0_WP), %eax
movl %eax, %cr0 movl %eax, %cr0
# now switch to using addresses above KERNBASE # Set up the stack pointer.
# call addresses are pc-relative so we jump though this hoop:
mov $relocated, %eax
jmp *%eax
relocated:
# Set up the stack pointer and call into C.
movl $(stack + STACK), %esp movl $(stack + STACK), %esp
call main
spin: # Call main(), which switches to executing at
jmp spin # high addresses. The indirect call is needed because
# the assembler produces a PC-relative instruction
# for a direct call.
mov $main, %eax
jmp *%eax
.comm stack, STACK .comm stack, STACK
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment