summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2016-08-10 12:06:02 -0400
committerRobert Morris <[email protected]>2016-08-10 12:06:02 -0400
commit241188276c110127ae26978e8b18ddab0b823b9d (patch)
tree0d4a0d6aff0567b35fc66ca903ab0b140aea0420
parent3431cd492703e85909e7d5c0928ffc292ac518ec (diff)
downloadxv6-labs-241188276c110127ae26978e8b18ddab0b823b9d.tar.gz
xv6-labs-241188276c110127ae26978e8b18ddab0b823b9d.tar.bz2
xv6-labs-241188276c110127ae26978e8b18ddab0b823b9d.zip
nits
-rw-r--r--bootasm.S2
-rw-r--r--entryother.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/bootasm.S b/bootasm.S
index 91a595e..257867c 100644
--- a/bootasm.S
+++ b/bootasm.S
@@ -45,7 +45,7 @@ seta20.2:
movl %eax, %cr0
//PAGEBREAK!
- # Complete transition to 32-bit protected mode by using long jmp
+ # Complete the transition to 32-bit protected mode by using a long jmp
# to reload %cs and %eip. The segment descriptors are set up with no
# translation, so that the mapping is still the identity mapping.
ljmp $(SEG_KCODE<<3), $start32
diff --git a/entryother.S b/entryother.S
index 4a791cf..a3b6dc2 100644
--- a/entryother.S
+++ b/entryother.S
@@ -38,12 +38,12 @@ start:
orl $CR0_PE, %eax
movl %eax, %cr0
-//PAGEBREAK!
# Complete the transition to 32-bit protected mode by using a long jmp
# to reload %cs and %eip. The segment descriptors are set up with no
# translation, so that the mapping is still the identity mapping.
ljmpl $(SEG_KCODE<<3), $(start32)
+//PAGEBREAK!
.code32 # Tell assembler to generate 32-bit code now.
start32:
# Set up the protected-mode data segment registers