From 09b1cdbdb539e1597530544e08796cadb69125c5 Mon Sep 17 00:00:00 2001 From: Yoshihiro Takahashi Date: Wed, 3 Nov 1999 08:32:03 +0000 Subject: [PATCH] Sync with sys/boot/i386/btx/btx/btx.s revision 1.13. --- sys/boot/pc98/btx/btx/btx.S | 5 +++++ sys/boot/pc98/btx/btx/btx.s | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sys/boot/pc98/btx/btx/btx.S b/sys/boot/pc98/btx/btx/btx.S index 75b2942ce283..944c1aa167b4 100644 --- a/sys/boot/pc98/btx/btx/btx.S +++ b/sys/boot/pc98/btx/btx/btx.S @@ -211,8 +211,13 @@ ifdef(`PAGING',` ') lgdtwm(gdtdesc) # Set GDT movl %cr0,%eax # Switch to +ifdef(`PAGING',` + o16 # protected mode + orl $0x80000001,%eax # and enable paging +',` o16 # protected mode orl $0x01,%eax # +') movl %eax,%cr0 # jmpfwi(SEL_SCODE,init.8) # To 32-bit code init.8: xorl %ecx,%ecx # Zero diff --git a/sys/boot/pc98/btx/btx/btx.s b/sys/boot/pc98/btx/btx/btx.s index 75b2942ce283..944c1aa167b4 100644 --- a/sys/boot/pc98/btx/btx/btx.s +++ b/sys/boot/pc98/btx/btx/btx.s @@ -211,8 +211,13 @@ ifdef(`PAGING',` ') lgdtwm(gdtdesc) # Set GDT movl %cr0,%eax # Switch to +ifdef(`PAGING',` + o16 # protected mode + orl $0x80000001,%eax # and enable paging +',` o16 # protected mode orl $0x01,%eax # +') movl %eax,%cr0 # jmpfwi(SEL_SCODE,init.8) # To 32-bit code init.8: xorl %ecx,%ecx # Zero