An intermediate elf file is generated for the 16-bit setup code.
The generated code can be viewed using objdump -m i8086 -d. As it
stands, it also tries to disassemble the bugger_off_msg, which
results in garbage. This introduces two new sections to separate
the code and the data part of the bootsector stub. It also moves
some code from the .header section (a data section) to .inittext.
Signed-off-by: Alexander van Heukelum <[EMAIL PROTECTED]>
---
Hi,
I hope the new section names are ok? Alternatives would be
.bstext/.bsdata or .floppytext/.floppydata.
Greetings,
Alexander
arch/i386/boot/header.S | 10 +++++-----
arch/i386/boot/setup.ld | 4 ++++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S
index 02d0f7d..70b39cb 100644
--- a/arch/i386/boot/header.S
+++ b/arch/i386/boot/header.S
@@ -44,7 +44,7 @@ SWAP_DEV = 0 /* SWAP_DEV is now
written by "build" */
#endif
.code16
- .section ".header", "ax"
+ .section ".stubtext", "ax"
.global bootsect_start
bootsect_start:
@@ -82,7 +82,7 @@ bs_die:
# invoke the BIOS reset code...
ljmp $0xf000,$0xfff0
-
+ .section ".stubdata", "a"
bugger_off_msg:
.ascii "Direct booting from floppy is no longer supported.\r\n"
.ascii "Please use a boot loader program instead.\r\n"
@@ -94,7 +94,7 @@ bugger_off_msg:
# Kernel attributes; used by setup. This is part 1 of the
# header, from the old boot sector.
- .org 497
+ .section ".header", "a"
.globl hdr
hdr:
setup_sects: .byte SETUPSECTS
@@ -208,10 +208,11 @@ pad3: .word 0
cmdline_size: .long COMMAND_LINE_SIZE-1 #length of the command line,
#added with boot protocol
#version 2.06
+start_of_setup:
# End of setup header #####################################################
-start_of_setup:
+ .section ".inittext", "ax"
#ifdef SAFE_RESET_DISK_CONTROLLER
# Reset the disk controller.
movw $0x0000, %ax # Reset disk controller
@@ -225,7 +226,6 @@ start_of_setup:
pushw $setup2
lretw
- .section ".inittext", "ax"
setup2:
# Force %es = %ds
movw %ds, %ax
diff --git a/arch/i386/boot/setup.ld b/arch/i386/boot/setup.ld
index a111572..8defc4f 100644
--- a/arch/i386/boot/setup.ld
+++ b/arch/i386/boot/setup.ld
@@ -10,6 +10,10 @@ ENTRY(_start)
SECTIONS
{
. = 0;
+ .stubtext : { *(.stubtext) }
+ .stubdata : { *(.stubdata) }
+
+ . = 497;
.header : { *(.header) }
.inittext : { *(.inittext) }
.initdata : { *(.initdata) }
--
1.4.4.2
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
