summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2018-10-04 09:21:10 -0400
committerFrans Kaashoek <[email protected]>2018-10-04 09:21:10 -0400
commit2fa3a8fd0557ebeb6a59c3de44332232f18ac1d9 (patch)
treed82e23c8971480ff24b63d0ff7f0322c51778ba8
parenta7ef9a40c48bdf380d75ae3d59198db418992011 (diff)
downloadxv6-labs-2fa3a8fd0557ebeb6a59c3de44332232f18ac1d9.tar.gz
xv6-labs-2fa3a8fd0557ebeb6a59c3de44332232f18ac1d9.tar.bz2
xv6-labs-2fa3a8fd0557ebeb6a59c3de44332232f18ac1d9.zip
Oops, didn't commit these changes with last commit
-rw-r--r--entry.S12
1 files changed, 6 insertions, 6 deletions
diff --git a/entry.S b/entry.S
index 2de4fc3..0aacb4c 100644
--- a/entry.S
+++ b/entry.S
@@ -66,7 +66,7 @@ start:
call loadgdt
# 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:
# Initialize page table.
@@ -75,7 +75,7 @@ start32:
movl $V2P_WO(start64), %eax
# Enter 64-bit mode.
- ljmp $KCSEG, $V2P_WO(tramp64) // code64 segment selector
+ ljmp $SEG_KCODE, $V2P_WO(tramp64) // code64 segment selector
.code64
start64:
@@ -92,12 +92,12 @@ start64:
.global apstart
apstart:
call loadgdt
- ljmp $KCSEG32, $V2P_WO(apstart32) // code32 segment selector
+ ljmp $SEG_KCODE32, $V2P_WO(apstart32) // code32 segment selector
apstart32:
call init32e
movl $V2P_WO(apstart64), %eax
- ljmp $KCSEG, $V2P_WO(tramp64) // code64 segment selector
+ ljmp $SEG_KCODE, $V2P_WO(tramp64) // code64 segment selector
.code64
apstart64:
@@ -107,7 +107,7 @@ apstart64:
movq %rax, %rsp
movq $0, %rbp
call apmain
-1: jmp 1b
+ jmp .
.code64
tramp64:
@@ -212,7 +212,7 @@ loadgdt:
lgdt 2(%esp)
addl $8, %esp
- movl $KDSEG, %eax // data segment selector
+ movl $SEG_KDATA, %eax // data segment selector
movw %ax, %ds
movw %ax, %es
movw %ax, %ss