summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386/boot2
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2012-11-08 23:21:02 +0000
committerdim <dim@FreeBSD.org>2012-11-08 23:21:02 +0000
commit9f61746f5a7c133c4334b42306477cf36abda421 (patch)
tree93b5c0e3363e7333a4a3e00c54d5fe05f2cd4e76 /sys/boot/i386/boot2
parent41840cb53c49620ab38720341ecd2f8fc6975c98 (diff)
downloadFreeBSD-src-9f61746f5a7c133c4334b42306477cf36abda421.zip
FreeBSD-src-9f61746f5a7c133c4334b42306477cf36abda421.tar.gz
Shrink boot2 by 8 bytes, by eliminating some unneeded instructions in
sio.S. This is not particularly needed for head right now, but it is intended to merge to stable/9, to fix boot2 build with clang there. Reviewed by: avg MFC after: 3 days
Diffstat (limited to 'sys/boot/i386/boot2')
-rw-r--r--sys/boot/i386/boot2/sio.S6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/boot/i386/boot2/sio.S b/sys/boot/i386/boot2/sio.S
index f2cd5c7..ca9d0a2 100644
--- a/sys/boot/i386/boot2/sio.S
+++ b/sys/boot/i386/boot2/sio.S
@@ -40,13 +40,11 @@ sio_init: pushl %eax
movb $0x3,%al # Set RTS,
outb %al,(%dx) # DTR
incl %edx # Line status reg
- call sio_flush
- ret
+ # Fallthrough
/* int sio_flush(void) */
-sio_flush: xorl %eax,%eax # Return value
- xorl %ecx,%ecx # Timeout
+sio_flush: xorl %ecx,%ecx # Timeout
movb $0x80,%ch # counter
sio_flush.1: call sio_ischar # Check for character
jz sio_flush.2 # Till none
OpenPOWER on IntegriCloud