diff options
| author | Myles Watson <mylesgw@gmail.com> | 2010-02-19 19:08:11 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2010-02-19 19:08:11 +0000 |
| commit | 8e9234ffff5730df6a498fae6cfaf5c0ee101c5b (patch) | |
| tree | 2e03670556aa79ee62c56ba7c0bb6ccc47c96326 /util/x86emu/include | |
| parent | 99f75793c1efbce8e0cde24d811ed1789a257604 (diff) | |
1. Change CONFIG_DEBUG to DEBUG in util/x86emu/*
2. Make DEBUG depend on CONFIG_YABEL_DEBUG_FLAGS being nonzero
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5131 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/x86emu/include')
| -rw-r--r-- | util/x86emu/include/x86emu/fpu_regs.h | 2 | ||||
| -rw-r--r-- | util/x86emu/include/x86emu/regs.h | 2 | ||||
| -rw-r--r-- | util/x86emu/include/x86emu/x86emu.h | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/util/x86emu/include/x86emu/fpu_regs.h b/util/x86emu/include/x86emu/fpu_regs.h index efc13ef2be..56e9a04d75 100644 --- a/util/x86emu/include/x86emu/fpu_regs.h +++ b/util/x86emu/include/x86emu/fpu_regs.h @@ -102,7 +102,7 @@ struct x86_fpu_registers { #endif /* X86_FPU_SUPPORT */ -#ifdef CONFIG_DEBUG +#ifdef DEBUG # define DECODE_PRINTINSTR32(t,mod,rh,rl) \ DECODE_PRINTF(t[(mod<<3)+(rh)]); # define DECODE_PRINTINSTR256(t,mod,rh,rl) \ diff --git a/util/x86emu/include/x86emu/regs.h b/util/x86emu/include/x86emu/regs.h index 4b368e4622..df5c6b2d90 100644 --- a/util/x86emu/include/x86emu/regs.h +++ b/util/x86emu/include/x86emu/regs.h @@ -279,7 +279,7 @@ typedef struct { u32 mode; volatile int intr; /* mask of pending interrupts */ volatile int debug; -#ifdef CONFIG_DEBUG +#ifdef DEBUG int check; u16 saved_ip; u16 saved_cs; diff --git a/util/x86emu/include/x86emu/x86emu.h b/util/x86emu/include/x86emu/x86emu.h index 60acfe763c..22e08a9542 100644 --- a/util/x86emu/include/x86emu/x86emu.h +++ b/util/x86emu/include/x86emu/x86emu.h @@ -47,8 +47,10 @@ #include <console/console.h> #undef printk #define printk(x...) do_printk(BIOS_DEBUG, x) -#if defined(CONFIG_DEBUG) && (CONFIG_DEBUG == 0) -#undef CONFIG_DEBUG +#if defined(CONFIG_YABEL_DEBUG_FLAGS) && (CONFIG_YABEL_DEBUG_FLAGS != 0) +#define DEBUG +#else +#undef DEBUG #endif #ifdef SCITECH @@ -164,7 +166,7 @@ void X86EMU_setMemBase(void *base, size_t size); void X86EMU_exec(void); void X86EMU_halt_sys(void); -#ifdef CONFIG_DEBUG +#ifdef DEBUG #define HALT_SYS() \ printk("halt_sys: in %s\n", __func__); \ X86EMU_halt_sys(); |