diff options
author | Patrick Georgi <patrick.georgi@secunet.com> | 2012-11-22 12:46:12 +0100 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-11-24 20:11:46 +0100 |
commit | 199b09cb7a3c590ccbf8d705c98cfde101378f20 (patch) | |
tree | 058511a1a638aa892c836a584633e155aaf0ebe6 /src/mainboard/roda | |
parent | 503af721a1f2c831fb360d1c1b2af38e0866fc35 (diff) |
x86 realmode: Use x86emu register file + defines
By using the (global) register file as defined by x86emu,
we can use the same register access for YABEL and realmode
interrupt handlers.
- the x86 realmode interrupt handlers changed in signature
- to access registers, use X86_$REGNAME now (eg. X86_EAX)
- x86_exception_handler still uses struct eregs *regs to
avoid spilling the x86emu register file stuff everywhere
Coccinelle script that handled most of this commit:
@ inthandler @
identifier FUNC, regs;
@@
int FUNC(
-struct eregs *regs
+void
)
{ ... }
@ depends on inthandler @
identifier regs;
@@
-regs->eax
+X86_EAX
@ depends on inthandler @
identifier regs;
@@
-regs->ebx
+X86_EBX
@ depends on inthandler @
identifier regs;
@@
-regs->ecx
+X86_ECX
@ depends on inthandler @
identifier regs;
@@
-regs->edx
+X86_EDX
@ depends on inthandler @
identifier regs;
@@
-regs->esi
+X86_ESI
@ depends on inthandler @
identifier regs;
@@
-regs->edi
+X86_EDI
@ depends on inthandler @
identifier regs;
@@
-regs->eflags
+X86_EFLAGS
@ depends on inthandler @
identifier regs;
@@
-regs->vector
+M.x86.intno
Change-Id: I60cc2c36646fe4b7f97457b1e297e3df086daa36
Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Reviewed-on: http://review.coreboot.org/1891
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard/roda')
-rw-r--r-- | src/mainboard/roda/rk886ex/mainboard.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c index f4e43bda0d..6d46edd91c 100644 --- a/src/mainboard/roda/rk886ex/mainboard.c +++ b/src/mainboard/roda/rk886ex/mainboard.c @@ -24,7 +24,7 @@ #include <arch/io.h> #include <arch/interrupt.h> #include <delay.h> -#if CONFIG_PCI_OPTION_ROM_RUN_YABEL +#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif @@ -91,7 +91,7 @@ static int int15_handler(void) #endif #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE -static int int15_handler(struct eregs *regs) +static int int15_handler(void) { int res = 0; @@ -100,7 +100,7 @@ static int int15_handler(struct eregs *regs) * the mainboard or northbridge code. * TODO: completely move to mainboards / chipsets. */ - switch (regs->eax & 0xffff) { + switch (X86_EAX & 0xffff) { /* And now Intel IGD code */ #define BOOT_DISPLAY_DEFAULT 0 #define BOOT_DISPLAY_CRT (1 << 0) @@ -112,19 +112,19 @@ static int int15_handler(struct eregs *regs) #define BOOT_DISPLAY_EFP2 (1 << 6) #define BOOT_DISPLAY_LCD2 (1 << 7) case 0x5f35: - regs->eax = 0x5f; - regs->ecx = BOOT_DISPLAY_DEFAULT; + X86_EAX = 0x5f; + X86_ECX = BOOT_DISPLAY_DEFAULT; res = 1; break; case 0x5f40: - regs->eax = 0x5f; - regs->ecx = 3; // This is mainboard specific - printk(BIOS_DEBUG, "DISPLAY=%x\n", regs->ecx); + X86_EAX = 0x5f; + X86_ECX = 3; // This is mainboard specific + printk(BIOS_DEBUG, "DISPLAY=%x\n", X86_ECX); res = 1; break; default: printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", - regs->eax & 0xffff); + X86_EAX & 0xffff); } return res; |