Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NfAvn-0007OC-IV for mharc-grub-devel@gnu.org; Wed, 10 Feb 2010 06:40:31 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfAvk-0007MO-1T for grub-devel@gnu.org; Wed, 10 Feb 2010 06:40:28 -0500 Received: from [199.232.76.173] (port=42108 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfAvj-0007Li-6Y for grub-devel@gnu.org; Wed, 10 Feb 2010 06:40:27 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfAvg-00047s-UI for grub-devel@gnu.org; Wed, 10 Feb 2010 06:40:26 -0500 Received: from smarthost03.mail.zen.net.uk ([212.23.3.142]:47973) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfAvf-00047K-Ir for grub-devel@gnu.org; Wed, 10 Feb 2010 06:40:23 -0500 Received: from [82.69.40.219] (helo=riva.pelham.vpn.ucam.org) by smarthost03.mail.zen.net.uk with esmtp (Exim 4.63) (envelope-from ) id 1NfAve-00025k-0a; Wed, 10 Feb 2010 11:40:22 +0000 Received: from cjwatson by riva.pelham.vpn.ucam.org with local (Exim 3.36 #1 (Debian)) id 1NfAvd-0004w8-00; Wed, 10 Feb 2010 11:40:21 +0000 Date: Wed, 10 Feb 2010 11:40:21 +0000 From: Colin Watson To: grub-devel@gnu.org Message-ID: <20100210114021.GF4409@riva.ucam.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Originating-Smarthost03-IP: [82.69.40.219] X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Colin King Subject: [PATCH] Trim a few bytes from boot.img X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2010 11:40:28 -0000 A while back, I was looking for eight extra bytes in boot.img so that I could put a keyboard modifier check in there, allowing me to avoid printing "GRUB loading" by default, which my boss^3 has been asking me for, without crippling debugging in the process. I knew I could find a few by shortening error messages (e.g. "Hard Disk" -> "HD"), but I asked Colin King, one of our kernel hackers, if he could find a nicer approach. He came up with a patch which I massaged a bit into this. What do people think? It seems as if it might be generally useful to have a bit of spare space in here, although I would certainly appreciate it if people didn't use it all at once. ;-) 2010-02-10 Colin King 2010-02-10 Colin Watson Shrink the pre-partition-table part of boot.img by eight bytes. * boot/i386/pc/boot.S (ERR): New macro. (chs_mode): Use ERR. (geometry_error): Likewise. (hd_probe_error): Remove. This is only used once, so we wrwite it inline instead. (read_error): Instead of printing read_error_string, just set up %si and fall through to ... (error_message): ... this new function, also used by ERR. === modified file 'boot/i386/pc/boot.S' --- boot/i386/pc/boot.S 2010-01-03 22:05:07 +0000 +++ boot/i386/pc/boot.S 2010-02-10 11:32:08 +0000 @@ -27,6 +27,7 @@ /* Print message string */ #define MSG(x) movw $x, %si; call LOCAL(message) +#define ERR(x) movw $x, %si; jmp LOCAL(error_message) .file "boot.S" @@ -233,7 +234,7 @@ LOCAL(chs_mode): jz LOCAL(floppy_probe) /* Nope, we definitely have a hard disk, and we're screwed. */ - jmp LOCAL(hd_probe_error) + ERR(hd_probe_error_string) LOCAL(final_init): /* set the mode to zero */ @@ -360,22 +361,15 @@ LOCAL(copy_buffer): * BIOS Geometry translation error (past the end of the disk geometry!). */ LOCAL(geometry_error): - MSG(geometry_error_string) - jmp LOCAL(general_error) - -/* - * Disk probe failure. - */ -LOCAL(hd_probe_error): - MSG(hd_probe_error_string) - jmp LOCAL(general_error) + ERR(geometry_error_string) /* * Read error on the disk. */ LOCAL(read_error): - MSG(read_error_string) - + movw $read_error_string, %si +LOCAL(error_message): + call LOCAL(message) LOCAL(general_error): MSG(general_error_string) Thanks, -- Colin Watson [cjwatson@ubuntu.com]