summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2006-09-28 16:30:36 +0000
committerjhb <jhb@FreeBSD.org>2006-09-28 16:30:36 +0000
commit80c5933f1c49fa9829d68e04a34af3d5e621e2c2 (patch)
tree5f9754e26eb524f2878f960c561b2af3a4f45f33 /sys/boot
parent2ab556f91bd98940f77b002cd097890ea6dda4d0 (diff)
downloadFreeBSD-src-80c5933f1c49fa9829d68e04a34af3d5e621e2c2.zip
FreeBSD-src-80c5933f1c49fa9829d68e04a34af3d5e621e2c2.tar.gz
A couple of simple tweaks that trim BTX by 6 bytes. Since BTX is
16-byte aligned within boot2 however, this actually trims boot2 by 16 bytes.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/btx/btx/btx.S5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/boot/i386/btx/btx/btx.S b/sys/boot/i386/btx/btx/btx.S
index 569ba9d..7d2ee05 100644
--- a/sys/boot/i386/btx/btx/btx.S
+++ b/sys/boot/i386/btx/btx/btx.S
@@ -208,7 +208,7 @@ init.7: stosl # Set entry
#ifdef PAGING
or $0x80000001,%eax # mode and enable paging
#else
- or $0x01,%eax # mode
+ inc %ax # mode
#endif
mov %eax,%cr0 #
ljmp $SEL_SCODE,$init.8 # To 32-bit code
@@ -919,8 +919,7 @@ dump.2: testb $DMP_MEM,%ch # Dump memory?
dump.3: lodsl # Set offset
xchgl %eax,%edx # Save
lodsl # Get segment
- shll $0x4,%eax # * 0x10
- addl %edx,%eax # + offset
+ leal (%edx,%eax,4),%eax # * 0x10 + offset
xchgl %eax,%esi # Set pointer
dump.4: movb $2,%dl # Num lines
dump.4a: movb $0x10,%cl # Bytes to dump
OpenPOWER on IntegriCloud