SeaBIOS

seabios@seabios.org

3783 discussions

[PATCH] Makefile: Use -mstack-alignment=4 instead of -mpreferred-stack-boundary=2 for clang
by Fangrui Song 17 Mar '20

17 Mar '20

( depends on https://mail.coreboot.org/hyperkitty/list/seabios@seabios.org/thread/SWDV7M… "[PATCH] Makefile: Refactor cc-option" see linux/arch/x86/Makefile for a similar use case ) Signed-off-by: Fangrui Song <maskray(a)google.com> --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7720db9..eae7ac0 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ CPPFLAGS = -P -MD -MT $@ COMMONCFLAGS := -I$(OUT) -Isrc -Os -MD -g \ -Wall -Wno-strict-aliasing -Wold-style-definition \ $(call cc-option,-Wtype-limits) \ - -m32 -march=i386 -mregparm=3 -mpreferred-stack-boundary=2 \ + -m32 -march=i386 -mregparm=3 \ -minline-all-stringops -fomit-frame-pointer \ -freg-struct-return -ffreestanding -fno-delete-null-pointer-checks \ -ffunction-sections -fdata-sections -fno-common -fno-merge-constants @@ -69,6 +69,7 @@ COMMONCFLAGS += $(call cc-option,-fno-stack-protector) COMMONCFLAGS += $(call cc-option,-fno-stack-protector-all) COMMONCFLAGS += $(call cc-option,-fstack-check=no) COMMONCFLAGS += $(call cc-option,-Wno-address-of-packed-member) +COMMONCFLAGS += $(call cc-option,-mpreferred-stack-boundary=2,-mstack-alignment=4) COMMA := , CFLAGS32FLAT := $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0 -- 2.25.1

4 6

[PATCH v2 1/4] timer: add tsctimer_setfreq()
by Gerd Hoffmann 16 Mar '20

16 Mar '20

Add function to set tsc frequency directly, without calibration. Also tweak timer setup functions a bit: skip setup in case TimerPort has not the default value any more, i.e. another timer has been setup already. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/util.h | 1 + src/hw/timer.c | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/util.h b/src/util.h index d96db788d1b8..94592a2d2e8d 100644 --- a/src/util.h +++ b/src/util.h @@ -171,6 +171,7 @@ void sdcard_setup(void); // hw/timer.c void timer_setup(void); void pmtimer_setup(u16 ioport); +void tsctimer_setfreq(u32 khz, const char *src); u32 timer_calc(u32 msecs); u32 timer_calc_usec(u32 usecs); int timer_check(u32 end); diff --git a/src/hw/timer.c b/src/hw/timer.c index bdcb3bfca211..56bb289a4adc 100644 --- a/src/hw/timer.c +++ b/src/hw/timer.c @@ -101,8 +101,10 @@ tsctimer_setup(void) void timer_setup(void) { - if (!CONFIG_TSC_TIMER || (CONFIG_PMTIMER && TimerPort != PORT_PIT_COUNTER0)) + if (!CONFIG_TSC_TIMER) return; + if (TimerPort != PORT_PIT_COUNTER0) + return; // have timer already // Check if CPU has a timestamp counter u32 eax, ebx, ecx, edx, cpuid_features = 0; @@ -113,11 +115,33 @@ timer_setup(void) tsctimer_setup(); } +void +tsctimer_setfreq(u32 khz, const char *src) +{ + if (!CONFIG_TSC_TIMER) + return; + if (TimerPort != PORT_PIT_COUNTER0) + return; // have timer already + + TimerKHz = khz; + ShiftTSC = 0; + while (TimerKHz >= 6000) { + ShiftTSC++; + TimerKHz = (TimerKHz + 1) >> 1; + } + TimerPort = 0; + + dprintf(1, "CPU Mhz=%u (%s)\n", (TimerKHz << ShiftTSC) / 1000, src); +} + void pmtimer_setup(u16 ioport) { if (!CONFIG_PMTIMER) return; + if (TimerPort != PORT_PIT_COUNTER0) + return; // have timer already + dprintf(1, "Using pmtimer, ioport 0x%x\n", ioport); TimerPort = ioport; TimerKHz = DIV_ROUND_UP(PMTIMER_HZ, 1000); -- 2.18.2

2 5

[PATCH] Makefile: Delete compiler driver option -nopie
by Fangrui Song 16 Mar '20

16 Mar '20

(This does no harm because we use LD directly.) -nopie is a typo. The actual option is -no-pie. CFLAGS does not need to include a link option. Signed-off-by: Fangrui Song <maskray(a)google.com> --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 8d087af..1400bf2 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,6 @@ COMMONCFLAGS := -I$(OUT) -Isrc -Os -MD -g \ -minline-all-stringops -fomit-frame-pointer \ -freg-struct-return -ffreestanding -fno-delete-null-pointer-checks \ -ffunction-sections -fdata-sections -fno-common -fno-merge-constants -COMMONCFLAGS += $(call cc-option,-nopie) COMMONCFLAGS += $(call cc-option,-fno-pie) COMMONCFLAGS += $(call cc-option,-fno-stack-protector) COMMONCFLAGS += $(call cc-option,-fno-stack-protector-all) -- 2.25.1

1 0

[PATCH] Makefile: Change ET_EXEC to ET_REL so that lld can link bios.bin.elf
by Fangrui Song 16 Mar '20

16 Mar '20

( With https://mail.coreboot.org/hyperkitty/list/seabios@seabios.org/thread/CJR7WU… https://mail.coreboot.org/hyperkitty/list/seabios@seabios.org/thread/GUYWC4… and this patch, I am able to link bios.bin.elf with lld 7 (a somewhat old version of lld. FreeBSD 12 uses lld 8 I considered an lld patch (https://reviews.llvm.org/D76174) but I now think it is probably not a good idea. In almost all circumstances this is an error. See Peter Smith's comment. It is just that seabios has a very particular use case which makes it work.) bios.bin.elf uses an extremely rare feature of GNU ld: an ET_EXEC can be linked as if it were an ET_REL. lld is rigid and will reject this use case. With this patch, I can link bios.bin.elf with lld 7. Signed-off-by: Fangrui Song <maskray(a)google.com> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 66b3eab..8d087af 100644 --- a/Makefile +++ b/Makefile @@ -181,11 +181,11 @@ $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds $(OUT)code32flat.o $(OUT)code $(OUT)rom16.o: $(OUT)code16.o $(OUT)romlayout16.lds @echo " Linking $@" - $(Q)$(LD) -T $(OUT)romlayout16.lds $< -o $@ + $(Q)$(LD) -T $(OUT)romlayout16.lds $< -o $@ && printf '\1' | dd of=$@ conv=notrunc bs=1 seek=16 # Change ET_EXEC to ET_REL $(OUT)rom32seg.o: $(OUT)code32seg.o $(OUT)romlayout32seg.lds @echo " Linking $@" - $(Q)$(LD) -T $(OUT)romlayout32seg.lds $< -o $@ + $(Q)$(LD) -T $(OUT)romlayout32seg.lds $< -o $@ && printf '\1' | dd of=$@ conv=notrunc bs=1 seek=16 # Change ET_EXEC to ET_REL $(OUT)bios.bin.elf: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT)romlayout32flat.lds @echo " Linking $@" -- 2.25.1

1 0

-fno-merge-constants and clang
by Fangrui Song 16 Mar '20

16 Mar '20

// a.c #include <stdio.h> int main() { puts("hello"); } gcc -O2 -fdata-sections -c a.c && readelf -WS a.o | grep .rodata [ 4] .rodata.str1.1 PROGBITS 0000000000000000 000040 000006 01 AMS 0 0 1 gcc -O2 -fdata-sections -fno-merge-constants -c a.c && readelf -WS a.o | grep .rodata [ 4] .rodata PROGBITS 0000000000000000 000040 000006 00 A 0 0 1 clang -O2 -fdata-sections -c a.c && readelf -WS a.o | grep .rodata [ 4] .rodata.str1.1 PROGBITS 0000000000000000 00004f 000006 01 AMS 0 0 1 clang -O2 -fdata-sections -fno-merge-constants -c a.c && readelf -WS a.o | grep .rodata clang: warning: optimization flag '-fno-merge-constants' is not supported [-Wignored-optimization-argument] [ 4] .rodata.str1.1 PROGBITS 0000000000000000 00004f 000006 01 AMS 0 0 1 As you can see, clang (as of 10.0.0) does not support -f(no-)merge-constants. (clang supports -fmerge-all-constants but -fno-merge-constants vs -fmerge-constants is sufficient to cause the section name/flags(SHF_MERGE|SHF_STRINGS) difference). commit e574997809bc67ab0c150af9c4b5e451091fb259 "build: Keep segmented sections separate until final link step." added -fno-merge-constants to avoid handling of .rodata.str1.1 In GCC, -O implies -fmerge-constants. If I delete -fno-merge-constants, scripts/checkrom.py will complain: Error! Code does not end at 0x100000 (got 0xffd80) It seems that we may need to add back some .rodata.str1.1 code for clang support.

1 0

[PATCH] Makefile: Refactor cc-option
by Fangrui Song 16 Mar '20

16 Mar '20

(This will be used by my next patch which will fix clang warning/error for -fno-merge-constants -mpreferred-stack-boundary=2) Suppress stderr output and add -Werror. clang emits [-Wignored-optimization-argument] for certain ignored GCC options. Signed-off-by: Fangrui Song <maskray(a)google.com> --- Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index e52b395..7720db9 100644 --- a/Makefile +++ b/Makefile @@ -49,8 +49,8 @@ SRC32SEG=string.c output.c pcibios.c apm.c stacks.c hw/pci.c hw/serialio.c DIRS=src src/hw src/fw vgasrc # Default compiler flags -cc-option=$(shell if test -z "`$(1) $(2) -S -o /dev/null -xc /dev/null 2>&1`" \ - ; then echo "$(2)"; else echo "$(3)"; fi ;) +cc-option=$(shell if $(CC) -Werror $(1) -c -xc /dev/null -o /dev/null >/dev/null 2>&1; \ + then echo "$(1)"; else echo "$(2)"; fi) EXTRAVERSION= @@ -58,27 +58,27 @@ CPPFLAGS = -P -MD -MT $@ COMMONCFLAGS := -I$(OUT) -Isrc -Os -MD -g \ -Wall -Wno-strict-aliasing -Wold-style-definition \ - $(call cc-option,$(CC),-Wtype-limits,) \ + $(call cc-option,-Wtype-limits) \ -m32 -march=i386 -mregparm=3 -mpreferred-stack-boundary=2 \ -minline-all-stringops -fomit-frame-pointer \ -freg-struct-return -ffreestanding -fno-delete-null-pointer-checks \ -ffunction-sections -fdata-sections -fno-common -fno-merge-constants -COMMONCFLAGS += $(call cc-option,$(CC),-nopie,) -COMMONCFLAGS += $(call cc-option,$(CC),-fno-pie,) -COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) -COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,) -COMMONCFLAGS += $(call cc-option,$(CC),-fstack-check=no,) -COMMONCFLAGS += $(call cc-option,$(CC),-Wno-address-of-packed-member,) +COMMONCFLAGS += $(call cc-option,-nopie) +COMMONCFLAGS += $(call cc-option,-fno-pie) +COMMONCFLAGS += $(call cc-option,-fno-stack-protector) +COMMONCFLAGS += $(call cc-option,-fno-stack-protector-all) +COMMONCFLAGS += $(call cc-option,-fstack-check=no) +COMMONCFLAGS += $(call cc-option,-Wno-address-of-packed-member) COMMA := , CFLAGS32FLAT := $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0 CFLAGSSEG := $(COMMONCFLAGS) -DMODESEGMENT=1 -fno-defer-pop \ - $(call cc-option,$(CC),-fno-jump-tables,-DMANUAL_NO_JUMP_TABLE) \ - $(call cc-option,$(CC),-fno-tree-switch-conversion,) + $(call cc-option,-fno-jump-tables,-DMANUAL_NO_JUMP_TABLE) \ + $(call cc-option,-fno-tree-switch-conversion) CFLAGS32SEG := $(CFLAGSSEG) -DMODE16=0 CFLAGS16 := $(CFLAGSSEG) -DMODE16=1 \ - $(call cc-option,$(CC),-m16,-Wa$(COMMA)src/code16gcc.s) \ - $(call cc-option,$(CC),--param large-stack-frame=4,-fno-inline) + $(call cc-option,-m16,-Wa$(COMMA)src/code16gcc.s) \ + $(call cc-option,--param large-stack-frame=4,-fno-inline) # Run with "make V=1" to see the actual compile commands ifdef V -- 2.25.1

1 0

[PATCH] Discard .comment via linker script and delete unneeded PHDRS
by Fangrui Song 15 Mar '20

15 Mar '20

( For posterity, read https://reviews.llvm.org/D71035 to get some understanding how objcopy -O binary works. Program headers don't occupy space after objcopy -O binary, so there is no need deleting PT_GNU_STACK via a PHDRS command. ) This deletes a strip rule and avoids an immediate target rom.o Signed-off-by: Fangrui Song <maskray(a)google.com> --- Makefile | 10 +++------- scripts/layoutrom.py | 7 ++----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 7a16195..e52b395 100644 --- a/Makefile +++ b/Makefile @@ -182,13 +182,13 @@ $(OUT)rom32seg.o: $(OUT)code32seg.o $(OUT)romlayout32seg.lds @echo " Linking $@" $(Q)$(LD) -T $(OUT)romlayout32seg.lds $< -o $@ -$(OUT)rom.o: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT)romlayout32flat.lds +$(OUT)bios.bin.elf: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT)romlayout32flat.lds @echo " Linking $@" $(Q)$(LD) -N -T $(OUT)romlayout32flat.lds $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o -o $@ -$(OUT)bios.bin.prep: $(OUT)rom.o scripts/checkrom.py +$(OUT)bios.bin.prep: $(OUT)bios.bin.elf scripts/checkrom.py @echo " Prepping $@" - $(Q)rm -f $(OUT)bios.bin $(OUT)Csm16.bin $(OUT)bios.bin.elf + $(Q)rm -f $(OUT)bios.bin $(OUT)Csm16.bin $(Q)$(READELF) -WSrs $< > $<.readelf $(Q)$(OBJCOPY) -O binary $< $(OUT)bios.bin.raw $(Q)$(PYTHON) ./scripts/checkrom.py $<.readelf $(CONFIG_ROM_SIZE) $(OUT)bios.bin.raw $(OUT)bios.bin.prep @@ -201,10 +201,6 @@ $(OUT)Csm16.bin: $(OUT)bios.bin.prep @echo " Creating $@" $(Q)cp $< $@ -$(OUT)bios.bin.elf: $(OUT)rom.o $(OUT)bios.bin.prep - @echo " Creating $@" - $(Q)$(STRIP) -R .comment $< -o $(OUT)bios.bin.elf - ################ VGA build rules diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py index 3595371..c14966d 100755 --- a/scripts/layoutrom.py +++ b/scripts/layoutrom.py @@ -25,6 +25,7 @@ COMMONTRAILER = """ /DISCARD/ : { *(.text*) *(.data*) *(.bss*) *(.rodata*) *(COMMON) *(.discard*) *(.eh_frame) *(.note*) + *(.comment) } } """ @@ -438,7 +439,7 @@ def writeLinkerScripts(li, out16, out32seg, out32flat): %s %s code32flat_end = ABSOLUTE(.) ; - } :text + } """ % (li.sec32init_align, li.zonefseg_start, li.zonefseg_end, @@ -455,10 +456,6 @@ def writeLinkerScripts(li, out16, out32seg, out32flat): outRelSections(li.sections, 'code32flat_start')) out = COMMONHEADER + out + COMMONTRAILER + """ ENTRY(%s) -PHDRS -{ - text PT_LOAD AT ( code32flat_start ) ; -} """ % (li.entrysym.name,) outfile = open(out32flat, 'w') outfile.write(out) -- 2.25.1

1 1

Re: [PATCH] Use readelf -WSrs instead of objdump -thr so that llvm-readelf can be used as a replacement
by Ray 15 Mar '20

15 Mar '20

Please drop ``` --- a/scripts/layoutrom.py +++ b/scripts/layoutrom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 +from ipdb import set_trace as bp ``` I accidentally included them in the patch. They are for debugging.

1 0

[PATCH] Use readelf -WSrs instead of objdump -thr so that llvm-readelf can be used as a replacement
by Fangrui Song 15 Mar '20

15 Mar '20

(Note, with this patch, make READELF=llvm-readelf qemu-system-x86_64 -boot menu=on,splash-time=15000 -bios out/bios.bin -nographic seems working ) readelf is generally better than objdump when dumping ELF section/symbol information. objdump -h relies heavily on BFD internals and the output is difficult to emulate in llvm-objdump. Signed-off-by: Fangrui Song <maskray(a)google.com> --- Makefile | 18 +++--- scripts/checkrom.py | 2 +- scripts/layoutrom.py | 146 +++++++++++++++++++++---------------------- 3 files changed, 80 insertions(+), 86 deletions(-) diff --git a/Makefile b/Makefile index 5f7d537..7a16195 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ endif AS=$(CROSS_PREFIX)as LD=$(CROSS_PREFIX)ld OBJCOPY=$(CROSS_PREFIX)objcopy -OBJDUMP=$(CROSS_PREFIX)objdump +READELF=$(CROSS_PREFIX)readelf STRIP=$(CROSS_PREFIX)strip PYTHON=python CPP=cpp @@ -161,14 +161,14 @@ $(OUT)romlayout.o: src/romlayout.S $(OUT)autoconf.h $(OUT)asm-offsets.h $(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(OUT)romlayout.o src/version.c scripts/layoutrom.py scripts/buildversion.py @echo " Building ld scripts" - $(Q)$(PYTHON) ./scripts/buildversion.py -e "$(EXTRAVERSION)" -t "$(CC);$(AS);$(LD);$(OBJCOPY);$(OBJDUMP);$(STRIP)" $(OUT)autoversion.h + $(Q)$(PYTHON) ./scripts/buildversion.py -e "$(EXTRAVERSION)" -t "$(CC);$(AS);$(LD);$(OBJCOPY);$(READELF);$(STRIP)" $(OUT)autoversion.h $(Q)$(CC) $(CFLAGS32FLAT) -c src/version.c -o $(OUT)version.o $(Q)$(LD) $(LD32BIT_FLAG) -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o $(Q)$(LD) $(LD32BIT_FLAG) -r $(OUT)ccode16.o $(OUT)romlayout.o -o $(OUT)code16.o - $(Q)$(OBJDUMP) -thr $(OUT)code32flat.o > $(OUT)code32flat.o.objdump - $(Q)$(OBJDUMP) -thr $(OUT)code32seg.o > $(OUT)code32seg.o.objdump - $(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump - $(Q)$(PYTHON) ./scripts/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32seg.o.objdump $(OUT)code32flat.o.objdump $(OUT)$(KCONFIG_AUTOHEADER) $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds + $(Q)$(READELF) -WSrs $(OUT)code32flat.o > $(OUT)code32flat.o.readelf + $(Q)$(READELF) -WSrs $(OUT)code32seg.o > $(OUT)code32seg.o.readelf + $(Q)$(READELF) -WSrs $(OUT)code16.o > $(OUT)code16.o.readelf + $(Q)$(PYTHON) ./scripts/layoutrom.py $(OUT)code16.o.readelf $(OUT)code32seg.o.readelf $(OUT)code32flat.o.readelf $(OUT)$(KCONFIG_AUTOHEADER) $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds # These are actually built by scripts/layoutrom.py above, but by pulling them # into an extra rule we prevent make -j from spawning layoutrom.py 4 times. @@ -189,9 +189,9 @@ $(OUT)rom.o: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT $(OUT)bios.bin.prep: $(OUT)rom.o scripts/checkrom.py @echo " Prepping $@" $(Q)rm -f $(OUT)bios.bin $(OUT)Csm16.bin $(OUT)bios.bin.elf - $(Q)$(OBJDUMP) -thr $< > $<.objdump + $(Q)$(READELF) -WSrs $< > $<.readelf $(Q)$(OBJCOPY) -O binary $< $(OUT)bios.bin.raw - $(Q)$(PYTHON) ./scripts/checkrom.py $<.objdump $(CONFIG_ROM_SIZE) $(OUT)bios.bin.raw $(OUT)bios.bin.prep + $(Q)$(PYTHON) ./scripts/checkrom.py $<.readelf $(CONFIG_ROM_SIZE) $(OUT)bios.bin.raw $(OUT)bios.bin.prep $(OUT)bios.bin: $(OUT)bios.bin.prep @echo " Creating $@" @@ -233,7 +233,7 @@ $(OUT)vgaentry.o: vgasrc/vgaentry.S $(OUT)autoconf.h $(OUT)asm-offsets.h $(OUT)vgarom.o: $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgasrc/vgalayout.lds vgasrc/vgaversion.c scripts/buildversion.py @echo " Linking $@" - $(Q)$(PYTHON) ./scripts/buildversion.py -e "$(EXTRAVERSION)" -t "$(CC);$(AS);$(LD);$(OBJCOPY);$(OBJDUMP);$(STRIP)" $(OUT)autovgaversion.h + $(Q)$(PYTHON) ./scripts/buildversion.py -e "$(EXTRAVERSION)" -t "$(CC);$(AS);$(LD);$(OBJCOPY);$(READELF);$(STRIP)" $(OUT)autovgaversion.h $(Q)$(CC) $(CFLAGS16) -c vgasrc/vgaversion.c -o $(OUT)vgaversion.o $(Q)$(LD) --gc-sections -T $(OUT)vgasrc/vgalayout.lds $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgaversion.o -o $@ diff --git a/scripts/checkrom.py b/scripts/checkrom.py index aced5e2..721444d 100755 --- a/scripts/checkrom.py +++ b/scripts/checkrom.py @@ -23,7 +23,7 @@ def main(): # Read in symbols objinfofile = open(objinfo, 'r') - symbols = layoutrom.parseObjDump(objinfofile, 'in')[1] + symbols = layoutrom.parseReadElf(objinfofile, 'in')[1] # Read in raw file f = open(rawfile, 'rb') diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py index 14e6ada..6cc9e04 100755 --- a/scripts/layoutrom.py +++ b/scripts/layoutrom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Script to analyze code and arrange ld sections. # # Copyright (C) 2008-2014 Kevin O'Connor <kevin(a)koconnor.net> @@ -7,6 +7,7 @@ import operator import sys +from ipdb import set_trace as bp # LD script headers/trailers COMMONHEADER = """ @@ -544,87 +545,80 @@ class Reloc: class Symbol: name = offset = section = None -# Read in output from objdump -def parseObjDump(file, fileid): +def parseReadElf(file, fileid): # sections = [section, ...] sections = [] sectionmap = {} # symbols[symbolname] = symbol symbols = {} + lines = file.readlines() - state = None - for line in file.readlines(): - line = line.rstrip() - if line == 'Sections:': - state = 'section' - continue - if line == 'SYMBOL TABLE:': - state = 'symbol' - continue - if line.startswith('RELOCATION RECORDS FOR ['): - sectionname = line[24:-2] - if sectionname.startswith('.debug_'): - # Skip debugging sections (to reduce parsing time) - state = None - continue - state = 'reloc' - relocsection = sectionmap[sectionname] - continue + i = 0 + while not lines[i].startswith('Section Headers'): + i += 1 + i += 3 # Skip [Nr] and [ 0] + while ']' in lines[i]: + parts = lines[i][lines[i].find(']')+1:].split() + if len(parts) == 10: + name, _, _, _, size, _, _, _, _, align = parts + else: # not SHF_ALLOC + name, _, _, _, size, _, _, _, align = parts + section = Section() + section.name = name + section.size = int(size, 16) + section.align = int(align) + section.fileid = fileid + section.relocs = [] + sections.append(section) + sectionmap[name] = section + i += 1 - if state == 'section': - try: - idx, name, size, vma, lma, fileoff, align = line.split() - if align[:3] != '2**': - continue - section = Section() - section.name = name - section.size = int(size, 16) - section.align = 2**int(align[3:]) - section.fileid = fileid - section.relocs = [] - sections.append(section) - sectionmap[name] = section - except ValueError: - pass + while not lines[i].startswith('Symbol table '): + i += 1 + i += 3 # Skip Num: and 0: + while i < len(lines) and ':' in lines[i]: + colon = lines[i].find(':') + parts = lines[i].split() + try: + ndx = int(parts[6]) + name = sections[ndx-1].name + except ValueError: # ABS or UND + ndx = 0 + name = '' + if parts[3] != 'SECTION': + name = parts[7] + symbol = Symbol() + symbol.size = int(parts[2]) + symbol.offset = int(parts[1], 16) + symbol.name = name + symbol.section = sections[ndx-1] if ndx > 0 else None + symbols[name] = symbol + i += 1 + + i = 0 + while i < len(lines): + if not lines[i].startswith('Relocation section'): + i += 1 continue - if state == 'symbol': - try: - parts = line[17:].split() - if len(parts) == 3: - sectionname, size, name = parts - elif len(parts) == 4 and parts[2] == '.hidden': - sectionname, size, hidden, name = parts - else: - continue - symbol = Symbol() - symbol.size = int(size, 16) - symbol.offset = int(line[:8], 16) - symbol.name = name - symbol.section = sectionmap.get(sectionname) - symbols[name] = symbol - except ValueError: - pass + rel_name = lines[i][20:lines[i].index("'", 20)] + i += 2 + if rel_name.startswith('.rel.debug_'): + # Skip debugging sections (to reduce parsing time) continue - if state == 'reloc': - try: - off, type, symbolname = line.split() - reloc = Reloc() - reloc.offset = int(off, 16) - reloc.type = type - reloc.symbolname = symbolname - reloc.symbol = symbols.get(symbolname) - if reloc.symbol is None: - # Some binutils (2.20.1) give section name instead - # of a symbol - create a dummy symbol. - reloc.symbol = symbol = Symbol() - symbol.size = 0 - symbol.offset = 0 - symbol.name = symbolname - symbol.section = sectionmap.get(symbolname) - symbols[symbolname] = symbol - relocsection.relocs.append(reloc) - except ValueError: - pass + assert rel_name.startswith('.rel') + relocated = sectionmap[rel_name[4:]] + while lines[i][0].isalnum(): + line = lines[i] + off, _, typ, _, symbolname = line.split() + reloc = Reloc() + reloc.offset = int(off, 16) + reloc.type = typ + reloc.symbolname = symbolname + reloc.symbol = symbols.get(symbolname) + assert reloc.symbol is not None + relocated.relocs.append(reloc) + i += 1 + return sections, symbols # Parser for constants in simple C header files. @@ -653,9 +647,9 @@ def main(): infile32flat = open(in32flat, 'r') # infoX = (sections, symbols) - info16 = parseObjDump(infile16, '16') - info32seg = parseObjDump(infile32seg, '32seg') - info32flat = parseObjDump(infile32flat, '32flat') + info16 = parseReadElf(infile16, '16') + info32seg = parseReadElf(infile32seg, '32seg') + info32flat = parseReadElf(infile32flat, '32flat') # Read kconfig config file config = scanconfig(cfgfile) -- 2.25.1

1 0

[PATCH] Make rom16.o linkable with lld
by Fangrui Song 14 Mar '20

14 Mar '20

(1) In romlayout.S, .fixedaddr.\addr sections do have not the SHF_ALLOC flag. It does not make sense to reference a SHF_ALLOC section from a non-SHF_ALLOC section via R_386_PC16. GNU ld allows it but lld will warn. Add the SHF_ALLOC flag. (2) lld requires output section descriptions to be sorted by address. Signed-off-by: Fangrui Song <maskray(a)google.com> (Note: with https://mail.coreboot.org/hyperkitty/list/seabios@seabios.org/thread/CJR7WU… and this patch, qemu-system-x86_64 -boot menu=on,splash-time=15000 -bios out/bios.bin -nographic seems to work for me with a small change to lld (allow ET_EXEC to used as if a relocatable object) More precisely, during: ld.lld -N -T out/romlayout32flat.lds out/rom16.strip.o out/rom32seg.strip.o out/code32flat.o -o out/rom.o out/rom16.strip.o and out/rom32seg.strip.o are ET_EXEC, instead of ET_REL. lld<11 will reject such input. ) --- scripts/layoutrom.py | 4 ++++ src/romlayout.S | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py index bbf07aa..14e6ada 100755 --- a/scripts/layoutrom.py +++ b/scripts/layoutrom.py @@ -321,6 +321,10 @@ def outXRefs(sections, useseg=0, exportsyms=[], forcedelta=0): # Write LD script includes for the given sections def outSections(sections, useseg=0): + if useseg: + sections.sort(key=lambda x: x.finalsegloc) + else: + sections.sort(key=lambda x: x.finalloc) out = "" for section in sections: loc = section.finalloc diff --git a/src/romlayout.S b/src/romlayout.S index c4a4635..a854783 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -587,7 +587,7 @@ entry_18: // Specify a location in the fixed part of bios area. .macro ORG addr - .section .fixedaddr.\addr + .section .fixedaddr.\addr,"a" .endm ORG 0xe05b -- 2.25.1

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS