Some additional tweaks. The first patch impacts the main bios as well.
-Kevin
Kevin O'Connor (5): Direct compile 16bit C code instead of including via .S files. vgabios: Add version string to debug output. vgabios: Claim VBE 3 support; minor VBE cleanups. vgabios: Minor vgabios fixes. vgabios: Some tweaks to optimize stack space.
Makefile | 62 +++++++++++++++----------- src/code16gcc.s | 1 + src/romlayout.S | 11 +---- tools/checkstack.py | 2 +- vgasrc/clext.c | 4 +- vgasrc/vbe.c | 20 ++++----- vgasrc/vgabios.c | 120 ++++++++++++++++++++------------------------------ vgasrc/vgabios.h | 8 +++- vgasrc/vgaentry.S | 10 +--- 9 files changed, 107 insertions(+), 131 deletions(-) create mode 100644 src/code16gcc.s
Create a ".code16gcc" directive in src/code16gcc.s and use -Wa,src/code16gcc.s to tell gcc to compile directly to 16bit code. This eliminates the need to compile the C code to assembler and include in romlayout.S and vgaentry.S. This also allows those two assembler files to be compiled with debugging (-g) enabled.
Also, includes some Makefile cleanups.
Signed-off-by: Kevin O'Connor kevin@koconnor.net --- Makefile | 58 ++++++++++++++++++++++++++++++---------------------- src/code16gcc.s | 1 + src/romlayout.S | 11 +-------- vgasrc/vgaentry.S | 10 +------- 4 files changed, 38 insertions(+), 42 deletions(-) create mode 100644 src/code16gcc.s
diff --git a/Makefile b/Makefile index 513e8f1..07a1174 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # SeaBIOS build system # -# Copyright (C) 2008-2010 Kevin O'Connor kevin@koconnor.net +# Copyright (C) 2008-2012 Kevin O'Connor kevin@koconnor.net # # This file may be distributed under the terms of the GNU LGPLv3 license.
@@ -23,11 +23,11 @@ SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ biostables.c xen.c bmp.c SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c
+# 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 ;)
-# Default compiler flags -COMMONCFLAGS = -I$(OUT) -Os -MD \ +COMMONCFLAGS = -I$(OUT) -Os -MD -g \ -Wall -Wno-strict-aliasing -Wold-style-definition \ $(call cc-option,$(CC),-Wtype-limits,) \ -m32 -march=i386 -mregparm=3 -mpreferred-stack-boundary=2 \ @@ -38,14 +38,14 @@ COMMONCFLAGS += $(call cc-option,$(CC),-nopie,) COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
-CFLAGS32FLAT = $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0 -g -fomit-frame-pointer +CFLAGS32FLAT = $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0 -fomit-frame-pointer 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,) -CFLAGS32SEG = $(CFLAGSSEG) -DMODE16=0 -g -fomit-frame-pointer -CFLAGS16INC = $(CFLAGSSEG) -DMODE16=1 \ +CFLAGS32SEG = $(CFLAGSSEG) -DMODE16=0 -fomit-frame-pointer +CFLAGS16INC = $(CFLAGSSEG) -DMODE16=1 -Wa,src/code16gcc.s \ $(call cc-option,$(CC),--param large-stack-frame=4,-fno-inline) -CFLAGS16 = $(CFLAGS16INC) -g -fomit-frame-pointer +CFLAGS16 = $(CFLAGS16INC) -fomit-frame-pointer
# Run with "make V=1" to see the actual compile commands ifdef V @@ -79,7 +79,8 @@ all: $(target-y) vpath %.c src vgasrc vpath %.S src vgasrc
-################ Build rules + +################ Common build rules
# Verify the gcc configuration and test if -fwhole-program works. TESTGCC:=$(shell CC="$(CC)" LD="$(LD)" tools/test-gcc.sh) @@ -122,34 +123,37 @@ endif
$(OUT)%.s: %.c @echo " Compiling to assembler $@" - $(Q)$(CC) $(CFLAGS16INC) -S -c $< -o $@ + $(Q)$(CC) $(CFLAGS16) -S -c $< -o $@
$(OUT)%.lds: %.lds.S @echo " Precompiling $@" $(Q)$(CPP) -P -D__ASSEMBLY__ $< -o $@
+ +################ Main BIOS build rules + $(OUT)asm-offsets.s: $(OUT)autoconf.h
$(OUT)asm-offsets.h: $(OUT)asm-offsets.s @echo " Generating offset file $@" $(Q)./tools/gen-offsets.sh $< $@
- -$(OUT)ccode.16.s: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16) -S, $(addprefix src/, $(SRC16)),$@) +$(OUT)ccode16.o: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16), $(addprefix src/, $(SRC16)),$@)
$(OUT)code32seg.o: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS32SEG), $(addprefix src/, $(SRC32SEG)),$@)
$(OUT)ccode32flat.o: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS32FLAT), $(addprefix src/, $(SRC32FLAT)),$@)
-$(OUT)code16.o: romlayout.S $(OUT)ccode.16.s $(OUT)asm-offsets.h +$(OUT)romlayout.o: romlayout.S $(OUT)asm-offsets.h @echo " Compiling (16bit) $@" - $(Q)$(CC) $(CFLAGS16INC) -c -D__ASSEMBLY__ $< -o $@ + $(Q)$(CC) $(CFLAGS16) -c -D__ASSEMBLY__ $< -o $@
-$(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)code16.o tools/layoutrom.py +$(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(OUT)romlayout.o tools/layoutrom.py @echo " Building ld scripts (version "$(VERSION)")" $(Q)echo 'const char VERSION[] = "$(VERSION)";' > $(OUT)version.c $(Q)$(CC) $(CFLAGS32FLAT) -c $(OUT)version.c -o $(OUT)version.o $(Q)$(LD) -melf_i386 -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o + $(Q)$(LD) -melf_i386 -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 @@ -157,7 +161,7 @@ $(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)code16.o tool
# These are actually built by tools/layoutrom.py above, but by pulling them # into an extra rule we prevent make -j from spawning layoutrom.py 4 times. -$(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds $(OUT)code32flat.o: $(OUT)romlayout16.lds +$(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds $(OUT)code32flat.o $(OUT)code16.o: $(OUT)romlayout16.lds
$(OUT)rom16.o: $(OUT)code16.o $(OUT)romlayout16.lds @echo " Linking $@" @@ -187,17 +191,17 @@ SRCVGA=src/output.c src/util.c src/pci.c \ vgasrc/stdvga.c vgasrc/stdvgamodes.c vgasrc/stdvgaio.c \ vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodevga.c
-CFLAGS16VGA = $(CFLAGS16INC) -g -Isrc +CFLAGS16VGA = $(CFLAGS16INC) -Isrc
-$(OUT)vgaccode.16.s: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16VGA) -S, $(SRCVGA),$@) +$(OUT)vgaccode16.o: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16VGA), $(SRCVGA),$@)
-$(OUT)vgalayout16.o: vgaentry.S $(OUT)vgaccode.16.s $(OUT)asm-offsets.h +$(OUT)vgaentry.o: vgaentry.S $(OUT)autoconf.h @echo " Compiling (16bit) $@" - $(Q)$(CC) $(CFLAGS16INC) -c -D__ASSEMBLY__ -Isrc $< -o $@ + $(Q)$(CC) $(CFLAGS16VGA) -c -D__ASSEMBLY__ $< -o $@
-$(OUT)vgarom.o: $(OUT)vgalayout16.o $(OUT)vgalayout.lds +$(OUT)vgarom.o: $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgalayout.lds @echo " Linking $@" - $(Q)$(LD) --gc-sections -T $(OUT)vgalayout.lds $(OUT)vgalayout16.o -o $@ + $(Q)$(LD) --gc-sections -T $(OUT)vgalayout.lds $(OUT)vgaccode16.o $(OUT)vgaentry.o -o $@
$(OUT)vgabios.bin.raw: $(OUT)vgarom.o @echo " Extracting binary $@" @@ -207,7 +211,9 @@ $(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py @echo " Finalizing rom $@" $(Q)$(PYTHON) ./tools/buildrom.py $< $@
-####### dsdt build rules + +################ DSDT build rules + src/%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py @echo "Compiling DSDT" $(Q)cpp -P $< > $(OUT)$*.dsl.i.orig @@ -216,9 +222,9 @@ src/%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py $(Q)$(PYTHON) ./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off $(Q)cat $(OUT)$*.off > $@
-$(OUT)ccode32flat.o: src/acpi-dsdt.hex src/ssdt-proc.hex src/ssdt-pcihp.hex
-####### Kconfig rules +################ Kconfig rules + define do-kconfig $(Q)mkdir -p $(OUT)/tools/kconfig/lxdialog $(Q)mkdir -p $(OUT)/include/config @@ -230,7 +236,9 @@ $(KCONFIG_CONFIG): ; $(call do-kconfig, defconfig) %onfig: ; $(call do-kconfig, $@) help: ; $(call do-kconfig, $@)
-####### Generic rules + +################ Generic rules + clean: $(Q)rm -rf $(OUT)
diff --git a/src/code16gcc.s b/src/code16gcc.s new file mode 100644 index 0000000..8f7121b --- /dev/null +++ b/src/code16gcc.s @@ -0,0 +1 @@ +.code16gcc diff --git a/src/romlayout.S b/src/romlayout.S index 5983a4a..c4b2ef1 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -1,18 +1,10 @@ // Rom layout and bios assembler to C interface. // -// Copyright (C) 2008,2009 Kevin O'Connor kevin@koconnor.net +// Copyright (C) 2008-2012 Kevin O'Connor kevin@koconnor.net // Copyright (C) 2002 MandrakeSoft S.A. // // This file may be distributed under the terms of the GNU LGPLv3 license.
- -/**************************************************************** - * Include of 16bit C code - ****************************************************************/ - - .code16gcc -#include "ccode.16.s" - #include "config.h" // CONFIG_* #include "ioport.h" // PORT_A20 #include "bregs.h" // CR0_* @@ -29,6 +21,7 @@ // %edx = return location (in 32bit mode) // Clobbers: ecx, flags, segment registers, cr0, idt/gdt DECLFUNC transition32 + .code16gcc transition32: movl %eax, %ecx
diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S index 785d91f..d9fe05b 100644 --- a/vgasrc/vgaentry.S +++ b/vgasrc/vgaentry.S @@ -1,17 +1,10 @@ // Rom layout and bios assembler to C interface. // -// Copyright (C) 2009 Kevin O'Connor kevin@koconnor.net +// Copyright (C) 2009-2012 Kevin O'Connor kevin@koconnor.net // // This file may be distributed under the terms of the GNU LGPLv3 license.
-/**************************************************************** - * Include of 16bit C code - ****************************************************************/ - - .code16gcc -#include "vgaccode.16.s" - #include "config.h" // CONFIG_* #include "entryfuncs.S" // ENTRY_*
@@ -21,6 +14,7 @@ ****************************************************************/
.section .rom.header + .code16gcc .global _rom_header, _rom_header_size, _rom_header_checksum _rom_header: .word 0xaa55
Signed-off-by: Kevin O'Connor kevin@koconnor.net --- Makefile | 6 ++++-- vgasrc/vgabios.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile index 07a1174..5d834b7 100644 --- a/Makefile +++ b/Makefile @@ -200,8 +200,10 @@ $(OUT)vgaentry.o: vgaentry.S $(OUT)autoconf.h $(Q)$(CC) $(CFLAGS16VGA) -c -D__ASSEMBLY__ $< -o $@
$(OUT)vgarom.o: $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgalayout.lds - @echo " Linking $@" - $(Q)$(LD) --gc-sections -T $(OUT)vgalayout.lds $(OUT)vgaccode16.o $(OUT)vgaentry.o -o $@ + @echo " Linking $@ (version "$(VERSION)")" + $(Q)printf '#include "types.h"\nchar VERSION[] VAR16 = "$(VERSION)";' > $(OUT)vgaversion.c + $(Q)$(CC) $(CFLAGS16VGA) -c $(OUT)vgaversion.c -o $(OUT)vgaversion.o + $(Q)$(LD) --gc-sections -T $(OUT)vgalayout.lds $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgaversion.o -o $@
$(OUT)vgabios.bin.raw: $(OUT)vgarom.o @echo " Extracting binary $@" diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 7b6c50a..dc5d7e9 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -1243,6 +1243,8 @@ int HaveRunInit VAR16; void VISIBLE16 vga_post(struct bregs *regs) { + debug_serial_setup(); + dprintf(1, "Start SeaVGABIOS (version %s)\n", VERSION); debug_enter(regs, DEBUG_VGA_POST);
if (CONFIG_VGA_PCI && !GET_GLOBAL(HaveRunInit)) {
Claim support for VBE3 - that spec is actually more lenient for required minimum support.
Signed-off-by: Kevin O'Connor kevin@koconnor.net --- vgasrc/vbe.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c index 505cb61..852edbc 100644 --- a/vgasrc/vbe.c +++ b/vgasrc/vbe.c @@ -11,7 +11,7 @@ #include "bregs.h" // struct bregs #include "vbe.h" // struct vbe_info #include "util.h" // dprintf -#include "biosvar.h" // get_global_set +#include "biosvar.h" // GET_GLOBAL #include "vgahw.h" // vgahw_set_mode
u32 VBE_total_memory VAR16 = 256 * 1024; @@ -37,7 +37,7 @@ vbe_104f00(struct bregs *regs)
SET_FARVAR(seg, info->signature, VESA_SIGNATURE);
- SET_FARVAR(seg, info->version, 0x0200); + SET_FARVAR(seg, info->version, 0x0300);
SET_FARVAR(seg, info->oem_string, SEGOFF(get_global_seg(), (u32)VBE_OEM_STRING)); @@ -47,7 +47,7 @@ vbe_104f00(struct bregs *regs) u16 *destmode = (void*)info->reserved; SET_FARVAR(seg, info->video_mode, SEGOFF(seg, (u32)destmode));
- /* Total memory (in 64 blocks) */ + /* Total memory (in 64k blocks) */ SET_FARVAR(seg, info->total_memory , GET_GLOBAL(VBE_total_memory) / (64*1024));
@@ -77,7 +77,7 @@ vbe_104f01(struct bregs *regs) struct vgamode_s *vmode_g = vgahw_find_mode(mode); if (! vmode_g) { dprintf(1, "VBE mode %x not found\n", mode); - regs->ax = 0x0100; + regs->ax = 0x014f; return; }
@@ -88,10 +88,7 @@ vbe_104f01(struct bregs *regs) VBE_MODE_ATTRIBUTE_GRAPHICS_MODE | VBE_MODE_ATTRIBUTE_NOT_VGA_COMPATIBLE; u32 framebuffer = GET_GLOBAL(VBE_framebuffer); - int depth = GET_GLOBAL(vmode_g->depth); - if (depth == 4) - mode_attr |= VBE_MODE_ATTRIBUTE_TTY_BIOS_SUPPORT; - else if (framebuffer) + if (framebuffer) mode_attr |= VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE; SET_FARVAR(seg, info->mode_attributes, mode_attr); SET_FARVAR(seg, info->winA_attributes, @@ -114,13 +111,14 @@ vbe_104f01(struct bregs *regs) SET_FARVAR(seg, info->yres, height); SET_FARVAR(seg, info->xcharsize, GET_GLOBAL(vmode_g->cwidth)); SET_FARVAR(seg, info->ycharsize, GET_GLOBAL(vmode_g->cheight)); + int depth = GET_GLOBAL(vmode_g->depth); int planes = (depth == 4) ? 4 : 1; SET_FARVAR(seg, info->planes, planes); SET_FARVAR(seg, info->bits_per_pixel, depth); SET_FARVAR(seg, info->banks, 1); SET_FARVAR(seg, info->mem_model, GET_GLOBAL(vmode_g->memmodel)); SET_FARVAR(seg, info->bank_size, 0); - u32 pages = GET_GLOBAL(VBE_total_memory) / (height * linesize); + u32 pages = GET_GLOBAL(VBE_total_memory) / ALIGN(height * linesize, 64*1024); SET_FARVAR(seg, info->pages, (pages / planes) - 1); SET_FARVAR(seg, info->reserved0, 1);
@@ -259,7 +257,7 @@ vbe_104f05(struct bregs *regs) regs->ax = 0x004f; return; fail: - regs->ax = 0x0100; + regs->ax = 0x014f; }
static void
Signed-off-by: Kevin O'Connor kevin@koconnor.net --- vgasrc/clext.c | 4 ++-- vgasrc/vgabios.c | 22 +++++----------------- vgasrc/vgabios.h | 4 ++++ 3 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/vgasrc/clext.c b/vgasrc/clext.c index 7d1a604..e5dce35 100644 --- a/vgasrc/clext.c +++ b/vgasrc/clext.c @@ -533,8 +533,8 @@ clext_1012a0(struct bregs *regs) { struct vgamode_s *table_g = clext_find_mode(regs->al & 0x7f); regs->ah = (table_g ? 1 : 0); - regs->si = 0xffff; - regs->di = regs->ds = regs->es = regs->bx = (u32)a0h_callback; + regs->bx = (u32)a0h_callback; + regs->ds = regs->si = regs->es = regs->di = 0xffff; }
static void diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index dc5d7e9..bca2e9a 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -1,16 +1,10 @@ // VGA bios implementation // -// Copyright (C) 2009 Kevin O'Connor kevin@koconnor.net +// Copyright (C) 2009-2012 Kevin O'Connor kevin@koconnor.net // Copyright (C) 2001-2008 the LGPL VGABios developers Team // // This file may be distributed under the terms of the GNU LGPLv3 license.
- -// TODO: -// * review correctness of converted asm by comparing with RBIL -// -// * convert vbe/clext code - #include "bregs.h" // struct bregs #include "biosvar.h" // GET_BDA #include "util.h" // memset @@ -24,10 +18,6 @@ #include "pci.h" // pci_config_readw #include "pci_regs.h" // PCI_VENDOR_ID
-// XXX -#define DEBUG_VGA_POST 1 -#define DEBUG_VGA_10 3 - // Standard Video Save Pointer Table struct VideoSavePointer_s { struct segoff_s videoparam; @@ -46,7 +36,7 @@ struct VideoParam_s video_param_table[29] VAR16; /**************************************************************** * PCI Data ****************************************************************/ -#if CONFIG_VGA_PCI == 1 + struct pci_data rom_pci_data VAR16VISIBLE = { .signature = PCI_ROM_SIGNATURE, .vendor = CONFIG_VGA_VID, @@ -57,7 +47,7 @@ struct pci_data rom_pci_data VAR16VISIBLE = { .type = PCIROM_CODETYPE_X86, .indicator = 0x80, }; -#endif +
/**************************************************************** * Helper functions @@ -170,7 +160,7 @@ set_active_page(u8 page) if (!vmode_g) return;
- // Get pos curs pos for the right page + // Get cursor pos for the given page struct cursorpos cp = get_cursor_pos(page);
// Calculate memory address of start of page @@ -875,7 +865,7 @@ handle_101130(struct bregs *regs) regs->cx = GET_BDA(char_height) & 0xff;
// Set Highest char row - regs->dx = GET_BDA(video_rows); + regs->dl = GET_BDA(video_rows); }
static void @@ -1274,8 +1264,6 @@ vga_post(struct bregs *regs) extern void entry_10(void); SET_IVT(0x10, SEGOFF(get_global_seg(), (u32)entry_10));
- // XXX - clear screen and display info - SET_VGA(HaveRunInit, 1);
// Fixup checksum diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h index d32e1b0..13e5cce 100644 --- a/vgasrc/vgabios.h +++ b/vgasrc/vgabios.h @@ -73,6 +73,10 @@ extern u8 vgafont16[]; extern u8 vgafont14alt[]; extern u8 vgafont16alt[];
+// Debug settings +#define DEBUG_VGA_POST 1 +#define DEBUG_VGA_10 3 + // vgabios.c extern int VgaBDF; extern int HaveRunInit;
Gcc seems to handle passing structs by value if they are 4 bytes in size instead of 3 bytes. So, add a pad byte to struct carattr and struct cursorpos.
Reorganize set_cursor_pos(), verify_scroll(), and handle_1013() so there are less live variables.
Don't inline the VBE functions into the main handler code. Code calling VBE functions are newer and are more likely to provide adequate stack space - inlining can cause more stack usage for older functions (which may be stack constrained).
Signed-off-by: Kevin O'Connor kevin@koconnor.net --- tools/checkstack.py | 2 +- vgasrc/vbe.c | 2 +- vgasrc/vgabios.c | 96 ++++++++++++++++++++++----------------------------- vgasrc/vgabios.h | 4 +- 4 files changed, 45 insertions(+), 59 deletions(-)
diff --git a/tools/checkstack.py b/tools/checkstack.py index 428c296..717de2d 100755 --- a/tools/checkstack.py +++ b/tools/checkstack.py @@ -149,7 +149,7 @@ def calc(): stackusage += int(im.group('num'), 16)
if atstart: - if insn == 'movl %esp,%ebp': + if '%esp' in insn or insn.startswith('leal'): # Still part of initial header continue cur[1] = stackusage diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c index 852edbc..227a244 100644 --- a/vgasrc/vbe.c +++ b/vgasrc/vbe.c @@ -390,7 +390,7 @@ vbe_104fXX(struct bregs *regs) regs->ax = 0x0100; }
-void +void noinline handle_104f(struct bregs *regs) { if (!CONFIG_VGA_VBE) { diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index bca2e9a..58e467d 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -115,12 +115,14 @@ get_cursor_shape(u8 page) static void set_cursor_pos(struct cursorpos cp) { + u8 page = cp.page, x = cp.x, y = cp.y; + // Should not happen... - if (cp.page > 7) + if (page > 7) return;
// Bios cursor pos - SET_BDA(cursor_pos[cp.page], (cp.y << 8) | cp.x); + SET_BDA(cursor_pos[page], (y << 8) | x);
// Set the hardware cursor u8 current = GET_BDA(video_page); @@ -128,8 +130,8 @@ set_cursor_pos(struct cursorpos cp) return;
// Calculate the memory address - int address = (GET_BDA(video_pagesize) * cp.page - + (cp.x + cp.y * GET_BDA(video_cols)) * 2); + int address = (GET_BDA(video_pagesize) * page + + (x + y * GET_BDA(video_cols)) * 2); stdvga_set_cursor_pos(address); }
@@ -234,9 +236,9 @@ write_teletype(struct cursorpos *pcp, struct carattr ca) cp.y++; break; case '\t': + ca.car = ' '; do { - struct carattr dummyca = {' ', ca.attr, ca.use_attr}; - vgafb_write_char(cp, dummyca); + vgafb_write_char(cp, ca); cp.x++; } while (cp.x < nbcols && cp.x % 8); break; @@ -261,34 +263,6 @@ write_teletype(struct cursorpos *pcp, struct carattr ca) scroll_one(nbrows, nbcols, cp.page); }
-// Write out a buffer of alternating characters and attributes. -static void -write_attr_string(struct cursorpos *pcp, u16 count, u16 seg, u8 *offset_far) -{ - while (count--) { - u8 car = GET_FARVAR(seg, *offset_far); - offset_far++; - u8 attr = GET_FARVAR(seg, *offset_far); - offset_far++; - - struct carattr ca = {car, attr, 1}; - write_teletype(pcp, ca); - } -} - -// Write out a buffer of characters. -static void -write_string(struct cursorpos *pcp, u8 attr, u16 count, u16 seg, u8 *offset_far) -{ - while (count--) { - u8 car = GET_FARVAR(seg, *offset_far); - offset_far++; - - struct carattr ca = {car, attr, 1}; - write_teletype(pcp, ca); - } -} -
/**************************************************************** * Save and restore bda state @@ -492,24 +466,24 @@ handle_1005(struct bregs *regs) static void verify_scroll(struct bregs *regs, int dir) { - u8 page = GET_BDA(video_page); - struct cursorpos ul = {regs->cl, regs->ch, page}; - struct cursorpos lr = {regs->dl, regs->dh, page}; - + u8 ulx = regs->cl, uly = regs->ch, lrx = regs->dl, lry = regs->dh; u16 nbrows = GET_BDA(video_rows) + 1; - if (lr.y >= nbrows) - lr.y = nbrows - 1; + if (lry >= nbrows) + lry = nbrows - 1; u16 nbcols = GET_BDA(video_cols); - if (lr.x >= nbcols) - lr.x = nbcols - 1; + if (lrx >= nbcols) + lrx = nbcols - 1;
- if (ul.x > lr.x || ul.y > lr.y) + if (ulx > lrx || uly > lry) return;
- u16 nblines = regs->al; - if (!nblines || nblines > lr.y - ul.y + 1) - nblines = lr.y - ul.y + 1; + int nblines = regs->al; + if (!nblines || nblines > lry - uly + 1) + nblines = lry - uly + 1;
+ u8 page = GET_BDA(video_page); + struct cursorpos ul = {ulx, uly, page}; + struct cursorpos lr = {lrx, lry, page}; vgafb_scroll(dir * nblines, regs->bh, ul, lr); }
@@ -1014,17 +988,29 @@ handle_1012(struct bregs *regs) static void noinline handle_1013(struct bregs *regs) { - struct cursorpos cp = {regs->dl, regs->dh, regs->bh}; - // if row=0xff special case : use current cursor position - if (cp.y == 0xff) - cp = get_cursor_pos(cp.page); - u8 flag = regs->al; - if (flag & 2) - write_attr_string(&cp, regs->cx, regs->es, (void*)(regs->bp + 0)); + struct cursorpos cp; + if (regs->dh == 0xff) + // if row=0xff special case : use current cursor position + cp = get_cursor_pos(regs->bh); else - write_string(&cp, regs->bl, regs->cx, regs->es, (void*)(regs->bp + 0)); + cp = (struct cursorpos) {regs->dl, regs->dh, regs->bh}; + + u16 count = regs->cx; + u8 *offset_far = (void*)(regs->bp + 0); + u8 attr = regs->bl; + while (count--) { + u8 car = GET_FARVAR(regs->es, *offset_far); + offset_far++; + if (regs->al & 2) { + attr = GET_FARVAR(regs->es, *offset_far); + offset_far++; + } + + struct carattr ca = {car, attr, 1}; + write_teletype(&cp, ca); + }
- if (flag & 1) + if (regs->al & 1) set_cursor_pos(cp); }
diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h index 13e5cce..ff5ec45 100644 --- a/vgasrc/vgabios.h +++ b/vgasrc/vgabios.h @@ -82,10 +82,10 @@ extern int VgaBDF; extern int HaveRunInit; #define SET_VGA(var, val) SET_FARVAR(get_global_seg(), (var), (val)) struct carattr { - u8 car, attr, use_attr; + u8 car, attr, use_attr, pad; }; struct cursorpos { - u8 x, y, page; + u8 x, y, page, pad; }; int vga_bpp(struct vgamode_s *vmode_g); u16 calc_page_size(u8 memmodel, u16 width, u16 height);
-
Kevin O'Connor