diff options
Diffstat (limited to 'util/x86emu')
| -rw-r--r-- | util/x86emu/x86.c | 10 | ||||
| -rw-r--r-- | util/x86emu/x86_interrupts.c | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/util/x86emu/x86.c b/util/x86emu/x86.c index 463c6dfd29..5c0422e826 100644 --- a/util/x86emu/x86.c +++ b/util/x86emu/x86.c @@ -22,6 +22,7 @@ #ifdef CONFIG_COREBOOT_V2 #include <arch/io.h> +#include <arch/registers.h> #include <console/console.h> #define printk(x...) do_printk(x) #else @@ -34,15 +35,6 @@ struct realmode_idt { u16 offset, cs; }; -struct eregs { - uint32_t eax, ecx, edx, ebx, esp, ebp, esi, edi; - uint32_t vector; - uint32_t error_code; - uint32_t eip; - uint32_t cs; - uint32_t eflags; -}; - void x86_exception(struct eregs *info); extern unsigned char __idt_handler, __idt_handler_size; diff --git a/util/x86emu/x86_interrupts.c b/util/x86emu/x86_interrupts.c index 5bb276aa52..1582ef1ec1 100644 --- a/util/x86emu/x86_interrupts.c +++ b/util/x86emu/x86_interrupts.c @@ -26,21 +26,13 @@ #ifdef CONFIG_COREBOOT_V2 #include <console/console.h> #include <arch/io.h> +#include <arch/registers.h> #define printk(x...) do_printk(x) #else #include <console.h> #include <io.h> #endif -struct eregs { - uint32_t eax, ecx, edx, ebx, esp, ebp, esi, edi; - uint32_t vector; - uint32_t error_code; - uint32_t eip; - uint32_t cs; - uint32_t eflags; -}; - enum { CHECK = 0xb001, FINDDEV = 0xb102, |