override CFLAGS = $(COMMONCFLAGS) -g -DMODE16=0
CFLAGS16INC = $(COMMONCFLAGS) -DMODE16=1 -fno-jump-tables -fno-defer-pop \
$(call cc-option,$(CC),--param large-stack-frame=4,)
+CFLAGS16INC += -ffunction-sections -fdata-sections
CFLAGS16 = $(CFLAGS16INC) -g
TABLETMP=$(addprefix $(OUT), $(patsubst %.c,%.16.s,$(TABLESRC)))
endif
OBJCOPY=objcopy
+OBJDUMP=objdump
NM=nm
STRIP=strip
@echo " Linking (no relocs) $@"
$(Q)$(LD) -r -d -T $(OUT)rombios32.lds $< -o $@
+$(OUT)romlayout.lds: $(OUT)romlayout16.o
+ @echo " Building layout information $@"
+ $(Q)$(OBJDUMP) -h $< | ./tools/layoutrom.py > $@
+
+$(OUT)rombios16.lds: $(OUT)romlayout.lds
+
$(OUT)rom16.o: $(OUT)romlayout16.o $(OUT)rom32.o $(OUT)rombios16.lds
@echo " Linking (16bit) $@"
$(Q)$(OBJCOPY) --prefix-symbols=_code32_ $(OUT)rom32.o $(OUT)rom32.rename.o
#define BUILD_SMM_ADDR 0xa8000
#define BUILD_SMM_SIZE 0x8000
-// Start of fixed addresses in 0xf0000 segment.
-#define BUILD_START_FIXED 0xe050
-
// Important real-mode segments
#define SEG_IVT 0x0000
#define SEG_BDA 0x0040
. = code16_start ;
final_code16_start = . ;
*(.text16)
-
- . = code16_fixed_start ;
- final_code16_fixed_start = . ;
- *(.text16.fixed.addr)
}
- /DISCARD/ : { *(.discard.var16) }
+ /DISCARD/ : { *(.discard*) }
}
. = ( _code32_code32_end - BUILD_BIOS_ADDR ) ;
code16_start = . ;
.text16 : {
- *(.text)
- code16_rodata = . ;
- *(.rodata*)
- *(.data.var16)
- }
- freespace1_start = . ;
- code16_end = . ;
- . = BUILD_START_FIXED ;
- code16_fixed_start = . ;
- freespace1_end = . ;
- .text16.fixed.addr : {
- *(.text.fixed.addr)
+// The actual placement of the 16bit sections is determined by the
+// script tools/layoutrom.py
+#include "../out/romlayout.lds"
+
}
- code16_fixed_end = . ;
+ code16_end = . ;
// Discard regular data sections to force a link error if
// 16bit code attempts to access data not marked with VAR16.
- /DISCARD/ : { *(.data) *(.bss) *(COMMON) }
+ /DISCARD/ : { *(.text*) *(.rodata*) *(.data*) *(.bss*) *(COMMON) }
}
// Specify a location in the fixed part of bios area.
.macro ORG addr
- .section .text.fixed.addr
- .org \addr - BUILD_START_FIXED
+ .section .fixedaddr.\addr
.endm
// Notes a function as externally visible in the 32bit code chunk.
# define VISIBLE32
// Designate a variable as (only) visible to 16bit code.
-# define VAR16 __attribute__((section(".data.var16")))
+# define VAR16 __attribute__((section(".data16." __FILE__ "." __stringify(__LINE__))))
// Designate a variable as visible to both 32bit and 16bit code.
# define VAR16_32 VAR16 __VISIBLE
// Designate top-level assembler as 16bit only.
-# define ASM16(code) asm(code)
+# define ASM16(code) asm(".section .text.asm." __FILE__ "." __stringify(__LINE__) "\n\t" code)
#else
# define VISIBLE16
# define VISIBLE32 __VISIBLE
c16s = syms['code16_start'] + 0xf0000
c32s = syms['final_code16_start']
- f16s = syms['code16_fixed_start'] + 0xf0000
- f32s = syms['final_code16_fixed_start']
- if c16s != c32s or f16s != f32s:
- print ("Error! 16bit code moved during linking"
- " (0x%x vs 0x%x, 0x%x vs 0x%x)" % (
- c32s, c16s, f16s, f32s))
+ if c16s != c32s:
+ print "Error! 16bit code moved during linking (0x%x vs 0x%x)" % (
+ c32s, c16s)
sys.exit(1)
- size16 = syms['code16_end'] - syms['code16_start']
+ sizefree = syms['freespace1_end'] - syms['freespace1_start']
+ size16 = syms['code16_end'] - syms['code16_start'] - sizefree
size32 = syms['code32_end'] - syms['code32_start']
totalc = size16+size32
- sizefree = syms['freespace1_end'] - syms['freespace1_start']
tablefree = syms['freespace2_end'] - syms['freespace2_start']
- print "16bit C-code size: %d" % size16
- print "32bit C-code size: %d" % size32
- print "Total C-code size: %d Free space: %d Percent used: %.1f%%" % (
+ print "16bit size: %d" % size16
+ print "32bit size: %d" % size32
+ print "Total size: %d Free space: %d Percent used: %.1f%%" % (
totalc, sizefree
, (totalc / float(size16+size32+sizefree)) * 100.0)
print "BIOS table space: %d" % tablefree
--- /dev/null
+#!/usr/bin/env python
+# Script to arrange sections to ensure fixed offsets.
+#
+# Copyright (C) 2008 Kevin O'Connor <kevin@koconnor.net>
+#
+# This file may be distributed under the terms of the GNU GPLv3 license.
+
+import sys
+
+def main():
+ # Read in section names and sizes
+
+ # sections = [(idx, name, size, align), ...]
+ sections = []
+ for line in sys.stdin.readlines():
+ try:
+ idx, name, size, vma, lma, fileoff, align = line.split()
+ if align[:3] != '2**':
+ continue
+ sections.append((
+ int(idx), name, int(size, 16), int(align[3:])))
+ except:
+ pass
+
+ # fixedsections = [(addr, sectioninfo), ...]
+ fixedsections = []
+ textsections = []
+ rodatasections = []
+ datasections = []
+
+ # Find desired sections.
+ for section in sections:
+ name = section[1]
+ if name[:11] == '.fixedaddr.':
+ addr = int(name[11:], 16)
+ fixedsections.append((addr, section))
+ if name[:6] == '.text.':
+ textsections.append(section)
+ if name[:17] == '.rodata.__func__.' or name == '.rodata.str1.1':
+ rodatasections.append(section)
+ if name[:8] == '.data16.':
+ datasections.append(section)
+
+ # Write regular sections
+ for section in textsections:
+ name = section[1]
+ sys.stdout.write("*(%s)\n" % (name,))
+ sys.stdout.write("code16_rodata = . ;\n")
+ for section in rodatasections:
+ name = section[1]
+ sys.stdout.write("*(%s)\n" % (name,))
+ for section in datasections:
+ name = section[1]
+ sys.stdout.write("*(%s)\n" % (name,))
+
+ # Write fixed sections
+ sys.stdout.write("freespace1_start = . ;\n")
+ first = 1
+ for addr, section in fixedsections:
+ name = section[1]
+ sys.stdout.write(". = ( 0x%x - code16_start ) ;\n" % (addr,))
+ if first:
+ first = 0
+ sys.stdout.write("freespace1_end = . ;\n")
+ sys.stdout.write("*(%s)\n" % (name,))
+
+if __name__ == '__main__':
+ main()