aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nordier <rnordier@FreeBSD.org>1999-01-13 23:30:07 +0000
committerRobert Nordier <rnordier@FreeBSD.org>1999-01-13 23:30:07 +0000
commit05c7fdda189c657dbe39522bf246c129f1724809 (patch)
tree1fe3acb7a81b7363bdf77de65260ba08fe6be328
parent967e682830da730786e2e58e4559557c7d5998af (diff)
downloadsrc-05c7fdda189c657dbe39522bf246c129f1724809.tar.gz
src-05c7fdda189c657dbe39522bf246c129f1724809.zip
In the event of a disk error, boot2 is expecting an error
code to be returned: give it one
Notes
Notes: svn path=/head/; revision=42638
-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 80bd519da885..3161b748b8e9 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 80bd519da885..3161b748b8e9 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