From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JEs6c-0000FI-Kl for mharc-grub-devel@gnu.org; Tue, 15 Jan 2008 15:09:54 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JEs6b-0000FD-0H for grub-devel@gnu.org; Tue, 15 Jan 2008 15:09:53 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JEs6Y-0000F0-Kr for grub-devel@gnu.org; Tue, 15 Jan 2008 15:09:51 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEs6Y-0000Ex-F6 for grub-devel@gnu.org; Tue, 15 Jan 2008 15:09:50 -0500 Received: from aybabtu.com ([69.60.117.155]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JEs6Y-00046g-44 for grub-devel@gnu.org; Tue, 15 Jan 2008 15:09:50 -0500 Received: from [192.168.10.6] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1JEs6W-0005Ys-Th for grub-devel@gnu.org; Tue, 15 Jan 2008 21:09:49 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1JEs5A-0000lp-8z for grub-devel@gnu.org; Tue, 15 Jan 2008 21:08:24 +0100 Date: Tue, 15 Jan 2008 21:08:24 +0100 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20080115200824.GA2881@thorin> References: <20080113191251.GA9050@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="opJtzjQTFsWo+cga" Content-Disposition: inline In-Reply-To: <20080113191251.GA9050@thorin> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: help with powerpc asm (moving grub_ieee1275_entry_fn initialization to crt0.S) X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2008 20:09:53 -0000 --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Here's an incomplete (missing powerpc & sparc) version of the patch that would sanitize this function call. In the meantime i386 just puts the value in %ecx (third argument) to match what powerpc is doing. -- Robert Millan I know my rights; I want my phone call! What use is a phone call, if you are unable to speak? (as seen on /.) --opJtzjQTFsWo+cga Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="ieee1275_statup.diff" diff -urp grub2/kern/i386/ieee1275/startup.S ieee1275_statup/kern/i386/ieee1275/startup.S --- grub2/kern/i386/ieee1275/startup.S 2008-01-15 21:05:44.000000000 +0100 +++ ieee1275_statup/kern/i386/ieee1275/startup.S 2008-01-15 21:06:18.000000000 +0100 @@ -34,5 +34,5 @@ start: _start: - movl %eax, %ecx + movl %eax, EXT_C(grub_ieee1275_entry_fn) jmp EXT_C(cmain) diff -urp grub2/kern/powerpc/ieee1275/cmain.c ieee1275_statup/kern/powerpc/ieee1275/cmain.c --- grub2/kern/powerpc/ieee1275/cmain.c 2008-01-15 17:13:55.000000000 +0100 +++ ieee1275_statup/kern/powerpc/ieee1275/cmain.c 2008-01-15 21:06:38.000000000 +0100 @@ -102,12 +102,9 @@ grub_ieee1275_find_options (void) } } -void cmain (uint32_t r3, uint32_t r4, uint32_t r5); void -cmain (UNUSED uint32_t r3, UNUSED uint32_t r4, uint32_t r5) +cmain (void) { - grub_ieee1275_entry_fn = (int (*)(void *)) r5; - grub_ieee1275_finddevice ("/chosen", &grub_ieee1275_chosen); grub_ieee1275_find_options (); --opJtzjQTFsWo+cga--