From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MQsrQ-0002XG-HL for mharc-grub-devel@gnu.org; Tue, 14 Jul 2009 21:00:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MQsrO-0002Uc-4B for grub-devel@gnu.org; Tue, 14 Jul 2009 21:00:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MQsrJ-0002Pa-P0 for grub-devel@gnu.org; Tue, 14 Jul 2009 21:00:37 -0400 Received: from [199.232.76.173] (port=50008 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MQsrJ-0002PV-GM for grub-devel@gnu.org; Tue, 14 Jul 2009 21:00:33 -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 1MQsrI-0004vB-Tv for grub-devel@gnu.org; Tue, 14 Jul 2009 21:00:33 -0400 Received: from unknown (HELO smtprelay2.cesmail.net) ([192.168.1.112]) by c60.cesmail.net with ESMTP; 14 Jul 2009 21:00:31 -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 8737234C6D for ; Tue, 14 Jul 2009 21:09:56 -0400 (EDT) To: grub-devel@gnu.org From: Pavel Roskin Date: Tue, 14 Jul 2009 21:00:30 -0400 Message-ID: <20090715010030.17865.52419.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 3/7] Eliminate kernel_segment 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:38 -0000 ChangeLog: * boot/i386/pc/boot.S (kernel_segment): Remove. (copy_buffer): Copy to 0x0000:0x8000, not to 0x0800:0x0000. --- boot/i386/pc/boot.S | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S index e5685dc..15d02e5 100644 --- a/boot/i386/pc/boot.S +++ b/boot/i386/pc/boot.S @@ -94,8 +94,6 @@ cylinder_start: kernel_address: .word GRUB_BOOT_MACHINE_KERNEL_ADDR -kernel_segment: - .word GRUB_BOOT_MACHINE_KERNEL_SEG . = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR kernel_sector: @@ -372,13 +370,6 @@ setup_sectors: movw %es, %bx copy_buffer: -#ifdef APPLE_CC - kernel_segment_abs = ABS (kernel_segment) - movw (kernel_segment_abs), %es -#else - movw ABS(kernel_segment), %es -#endif - /* * We need to save %cx and %si because the startup code in * kernel uses them without initializing them. @@ -389,7 +380,8 @@ copy_buffer: movw $0x100, %cx movw %bx, %ds xorw %si, %si - xorw %di, %di + movw $GRUB_BOOT_MACHINE_KERNEL_ADDR, %di + movw %si, %es cld