All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pavel Roskin <proski@gnu.org>
To: grub-devel@gnu.org
Subject: [PATCH 4/7] Eliminate kernel_address
Date: Tue, 14 Jul 2009 21:00:36 -0400	[thread overview]
Message-ID: <20090715010036.17865.76458.stgit@mj.roinet.com> (raw)
In-Reply-To: <20090715010017.17865.58915.stgit@mj.roinet.com>

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:



  parent reply	other threads:[~2009-07-15  1:00 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-15  1:00 [PATCH 1/7] Make boot/i386/pc/boot.S safer to modify Pavel Roskin
2009-07-15  1:00 ` [PATCH 2/7] Remove unused version information from boot/i386/pc/boot.S Pavel Roskin
2009-07-15  1:00 ` [PATCH 3/7] Eliminate kernel_segment Pavel Roskin
2009-07-16 15:45   ` Robert Millan
2009-07-15  1:00 ` Pavel Roskin [this message]
2009-07-16 15:52   ` [PATCH 4/7] Eliminate kernel_address Robert Millan
2009-07-15  1:00 ` [PATCH 5/7] Add newline after "Error" in bootsector Pavel Roskin
2009-07-15  1:00 ` [PATCH 6/7] Increase BPB size to accommodate FAT32 Pavel Roskin
2009-07-15  1:00 ` [PATCH 7/7] RFC: Use correct addresses, eliminate manual relocations Pavel Roskin
2009-07-15 15:33   ` Pavel Roskin
2009-07-15 22:41     ` Vladimir 'phcoder' Serbinenko
2009-07-15 23:40       ` Pavel Roskin
2009-07-16  3:44       ` Pavel Roskin
2009-07-16 15:36         ` Vladimir 'phcoder' Serbinenko
2009-07-16 15:43 ` [PATCH 1/7] Make boot/i386/pc/boot.S safer to modify Robert Millan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090715010036.17865.76458.stgit@mj.roinet.com \
    --to=proski@gnu.org \
    --cc=grub-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.