SeaBIOS February 2013

seabios@seabios.org

24 participants
63 discussions

[PATCH 1/2] Introduce VARFSEG for variables that will reside in the f-segment.
by Kevin O'Connor 19 Feb '13

19 Feb '13

Introduce a variable declaration that will force variables (that are compiled in 32bit mode) to be emitted into the f-segment. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/types.h | 4 ++++ tools/layoutrom.py | 29 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/types.h b/src/types.h index 52b5280..ce0f081 100644 --- a/src/types.h +++ b/src/types.h @@ -63,6 +63,8 @@ extern void __force_link_error__only_in_16bit(void) __noreturn; # define VAR32FLATVISIBLE __section(".discard.var32flat." UNIQSEC) __VISIBLE __weak // Designate a variable as visible and located in the e-segment. # define VARLOW __section(".discard.varlow." UNIQSEC) __VISIBLE __weak +// Designate a variable as visible and located in the f-segment. +# define VARFSEG __section(".discard.varfseg." UNIQSEC) __VISIBLE __weak // Designate top-level assembler as 16bit only. # define ASM16(code) __ASM(code) // Designate top-level assembler as 32bit flat only. @@ -83,6 +85,7 @@ extern void __force_link_error__only_in_16bit(void) __noreturn; # define VAR32SEG __section(".data32seg." UNIQSEC) # define VAR32FLATVISIBLE __section(".discard.var32flat." UNIQSEC) __VISIBLE __weak # define VARLOW __section(".discard.varlow." UNIQSEC) __VISIBLE __weak +# define VARFSEG __section(".discard.varfseg." UNIQSEC) __VISIBLE __weak # define ASM16(code) # define ASM32FLAT(code) # define ASSERT16() __force_link_error__only_in_16bit() @@ -100,6 +103,7 @@ extern void __force_link_error__only_in_16bit(void) __noreturn; # define VAR32SEG __section(".discard.var32seg." UNIQSEC) # define VAR32FLATVISIBLE __section(".data.runtime." UNIQSEC) __VISIBLE # define VARLOW __section(".data.varlow." UNIQSEC) __VISIBLE +# define VARFSEG __section(".data.varfseg." UNIQSEC) __VISIBLE # define ASM16(code) # define ASM32FLAT(code) __ASM(code) # define ASSERT16() __force_link_error__only_in_16bit() diff --git a/tools/layoutrom.py b/tools/layoutrom.py index ac339e8..2543c58 100755 --- a/tools/layoutrom.py +++ b/tools/layoutrom.py @@ -157,6 +157,7 @@ class LayoutInfo: sections32flat = sec32flat_start = sec32flat_align = None sections32init = sec32init_start = sec32init_align = None sections32low = sec32low_start = sec32low_align = None + sections32fseg = sec32fseg_start = sec32fseg_align = None zonelow_base = final_sec32low_start = None # Determine final memory addresses for sections @@ -191,6 +192,13 @@ def doLayout(sections, genreloc): textsections + rodatasections + datasections, li.sec16_start , segoffset=BUILD_BIOS_ADDR) + # Determine "fseg memory" data positions + li.sections32fseg = getSectionsCategory(sections, '32fseg') + + li.sec32fseg_start, li.sec32fseg_align = setSectionsStart( + li.sections32fseg, li.sec32seg_start, 16 + , segoffset=BUILD_BIOS_ADDR) + # Determine 32flat runtime positions li.sections32flat = getSectionsCategory(sections, '32flat') textsections = getSectionsPrefix(li.sections32flat, '.text.') @@ -200,7 +208,7 @@ def doLayout(sections, genreloc): li.sec32flat_start, li.sec32flat_align = setSectionsStart( textsections + rodatasections + datasections + bsssections - , li.sec32seg_start, 16) + , li.sec32fseg_start, 16) # Determine 32flat init positions li.sections32init = getSectionsCategory(sections, '32init') @@ -232,7 +240,8 @@ def doLayout(sections, genreloc): # Print statistics size16 = BUILD_BIOS_ADDR + BUILD_BIOS_SIZE - li.sec16_start size32seg = li.sec16_start - li.sec32seg_start - size32flat = li.sec32seg_start - li.sec32flat_start + size32fseg = li.sec32seg_start - li.sec32fseg_start + size32flat = li.sec32fseg_start - li.sec32flat_start size32init = li.sec32flat_start - li.sec32init_start sizelow = sec32low_top - li.sec32low_start print "16bit size: %d" % size16 @@ -240,6 +249,7 @@ def doLayout(sections, genreloc): print "32bit flat size: %d" % size32flat print "32bit flat init size: %d" % size32init print "Lowmem size: %d" % sizelow + print "f-segment var size: %d" % size32fseg return li @@ -340,7 +350,8 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): outfile.close() # Write 32flat linker script - sections32all = li.sections32flat + li.sections32init + li.sections32low + sections32all = (li.sections32flat + li.sections32init + li.sections32low + + li.sections32fseg) sec32all_start = li.sec32low_start relocstr = "" if genreloc: @@ -351,7 +362,7 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): li.sections32init, type='R_386_PC32', notcategory='32init') initrelocs = getRelocs( li.sections32flat + li.sections32low + li.sections16 - + li.sections32seg, category='32init') + + li.sections32seg + li.sections32fseg, category='32init') lowrelocs = getRelocs(sections32all, category='32low') relocstr = (strRelocs("_reloc_abs", "code32init_start", absrelocs) + strRelocs("_reloc_rel", "code32init_start", relrelocs) @@ -374,6 +385,7 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): %s code32init_end = ABSOLUTE(.) ; %s +%s . = ( 0x%x - code32flat_start ) ; *(.text32seg) . = ( 0x%x - code32flat_start ) ; @@ -388,6 +400,7 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): outRelSections(li.sections32low, 'code32flat_start'), outRelSections(li.sections32init, 'code32flat_start'), outRelSections(li.sections32flat, 'code32flat_start'), + outRelSections(li.sections32fseg, 'code32flat_start'), li.sec32seg_start, li.sec16_start) out = COMMONHEADER + out + COMMONTRAILER + """ @@ -418,8 +431,8 @@ def markRuntime(section, sections): def findInit(sections): # Recursively find and mark all "runtime" sections. for section in sections: - if ('.data.varlow.' in section.name or '.runtime.' in section.name - or '.export.' in section.name): + if ('.data.varlow.' in section.name or '.data.varfseg.' in section.name + or '.runtime.' in section.name or '.export.' in section.name): markRuntime(section, sections) for section in sections: if section.category is not None: @@ -610,9 +623,11 @@ def main(): # Separate 32bit flat into runtime and init parts findInit(sections) - # Note "low memory" parts + # Note "low memory" and "fseg memory" parts for section in getSectionsPrefix(sections, '.data.varlow.'): section.category = '32low' + for section in getSectionsPrefix(sections, '.data.varfseg.'): + section.category = '32fseg' # Determine the final memory locations of each kept section. genreloc = '_reloc_abs_start' in info32flat[1] -- 1.7.11.7

1 0

[PATCH] Minor assembler enhancements to __csm_return.
by Kevin O'Connor 19 Feb '13

19 Feb '13

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/romlayout.S | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/romlayout.S b/src/romlayout.S index 42f8761..b1628ef 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -384,6 +384,7 @@ entry_elf: .code16gcc +// UEFI Compatibility Support Module (CSM) entry point EXPORTFUNC entry_csm entry_csm: // Backup register state @@ -408,22 +409,20 @@ entry_csm: movl $_cfunc32flat_handle_csm, %edx jmp transition32 - .code32 - DECLFUNC __csm_return + .code32 __csm_return: - movl %eax, %ebx - movl $2f, %edx + movl $1f, %edx jmp transition16big .code16gcc // Switch back to original stack -2: movzwl BREGS_code+2(%ebx), %eax - movl %eax, %ecx +1: movzwl BREGS_code+2(%eax), %edx + movl %edx, %ecx shll $4, %ecx - subl %ecx, %ebx - movl %eax, %ss - movl %ebx, %esp + subl %ecx, %eax + movl %edx, %ss + movl %eax, %esp // Restore register state and return. POPBREGS -- 1.7.11.7

1 0

[PATCH] Remove unnecessary "export" declarations from assembler functions.
by Kevin O'Connor 19 Feb '13

19 Feb '13

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/romlayout.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/romlayout.S b/src/romlayout.S index 7fdd8fa..42f8761 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -347,7 +347,7 @@ entry_pcibios32: lretl // BIOS32 support - EXPORTFUNC entry_bios32 + DECLFUNC entry_bios32 entry_bios32: pushfl #if CONFIG_PCIBIOS @@ -410,7 +410,7 @@ entry_csm: .code32 - EXPORTFUNC __csm_return + DECLFUNC __csm_return __csm_return: movl %eax, %ebx movl $2f, %edx -- 1.7.11.7

1 0

[PATCH] Enable VGA output when setting Cirrus-specific mode
by Laszlo Ersek 18 Feb '13

18 Feb '13

This patch does the same for Cirrus as David's following patch for bochs, originally posted under <http://www.seabios.org/pipermail/seabios/2013-February/005434.html>: Enable VGA output when settings bochs-specific mode When used from OVMF+CSM, we got no video output. It appears that we were never enabling the display output except when configuring a text mode. Which never happens, in the OVMF+CSM case. In my testing on RHEL-6.3 with OVMF -D CSM_ENABLE / CONFIG_CSM bios.bin / CONFIG_QEMU vgabios.bin, using Cirrus, VESA mode 0x115 is selected (Direct Color, 800x600x24). According to <http://www.osdever.net/FreeVGA/vga/attrreg.htm>, cirrus_switch_mode() stdvga_attr_mask() currently keeps/sets the "Attribute Controller Graphics Enable" bit set in the "Attribute Mode Control Register". When invoked from OVMF+CSM, that is not enough however, so let's do the same as for Bochs: stdvga_attrindex_write(0x20); which corresponds to setting the "Palette Address Source" bit in the "Attribute Address Register": "This bit is set to 0 to load color values to the registers in the internal palette. It is set to 1 for normal operation of the attribute controller. [...]" clext_set_mode() stdvga_set_mode() -- for regular modes stdvga_attrindex_write() -- existing call cirrus_switch_mode() -- for Cirrus modes stdvga_attrindex_write() -- call added by this patch Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> --- My motivation for using Cirrus instead of stdvga is three-fold: - using libvirt on RHEL-6.3, Cirrus seems to be the default video card for the guests I tend to create, - it provides better max resolution in the Fedora 18 guest, - for some reason (maybe due to kernel build options?) the Fedora 18 guest can't display character mode consoles on stdvga, but works well with Cirrus. (F18/Xorg/{stdvga,cirrus} are OK, and so are RHEL6/{Xorg,console}/{stdvga,cirrus}.) Tested with RHEL-6, Fedora 18, and Windows 8 Consumer Preview. vgasrc/clext.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/vgasrc/clext.c b/vgasrc/clext.c index dd45df3..d02b880 100644 --- a/vgasrc/clext.c +++ b/vgasrc/clext.c @@ -433,6 +433,7 @@ cirrus_switch_mode(struct cirrus_mode_s *table) else if (memmodel != MM_TEXT) on = 0x01; stdvga_attr_mask(0x10, 0x01, on); + stdvga_attrindex_write(0x20); } static void -- 1.7.1

2 3

[PATCH] Disable handle_post() on CSM builds.
by Kevin O'Connor 18 Feb '13

18 Feb '13

This reduces the size of the CSM binary by a few bytes. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/post.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/post.c b/src/post.c index cf0d9b4..7f096de 100644 --- a/src/post.c +++ b/src/post.c @@ -313,6 +313,9 @@ dopost(void) void VISIBLE32FLAT handle_post(void) { + if (!CONFIG_QEMU && !CONFIG_COREBOOT) + return; + debug_serial_preinit(); dprintf(1, "Start bios (version %s)\n", VERSION); -- 1.7.11.7

1 0

[PATCH] Clarify build generated "zone low" values.
by Kevin O'Connor 18 Feb '13

18 Feb '13

Rename datalow_base (and similar) to zonelow_base, and datalow_start (and similar) to varlow_start. This helps distinguish between the bounds for the runtime dynamic memory pool and the compile time global variables. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/biosvar.h | 6 +++--- src/pmm.c | 16 ++++++++-------- src/post.c | 12 ++++++------ src/romlayout.S | 4 ++-- src/types.h | 2 +- tools/layoutrom.py | 32 ++++++++++++++++---------------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/biosvar.h b/src/biosvar.h index f0a0fd2..520fc3e 100644 --- a/src/biosvar.h +++ b/src/biosvar.h @@ -251,13 +251,13 @@ static inline u16 get_global_seg(void) { * "Low" memory variables ****************************************************************/ -extern u8 _datalow_seg, datalow_base[]; -#define SEG_LOW ((u32)&_datalow_seg) +extern u8 _zonelow_seg, zonelow_base[]; +#define SEG_LOW ((u32)&_zonelow_seg) #if MODESEGMENT #define GET_LOW(var) GET_FARVAR(SEG_LOW, (var)) #define SET_LOW(var, val) SET_FARVAR(SEG_LOW, (var), (val)) -#define LOWFLAT2LOW(var) ((typeof(var))((void*)(var) - (u32)datalow_base)) +#define LOWFLAT2LOW(var) ((typeof(var))((void*)(var) - (u32)zonelow_base)) #else #define GET_LOW(var) (var) #define SET_LOW(var, val) do { (var) = (val); } while (0) diff --git a/src/pmm.c b/src/pmm.c index d1986c2..790177e 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -192,8 +192,8 @@ rom_reserve(u32 size) u32 newend = ALIGN(RomEnd + size, OPTION_ROM_ALIGN) + OPROM_HEADER_RESERVE; if (newend > (u32)RomBase->allocend) return NULL; - if (newend < (u32)datalow_base + OPROM_HEADER_RESERVE) - newend = (u32)datalow_base + OPROM_HEADER_RESERVE; + if (newend < (u32)zonelow_base + OPROM_HEADER_RESERVE) + newend = (u32)zonelow_base + OPROM_HEADER_RESERVE; RomBase->data = RomBase->dataend = (void*)newend; return (void*)RomEnd; } @@ -254,8 +254,8 @@ malloc_preinit(void) // Populate other regions addSpace(&ZoneTmpLow, (void*)BUILD_STACK_ADDR, (void*)BUILD_EBDA_MINIMUM); addSpace(&ZoneFSeg, BiosTableSpace, &BiosTableSpace[CONFIG_MAX_BIOSTABLE]); - extern u8 final_datalow_start[]; - addSpace(&ZoneLow, datalow_base + OPROM_HEADER_RESERVE, final_datalow_start); + extern u8 final_varlow_start[]; + addSpace(&ZoneLow, zonelow_base + OPROM_HEADER_RESERVE, final_varlow_start); RomBase = findLast(&ZoneLow); if (highram) { addSpace(&ZoneHigh, (void*)highram @@ -278,8 +278,8 @@ csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size) } addSpace(&ZoneTmpLow, (void *)low_pmm, (void *)low_pmm + low_pmm_size); addSpace(&ZoneFSeg, BiosTableSpace, &BiosTableSpace[CONFIG_MAX_BIOSTABLE]); - extern u8 final_datalow_start[]; - addSpace(&ZoneLow, datalow_base + OPROM_HEADER_RESERVE, final_datalow_start); + extern u8 final_varlow_start[]; + addSpace(&ZoneLow, zonelow_base + OPROM_HEADER_RESERVE, final_varlow_start); RomBase = findLast(&ZoneLow); } @@ -300,8 +300,8 @@ malloc_fixupreloc_init(void) } // Move low-memory initial variable content to new location. - extern u8 datalow_start[], datalow_end[], final_datalow_start[]; - memmove(final_datalow_start, datalow_start, datalow_end - datalow_start); + extern u8 varlow_start[], varlow_end[], final_varlow_start[]; + memmove(final_varlow_start, varlow_start, varlow_end - varlow_start); // Add space free'd during relocation in f-segment to ZoneFSeg extern u8 code32init_end[]; diff --git a/src/post.c b/src/post.c index f2eded9..cf0d9b4 100644 --- a/src/post.c +++ b/src/post.c @@ -98,7 +98,7 @@ bda_init(void) , E820_RESERVED); // Init extra stack - StackPos = (void*)(&ExtraStack[BUILD_EXTRA_STACK_SIZE] - datalow_base); + StackPos = (void*)(&ExtraStack[BUILD_EXTRA_STACK_SIZE] - zonelow_base); } void @@ -264,8 +264,8 @@ reloc_preinit(void *f, void *arg) extern u32 _reloc_rel_start[], _reloc_rel_end[]; extern u32 _reloc_init_start[], _reloc_init_end[]; extern u8 code32init_start[], code32init_end[]; - extern u32 _reloc_datalow_start[], _reloc_datalow_end[]; - extern u8 datalow_start[], datalow_end[], final_datalow_start[]; + extern u32 _reloc_varlow_start[], _reloc_varlow_end[]; + extern u8 varlow_start[], varlow_end[], final_varlow_start[]; // Allocate space for init code. u32 initsize = code32init_end - code32init_start; @@ -276,9 +276,9 @@ reloc_preinit(void *f, void *arg) // Copy code and update relocs (init absolute, init relative, and runtime) dprintf(1, "Relocating low data from %p to %p (size %d)\n" - , datalow_start, final_datalow_start, datalow_end - datalow_start); - updateRelocs(code32flat_start, _reloc_datalow_start, _reloc_datalow_end - , final_datalow_start - datalow_start); + , varlow_start, final_varlow_start, varlow_end - varlow_start); + updateRelocs(code32flat_start, _reloc_varlow_start, _reloc_varlow_end + , final_varlow_start - varlow_start); dprintf(1, "Relocating init from %p to %p (size %d)\n" , code32init_start, codedest, initsize); s32 delta = codedest - (void*)code32init_start; diff --git a/src/romlayout.S b/src/romlayout.S index 2a2984c..7fdd8fa 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -241,7 +241,7 @@ entry_resume: cli cld // Use the ExtraStack in low mem. - movl $_datalow_seg, %eax + movl $_zonelow_seg, %eax movw %ax, %ds movw %ax, %ss movl $ExtraStack + BUILD_EXTRA_STACK_SIZE, %esp @@ -443,7 +443,7 @@ irqentry_extrastack: cld pushw %ds // Set %ds:%eax to space on ExtraStack pushl %eax - movl $_datalow_seg, %eax + movl $_zonelow_seg, %eax movl %eax, %ds movl StackPos, %eax subl $24, %eax diff --git a/src/types.h b/src/types.h index 24b078e..52b5280 100644 --- a/src/types.h +++ b/src/types.h @@ -99,7 +99,7 @@ extern void __force_link_error__only_in_16bit(void) __noreturn; # define VAR16FIXED(addr) VAR16VISIBLE # define VAR32SEG __section(".discard.var32seg." UNIQSEC) # define VAR32FLATVISIBLE __section(".data.runtime." UNIQSEC) __VISIBLE -# define VARLOW __section(".datalow." UNIQSEC) __VISIBLE +# define VARLOW __section(".data.varlow." UNIQSEC) __VISIBLE # define ASM16(code) # define ASM32FLAT(code) __ASM(code) # define ASSERT16() __force_link_error__only_in_16bit() diff --git a/tools/layoutrom.py b/tools/layoutrom.py index ad0386a..ac339e8 100755 --- a/tools/layoutrom.py +++ b/tools/layoutrom.py @@ -157,7 +157,7 @@ class LayoutInfo: sections32flat = sec32flat_start = sec32flat_align = None sections32init = sec32init_start = sec32init_align = None sections32low = sec32low_start = sec32low_align = None - datalow_base = final_sec32low_start = None + zonelow_base = final_sec32low_start = None # Determine final memory addresses for sections def doLayout(sections, genreloc): @@ -222,11 +222,11 @@ def doLayout(sections, genreloc): sec32low_top = min(BUILD_BIOS_ADDR, li.sec32init_start) final_sec32low_top = sec32low_top relocdelta = final_sec32low_top - sec32low_top - datalow_base = final_sec32low_top - 64*1024 - li.datalow_base = max(BUILD_ROM_START, alignpos(datalow_base, 2*1024)) + zonelow_base = final_sec32low_top - 64*1024 + li.zonelow_base = max(BUILD_ROM_START, alignpos(zonelow_base, 2*1024)) li.sec32low_start, li.sec32low_align = setSectionsStart( li.sections32low, sec32low_top, 16 - , segoffset=li.datalow_base - relocdelta) + , segoffset=li.zonelow_base - relocdelta) li.final_sec32low_start = li.sec32low_start + relocdelta # Print statistics @@ -312,15 +312,15 @@ def getSectionsStart(sections, defaddr=0): def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): # Write 16bit linker script out = outXRefs(li.sections16, useseg=1) + """ - datalow_base = 0x%x ; - _datalow_seg = 0x%x ; + zonelow_base = 0x%x ; + _zonelow_seg = 0x%x ; code16_start = 0x%x ; .text16 code16_start : { %s } -""" % (li.datalow_base, - li.datalow_base / 16, +""" % (li.zonelow_base, + li.zonelow_base / 16, li.sec16_start - BUILD_BIOS_ADDR, outRelSections(li.sections16, 'code16_start', useseg=1)) outfile = open(out16, 'wb') @@ -356,20 +356,20 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): relocstr = (strRelocs("_reloc_abs", "code32init_start", absrelocs) + strRelocs("_reloc_rel", "code32init_start", relrelocs) + strRelocs("_reloc_init", "code32flat_start", initrelocs) - + strRelocs("_reloc_datalow", "code32flat_start", lowrelocs)) + + strRelocs("_reloc_varlow", "code32flat_start", lowrelocs)) numrelocs = len(absrelocs + relrelocs + initrelocs + lowrelocs) sec32all_start -= numrelocs * 4 out = outXRefs(sections32all, exportsyms=exportsyms) + """ _reloc_min_align = 0x%x ; - datalow_base = 0x%x ; - final_datalow_start = 0x%x ; + zonelow_base = 0x%x ; + final_varlow_start = 0x%x ; code32flat_start = 0x%x ; .text code32flat_start : { %s - datalow_start = ABSOLUTE(.) ; + varlow_start = ABSOLUTE(.) ; %s - datalow_end = ABSOLUTE(.) ; + varlow_end = ABSOLUTE(.) ; code32init_start = ABSOLUTE(.) ; %s code32init_end = ABSOLUTE(.) ; @@ -381,7 +381,7 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): code32flat_end = ABSOLUTE(.) ; } :text """ % (li.sec32init_align, - li.datalow_base, + li.zonelow_base, li.final_sec32low_start, sec32all_start, relocstr, @@ -418,7 +418,7 @@ def markRuntime(section, sections): def findInit(sections): # Recursively find and mark all "runtime" sections. for section in sections: - if ('.datalow.' in section.name or '.runtime.' in section.name + if ('.data.varlow.' in section.name or '.runtime.' in section.name or '.export.' in section.name): markRuntime(section, sections) for section in sections: @@ -611,7 +611,7 @@ def main(): findInit(sections) # Note "low memory" parts - for section in getSectionsPrefix(sections, '.datalow.'): + for section in getSectionsPrefix(sections, '.data.varlow.'): section.category = '32low' # Determine the final memory locations of each kept section. -- 1.7.11.7

1 0

[PATCH] Rename rom_get_top() to rom_get_max().
by Kevin O'Connor 18 Feb '13

18 Feb '13

Rename rom_get_top and try to make the difference between it and rom_get_last more clear. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/optionroms.c | 4 ++-- src/pmm.c | 8 ++++---- src/shadow.c | 2 +- src/util.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/optionroms.c b/src/optionroms.c index 03c5de0..caa2151 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -354,7 +354,7 @@ optionrom_setup(void) if (CONFIG_OPTIONROMS_DEPLOYED) { // Option roms are already deployed on the system. u32 pos = post_vga; - while (pos < rom_get_top()) { + while (pos < rom_get_max()) { int ret = init_optionrom((void*)pos, 0, 0); if (ret) pos += OPTION_ROM_ALIGN; @@ -436,7 +436,7 @@ vgarom_setup(void) init_optionrom((void*)BUILD_ROM_START, 0, 1); } else { // Clear option rom memory - memset((void*)BUILD_ROM_START, 0, rom_get_top() - BUILD_ROM_START); + memset((void*)BUILD_ROM_START, 0, rom_get_max() - BUILD_ROM_START); // Find and deploy PCI VGA rom. struct pci_device *pci; diff --git a/src/pmm.c b/src/pmm.c index a7d0608..b003dd1 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -170,15 +170,15 @@ static struct allocinfo_s *RomBase; #define OPROM_HEADER_RESERVE 16 -// Return the memory position up to which roms may be located. +// Return the maximum memory position option roms may use. u32 -rom_get_top(void) +rom_get_max(void) { return ALIGN_DOWN((u32)RomBase->allocend - OPROM_HEADER_RESERVE , OPTION_ROM_ALIGN); } -// Return the end of the last deployed rom. +// Return the end of the last deployed option rom. u32 rom_get_last(void) { @@ -318,7 +318,7 @@ malloc_prepboot(void) dprintf(3, "malloc finalize\n"); // Place an optionrom signature around used low mem area. - u32 base = rom_get_top(); + u32 base = rom_get_max(); struct rom_header *dummyrom = (void*)base; dummyrom->signature = OPTION_ROM_SIGNATURE; int size = (BUILD_BIOS_ADDR - base) / 512; diff --git a/src/shadow.c b/src/shadow.c index c9e8165..0aac60b 100644 --- a/src/shadow.c +++ b/src/shadow.c @@ -80,7 +80,7 @@ make_bios_readonly_intel(u16 bdf, u32 pam0) wbinvd(); // Write protect roms from 0xc0000-0xf0000 - u32 romend = rom_get_last(), romtop = rom_get_top(); + u32 romend = rom_get_last(), romtop = rom_get_max(); int i; for (i=0; i<6; i++) { u32 mem = BUILD_ROM_START + i * 32*1024; diff --git a/src/util.h b/src/util.h index 8875d95..5729a2f 100644 --- a/src/util.h +++ b/src/util.h @@ -364,7 +364,7 @@ void pnp_init(void); // pmm.c extern struct zone_s ZoneLow, ZoneHigh, ZoneFSeg, ZoneTmpLow, ZoneTmpHigh; -u32 rom_get_top(void); +u32 rom_get_max(void); u32 rom_get_last(void); struct rom_header *rom_reserve(u32 size); int rom_confirm(u32 size); -- 1.7.11.7

1 0

[PATCH] Verify CC is valid during build tests.
by Kevin O'Connor 18 Feb '13

18 Feb '13

Update test-build.sh to report if it can't run the c compiler at all. Without this test, a totally non-working build environment will yield an "invalid LD" message which can be confusing. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- tools/test-build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/test-build.sh b/tools/test-build.sh index ce0aca9..081f9fd 100755 --- a/tools/test-build.sh +++ b/tools/test-build.sh @@ -41,9 +41,16 @@ SECTIONS } EOF $CC -O -g -c $TMPFILE1 -o $TMPFILE1o > /dev/null 2>&1 +if [ $? -ne 0 ]; then + echo "Unable to execute the C compiler ($CC)." >&2 + echo "" >&2 + echo "Please install a working compiler and retry." >&2 + echo -1 + exit 0 +fi $LD -T $TMPFILE1_ld $TMPFILE1o -o $TMPFILE2o > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "The version of LD on this system does not properly handle" >&2 + echo "The version of LD on this system ($LD) does not properly handle" >&2 echo "alignments. As a result, this project can not be built." >&2 echo "" >&2 echo "The problem may be the result of this LD bug report:" >&2 -- 1.7.11.7

1 0

[PATCH] build: Don't require $(OUT) to be a sub-directory of the main directory.
by Kevin O'Connor 17 Feb '13

17 Feb '13

Remove references to "../" and "out/" from the build so that "make OUT=/a/b/c/" will work. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- Makefile | 4 ++-- src/Kconfig | 2 +- tools/test-build.sh | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index fb0c89b..ab9ca0e 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ vpath %.S src vgasrc ################ Common build rules # Verify the build environment works. -TESTGCC:=$(shell CC="$(CC)" LD="$(LD)" IASL="$(IASL)" tools/test-build.sh) +TESTGCC:=$(shell OUT="$(OUT)" CC="$(CC)" LD="$(LD)" IASL="$(IASL)" tools/test-build.sh) ifeq "$(TESTGCC)" "-1" $(error "Please upgrade the build environment") endif @@ -97,7 +97,7 @@ endif # Do a whole file compile by textually including all C code. define whole-compile @echo " Compiling whole program $3" -$(Q)printf '$(foreach i,$2,#include "../$i"\n)' > $3.tmp.c +$(Q)printf '$(foreach i,$2,#include "$(CURDIR)/$i"\n)' > $3.tmp.c $(Q)$(CC) $1 $(CFLAGSWHOLE) -c $3.tmp.c -o $3 endef diff --git a/src/Kconfig b/src/Kconfig index 6c9ab5f..119ea34 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -380,7 +380,7 @@ menu "BIOS Tables" Support generation of ACPI tables. endmenu -source ../vgasrc/Kconfig +source vgasrc/Kconfig menu "Debugging" config DEBUG_LEVEL diff --git a/tools/test-build.sh b/tools/test-build.sh index 7bd6d1f..ce0aca9 100755 --- a/tools/test-build.sh +++ b/tools/test-build.sh @@ -14,13 +14,13 @@ if [ $? -ne 0 ]; then exit 0 fi -mkdir -p out -TMPFILE1=out/tmp_testcompile1.c -TMPFILE1o=out/tmp_testcompile1.o -TMPFILE1_ld=out/tmp_testcompile1.lds -TMPFILE2=out/tmp_testcompile2.c -TMPFILE2o=out/tmp_testcompile2.o -TMPFILE3o=out/tmp_testcompile3.o +mkdir -p ${OUT} +TMPFILE1=${OUT}/tmp_testcompile1.c +TMPFILE1o=${OUT}/tmp_testcompile1.o +TMPFILE1_ld=${OUT}/tmp_testcompile1.lds +TMPFILE2=${OUT}/tmp_testcompile2.c +TMPFILE2o=${OUT}/tmp_testcompile2.o +TMPFILE3o=${OUT}/tmp_testcompile3.o # Test if ld's alignment handling is correct. This is a known problem # with the linker that ships with Ubuntu 11.04. -- 1.7.11.7

1 0

[PATCH v1] Reformat .lst in case it is generated by latest iasl.
by Bo Yang 16 Feb '13

16 Feb '13

Latest iasl generate .lst as 'number: ' instead of 'number....', then acpi_extrace.py fails to extract any useful information, building fails. Signed-off-by: Bo Yang <boyang(a)suse.com> --- tools/acpi_extract.py | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/acpi_extract.py b/tools/acpi_extract.py index 3295678..503784c 100755 --- a/tools/acpi_extract.py +++ b/tools/acpi_extract.py @@ -229,11 +229,23 @@ for line in fileinput.input(): m = pasl.search(line) if (m): add_asl(lineno, pasl.sub("", line)); + else: + # latest iasl output different format. + pasl = re.compile('^\s+([0-9]+):\s\s\s*') + m = pasl.search(line) + if (m): + add_asl(lineno, pasl.sub("", line)); # AML listing: offset in hex, then ...., then code paml = re.compile('^([0-9A-Fa-f]+)\.\.\.\.\s*') m = paml.search(line) if (m): add_aml(m.group(1), paml.sub("", line)) + else: + # latest iasl output different format. + paml = re.compile('^([0-9A-Fa-f]+):\s\s\s*') + m = paml.search(line) + if (m): + add_aml(m.group(1), paml.sub("", line)) # Now go over code # Track AML offset of a previous non-empty ASL command -- 1.6.0.2

2 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS February 2013