ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Oops, didn't commit these changes with last commit

Browse source
This commit is contained in:
Frans Kaashoek 2018-10-04 09:21:10 -04:00
parent a7ef9a40c4
commit 2fa3a8fd05
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
entry.S
View file

@ -66,7 +66,7 @@ start:
call loadgdt call loadgdt
# Enter new 32-bit code segment (already in 32-bit mode). # Enter new 32-bit code segment (already in 32-bit mode).
ljmp $KCSEG32, $V2P_WO(start32) // code32 segment selector ljmp $SEG_KCODE32, $V2P_WO(start32) // code32 segment selector
start32: start32:
# Initialize page table. # Initialize page table.
@ -75,7 +75,7 @@ start32:
movl $V2P_WO(start64), %eax movl $V2P_WO(start64), %eax
# Enter 64-bit mode. # Enter 64-bit mode.
ljmp $KCSEG, $V2P_WO(tramp64) // code64 segment selector ljmp $SEG_KCODE, $V2P_WO(tramp64) // code64 segment selector
.code64 .code64
start64: start64:
@ -92,12 +92,12 @@ start64:
.global apstart .global apstart
apstart: apstart:
call loadgdt call loadgdt
ljmp $KCSEG32, $V2P_WO(apstart32) // code32 segment selector ljmp $SEG_KCODE32, $V2P_WO(apstart32) // code32 segment selector
apstart32: apstart32:
call init32e call init32e
movl $V2P_WO(apstart64), %eax movl $V2P_WO(apstart64), %eax
ljmp $KCSEG, $V2P_WO(tramp64) // code64 segment selector ljmp $SEG_KCODE, $V2P_WO(tramp64) // code64 segment selector
.code64 .code64
apstart64: apstart64:
@ -107,7 +107,7 @@ apstart64:
movq %rax, %rsp movq %rax, %rsp
movq $0, %rbp movq $0, %rbp
call apmain call apmain
1: jmp 1b jmp .
.code64 .code64
tramp64: tramp64:
@ -212,7 +212,7 @@ loadgdt:
lgdt 2(%esp) lgdt 2(%esp)
addl $8, %esp addl $8, %esp
movl $KDSEG, %eax // data segment selector movl $SEG_KDATA, %eax // data segment selector
movw %ax, %ds movw %ax, %ds
movw %ax, %es movw %ax, %es
movw %ax, %ss movw %ax, %ss