From 56eaeab4999ae23b7791c375b962816e033f10a9 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 8 Nov 2012 23:21:02 +0000 Subject: [PATCH] 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 --- sys/boot/i386/boot2/sio.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/boot/i386/boot2/sio.S b/sys/boot/i386/boot2/sio.S index f2cd5c79f4d..ca9d0a2406a 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