From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MQsrV-0002bN-Mw for mharc-grub-devel@gnu.org; Tue, 14 Jul 2009 21:00:45 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MQsrT-0002aU-TB for grub-devel@gnu.org; Tue, 14 Jul 2009 21:00:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MQsrP-0002Vq-99 for grub-devel@gnu.org; Tue, 14 Jul 2009 21:00:43 -0400 Received: from [199.232.76.173] (port=50011 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MQsrO-0002VW-W3 for grub-devel@gnu.org; Tue, 14 Jul 2009 21:00:39 -0400 Received: from c60.cesmail.net ([216.154.195.49]:26569) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1MQsrO-0004vB-Bi for grub-devel@gnu.org; Tue, 14 Jul 2009 21:00:38 -0400 Received: from unknown (HELO smtprelay2.cesmail.net) ([192.168.1.112]) by c60.cesmail.net with ESMTP; 14 Jul 2009 21:00:38 -0400 Received: from mj.roinet.com (static-72-92-88-10.phlapa.fios.verizon.net [72.92.88.10]) by smtprelay2.cesmail.net (Postfix) with ESMTPSA id D72E534C6D for ; Tue, 14 Jul 2009 21:10:02 -0400 (EDT) To: grub-devel@gnu.org From: Pavel Roskin Date: Tue, 14 Jul 2009 21:00:36 -0400 Message-ID: <20090715010036.17865.76458.stgit@mj.roinet.com> In-Reply-To: <20090715010017.17865.58915.stgit@mj.roinet.com> References: <20090715010017.17865.58915.stgit@mj.roinet.com> User-Agent: StGit/0.15-rc1-4-g4ce8 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [PATCH 4/7] Eliminate kernel_address 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: Wed, 15 Jul 2009 01:00:44 -0000 ChangeLog: * boot/i386/pc/boot.S: Eliminate kernel_address. Add .bss section corresponding to the loader. Use relative jump to the loader. --- boot/i386/pc/boot.S | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S index 15d02e5..9323cb9 100644 --- a/boot/i386/pc/boot.S +++ b/boot/i386/pc/boot.S @@ -92,9 +92,6 @@ cylinder_start: * End of BIOS parameter block. */ -kernel_address: - .word GRUB_BOOT_MACHINE_KERNEL_ADDR - . = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR kernel_sector: .long 1, 0 @@ -392,12 +389,7 @@ copy_buffer: popa /* boot kernel */ -#ifdef APPLE_CC - kernel_address_abs = ABS (kernel_address) - jmp *(kernel_address_abs) -#else - jmp *(kernel_address) -#endif + jmp kernel_entry /* END OF MAIN LOOP */ @@ -532,3 +524,7 @@ fd_probe_error_string: .asciz "Floppy" /* the last 2 bytes in the sector 0 contain the signature */ .word GRUB_BOOT_MACHINE_SIGNATURE + + .bss + . = . + 0x200 +kernel_entry: