summaryrefslogtreecommitdiffstats
path: root/util/x86emu
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2009-10-24 00:47:07 +0000
committerStefan Reinauer <stepan@openbios.org>2009-10-24 00:47:07 +0000
commit42dc721cdf45fee9940514aa35e8e821ece25019 (patch)
tree09deaff2cf8082eb235c4ddd9ba600f7ecc309be /util/x86emu
parentc1e7efa98d4dbdb8e7f397c68cd27d26cb0f78de (diff)
downloadcoreboot-staging-42dc721cdf45fee9940514aa35e8e821ece25019.zip
coreboot-staging-42dc721cdf45fee9940514aa35e8e821ece25019.tar.gz
move all register fram definitions to arch/register.h
Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4832 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/x86emu')
-rw-r--r--util/x86emu/x86.c10
-rw-r--r--util/x86emu/x86_interrupts.c10
2 files changed, 2 insertions, 18 deletions
diff --git a/util/x86emu/x86.c b/util/x86emu/x86.c
index 463c6df..5c0422e 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 5bb276a..1582ef1 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,
OpenPOWER on IntegriCloud