summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrnordier <rnordier@FreeBSD.org>1999-01-13 23:30:07 +0000
committerrnordier <rnordier@FreeBSD.org>1999-01-13 23:30:07 +0000
commit6edc8726f901e1629c7f039e8e990a37fe000a73 (patch)
tree7cd7fadc7b1afb0d237e3fd3400625b1e8dbd6d8
parent5052329e9614f52943abb3b66d3fd17c5abeebd4 (diff)
downloadFreeBSD-src-6edc8726f901e1629c7f039e8e990a37fe000a73.zip
FreeBSD-src-6edc8726f901e1629c7f039e8e990a37fe000a73.tar.gz
In the event of a disk error, boot2 is expecting an error
code to be returned: give it one
-rw-r--r--sys/boot/i386/boot2/boot1.S12
-rw-r--r--sys/boot/i386/boot2/boot1.s12
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/boot/i386/boot2/boot1.S b/sys/boot/i386/boot2/boot1.S
index 80bd519..3161b74 100644
--- a/sys/boot/i386/boot2/boot1.S
+++ b/sys/boot/i386/boot2/boot1.S
@@ -13,7 +13,7 @@
# purpose.
#
-# $Id: boot1.s,v 1.6 1998/11/11 08:56:17 rnordier Exp $
+# $Id: boot1.s,v 1.7 1999/01/10 13:29:51 peter Exp $
.set MEM_REL,0x700 # Relocation address
.set MEM_ARG,0x900 # Arguments
@@ -45,11 +45,11 @@ xread: pushl %ecx # Set
pushl %ebx # buffer
pushl %edx # Set count:drive
callwi(read) # Read from disk
- popl %edx # Pop
- popl %ebx # all
- popl %es # registers
- popl %eax # we
- popl %ecx # pushed
+ popl %edx # Pop all
+ popl %ebx # registers
+ popl %es # pushed, but
+ popl %ecx # preserve
+ popl %ecx # AX
lret # To far caller
# Bootstrap
diff --git a/sys/boot/i386/boot2/boot1.s b/sys/boot/i386/boot2/boot1.s
index 80bd519..3161b74 100644
--- a/sys/boot/i386/boot2/boot1.s
+++ b/sys/boot/i386/boot2/boot1.s
@@ -13,7 +13,7 @@
# purpose.
#
-# $Id: boot1.s,v 1.6 1998/11/11 08:56:17 rnordier Exp $
+# $Id: boot1.s,v 1.7 1999/01/10 13:29:51 peter Exp $
.set MEM_REL,0x700 # Relocation address
.set MEM_ARG,0x900 # Arguments
@@ -45,11 +45,11 @@ xread: pushl %ecx # Set
pushl %ebx # buffer
pushl %edx # Set count:drive
callwi(read) # Read from disk
- popl %edx # Pop
- popl %ebx # all
- popl %es # registers
- popl %eax # we
- popl %ecx # pushed
+ popl %edx # Pop all
+ popl %ebx # registers
+ popl %es # pushed, but
+ popl %ecx # preserve
+ popl %ecx # AX
lret # To far caller
# Bootstrap
OpenPOWER on IntegriCloud