[v2] r4782 - in trunk/coreboot-v2/util/vgabios: . x86emu/include x86emu/include/x86emu x86emu/src/x86emu x86emu/src/x86emu/x86emu

Author: stepan
Date: 2009-10-16 03:08:07 +0200 (Fri, 16 Oct 2009)
New Revision: 4782

Modified:
   trunk/coreboot-v2/util/vgabios/helper_mem.c
   trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu.h
   trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu/fpu_regs.h
   trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu/regs.h
   trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/debug.c
   trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/decode.c
   trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/fpu.c
   trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/makefile
   trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/ops.c
   trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/x86emu/debug.h
Log:
this is probably in vain because this tool should use the same x86emu as
coreboot in order to produce comparable results. But, this patch drops the 
CONFIG_ from CONFIG_DEBUG because that was added by accident when we
automatically renamed coreboot variables to be consistent. "vgabios" is an
independent userspace utility, and it does not use newconfig nor Kconfig, so
it should not be converted. (trivial)

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/util/vgabios/helper_mem.c
===================================================================
--- trunk/coreboot-v2/util/vgabios/helper_mem.c	2009-10-15 22:40:41 UTC (rev 4781)
+++ trunk/coreboot-v2/util/vgabios/helper_mem.c	2009-10-16 01:08:07 UTC (rev 4782)
@@ -24,7 +24,7 @@
 };
 #endif

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
 void dprint(unsigned long start, unsigned long size)
 {
    int i, j;
@@ -44,7 +44,7 @@
    }
    printf("\n");
 }
-#endif /* CONFIG_DEBUG */
+#endif /* DEBUG */

#if 0
 #ifndef _PC

Modified: trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu/fpu_regs.h
===================================================================
--- trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu/fpu_regs.h	2009-10-15 22:40:41 UTC (rev 4781)
+++ trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu/fpu_regs.h	2009-10-16 01:08:07 UTC (rev 4782)
@@ -102,7 +102,7 @@

#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)    	\

Modified: trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu/regs.h
===================================================================
--- trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu/regs.h	2009-10-15 22:40:41 UTC (rev 4781)
+++ trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu/regs.h	2009-10-16 01:08:07 UTC (rev 4782)
@@ -275,7 +275,7 @@
     u32                         mode;
     volatile int                intr;   /* mask of pending interrupts */
    int                         debug;
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
    int                         check;
     u16                         saved_ip;
     u16                         saved_cs;

Modified: trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu.h
===================================================================
--- trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu.h	2009-10-15 22:40:41 UTC (rev 4781)
+++ trunk/coreboot-v2/util/vgabios/x86emu/include/x86emu.h	2009-10-16 01:08:07 UTC (rev 4782)
@@ -155,7 +155,7 @@
 void 	X86EMU_exec(void);
 void 	X86EMU_halt_sys(void);

-#ifdef	CONFIG_DEBUG
+#ifdef	DEBUG
 #define	HALT_SYS()	\
    printk("halt_sys: file %s, line %d\n", __FILE__, __LINE__), \
    X86EMU_halt_sys()

Modified: trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/debug.c
===================================================================
--- trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/debug.c	2009-10-15 22:40:41 UTC (rev 4781)
+++ trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/debug.c	2009-10-16 01:08:07 UTC (rev 4782)
@@ -42,7 +42,7 @@

/*----------------------------- Implementation ----------------------------*/

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG

static void     print_encoded_bytes (u16 s, u16 o);
 static void     print_decoded_instruction (void);
@@ -90,7 +90,7 @@
      * flag associated with the "execution", and we are using a copy
      * of the register struct.  All the major opcodes, once fully
      * decoded, have the following two steps: TRACE_REGS(r,m);
-     * SINGLE_STEP(r,m); which disappear if CONFIG_DEBUG is not defined to
+     * SINGLE_STEP(r,m); which disappear if DEBUG is not defined to
      * the preprocessor.  The TRACE_REGS macro expands to:
      *
      * if (debug&DEBUG_DISASSEMBLE)
@@ -354,7 +354,7 @@
     }
 }

-#endif /* CONFIG_DEBUG */
+#endif /* DEBUG */

void x86emu_dump_regs (void)
 {

Modified: trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/decode.c
===================================================================
--- trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/decode.c	2009-10-15 22:40:41 UTC (rev 4781)
+++ trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/decode.c	2009-10-16 01:08:07 UTC (rev 4782)
@@ -283,7 +283,7 @@
       case SYSMODE_SEGOVR_SS | SYSMODE_SEG_DS_SS:
         return  M.x86.R_SS;
       default:
-#ifdef  CONFIG_DEBUG
+#ifdef  DEBUG
         printk("error: should not happen:  multiple overrides.\n");
 #endif
         HALT_SYS();
@@ -303,7 +303,7 @@
 u8 fetch_data_byte(
     uint offset)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access((u16)get_data_segment(), offset);
 #endif
@@ -322,7 +322,7 @@
 u16 fetch_data_word(
     uint offset)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access((u16)get_data_segment(), offset);
 #endif
@@ -341,7 +341,7 @@
 u32 fetch_data_long(
     uint offset)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access((u16)get_data_segment(), offset);
 #endif
@@ -362,7 +362,7 @@
     uint segment,
     uint offset)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access(segment, offset);
 #endif
@@ -383,7 +383,7 @@
     uint segment,
     uint offset)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access(segment, offset);
 #endif
@@ -404,7 +404,7 @@
     uint segment,
     uint offset)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access(segment, offset);
 #endif
@@ -426,7 +426,7 @@
     uint offset,
     u8 val)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access((u16)get_data_segment(), offset);
 #endif
@@ -448,7 +448,7 @@
     uint offset,
     u16 val)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access((u16)get_data_segment(), offset);
 #endif
@@ -470,7 +470,7 @@
     uint offset,
     u32 val)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access((u16)get_data_segment(), offset);
 #endif
@@ -493,7 +493,7 @@
     uint offset,
     u8 val)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access(segment, offset);
 #endif
@@ -516,7 +516,7 @@
     uint offset,
     u16 val)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access(segment, offset);
 #endif
@@ -539,7 +539,7 @@
     uint offset,
     u32 val)
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (CHECK_DATA_ACCESS())
         x86emu_check_data_access(segment, offset);
 #endif

Modified: trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/fpu.c
===================================================================
--- trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/fpu.c	2009-10-15 22:40:41 UTC (rev 4781)
+++ trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/fpu.c	2009-10-16 01:08:07 UTC (rev 4782)
@@ -50,7 +50,7 @@
     END_OF_INSTR_NO_TRACE();
 }

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG

static char *x86emu_fpu_op_d9_tab[] = {
     "FLD\tDWORD PTR ", "ESC_D9\t", "FST\tDWORD PTR ", "FSTP\tDWORD PTR ",
@@ -89,7 +89,7 @@
     "FRNDINT", "FSCALE", "ESC_D9", "ESC_D9",
 };

-#endif /* CONFIG_DEBUG */
+#endif /* DEBUG */

/* opcode=0xd9 */
 void x86emuOp_esc_coprocess_d9(u8 X86EMU_UNUSED(op1))
@@ -100,7 +100,7 @@

START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (mod != 3) {
         DECODE_PRINTINSTR32(x86emu_fpu_op_d9_tab, mod, rh, rl);
     } else {
@@ -294,7 +294,7 @@
     END_OF_INSTR_NO_TRACE();
 }

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG

char *x86emu_fpu_op_da_tab[] = {
     "FIADD\tDWORD PTR ", "FIMUL\tDWORD PTR ", "FICOM\tDWORD PTR ",
@@ -316,7 +316,7 @@
     "ESC_DA     ", "ESC_DA ", "ESC_DA   ", "ESC_DA ",
 };

-#endif /* CONFIG_DEBUG */
+#endif /* DEBUG */

/* opcode=0xda */
 void x86emuOp_esc_coprocess_da(u8 X86EMU_UNUSED(op1))
@@ -384,7 +384,7 @@
     END_OF_INSTR_NO_TRACE();
 }

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG

char *x86emu_fpu_op_db_tab[] = {
     "FILD\tDWORD PTR ", "ESC_DB\t19", "FIST\tDWORD PTR ", "FISTP\tDWORD PTR ",
@@ -397,7 +397,7 @@
     "ESC_DB\t1C", "FLD\tTBYTE PTR ", "ESC_DB\t1E", "FSTP\tTBYTE PTR ",
 };

-#endif /* CONFIG_DEBUG */
+#endif /* DEBUG */

/* opcode=0xdb */
 void x86emuOp_esc_coprocess_db(u8 X86EMU_UNUSED(op1))
@@ -407,7 +407,7 @@

START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (mod != 3) {
         DECODE_PRINTINSTR32(x86emu_fpu_op_db_tab, mod, rh, rl);
     } else if (rh == 4) {       /* === 11 10 0 nnn */
@@ -428,7 +428,7 @@
     } else {
         DECODE_PRINTF2("ESC_DB %0x\n", (mod << 6) + (rh << 3) + (rl));
     }
-#endif /* CONFIG_DEBUG */
+#endif /* DEBUG */
     switch (mod) {
       case 0:
         destoffset = decode_rm00_address(rl);
@@ -504,7 +504,7 @@
     END_OF_INSTR_NO_TRACE();
 }

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
 char *x86emu_fpu_op_dc_tab[] = {
     "FADD\tQWORD PTR ", "FMUL\tQWORD PTR ", "FCOM\tQWORD PTR ",
     "FCOMP\tQWORD PTR ",
@@ -524,7 +524,7 @@
     "FADD\t", "FMUL\t", "FCOM\t", "FCOMP\t",
     "FSUBR\t", "FSUB\t", "FDIVR\t", "FDIV\t",
 };
-#endif /* CONFIG_DEBUG */
+#endif /* DEBUG */

/* opcode=0xdc */
 void x86emuOp_esc_coprocess_dc(u8 X86EMU_UNUSED(op1))
@@ -618,7 +618,7 @@
     END_OF_INSTR_NO_TRACE();
 }

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG

static char *x86emu_fpu_op_dd_tab[] = {
     "FLD\tQWORD PTR ", "ESC_DD\t29,", "FST\tQWORD PTR ", "FSTP\tQWORD PTR ",
@@ -634,7 +634,7 @@
     "ESC_DD\t2C,", "ESC_DD\t2D,", "ESC_DD\t2E,", "ESC_DD\t2F,",
 };

-#endif /* CONFIG_DEBUG */
+#endif /* DEBUG */

/* opcode=0xdd */
 void x86emuOp_esc_coprocess_dd(u8 X86EMU_UNUSED(op1))
@@ -718,7 +718,7 @@
     END_OF_INSTR_NO_TRACE();
 }

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG

static char *x86emu_fpu_op_de_tab[] =
 {
@@ -741,7 +741,7 @@
     "FSUBRP\t", "FSUBP\t", "FDIVRP\t", "FDIVP\t",
 };

-#endif /* CONFIG_DEBUG */
+#endif /* DEBUG */

/* opcode=0xde */
 void x86emuOp_esc_coprocess_de(u8 X86EMU_UNUSED(op1))
@@ -837,7 +837,7 @@
     END_OF_INSTR_NO_TRACE();
 }

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG

static char *x86emu_fpu_op_df_tab[] = {
     /* mod == 00 */
@@ -860,7 +860,7 @@
     "ESC_DF\t3C,", "ESC_DF\t3D,", "ESC_DF\t3E,", "ESC_DF\t3F,"
 };

-#endif /* CONFIG_DEBUG */
+#endif /* DEBUG */

/* opcode=0xdf */
 void x86emuOp_esc_coprocess_df(u8 X86EMU_UNUSED(op1))

Modified: trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/makefile
===================================================================
--- trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/makefile	2009-10-15 22:40:41 UTC (rev 4781)
+++ trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/makefile	2009-10-16 01:08:07 UTC (rev 4782)
@@ -32,7 +32,7 @@
 #
 #############################################################################

-.IMPORT .IGNORE: CONFIG_DEBUG
+.IMPORT .IGNORE: DEBUG

#----------------------------------------------------------------------------
 # Define the lists of object files
@@ -40,7 +40,7 @@

OBJECTS			= sys$O decode$O ops$O ops2$O prim_ops$O fpu$O debug$O
 CFLAGS      	+= -DSCITECH
-.IF $(CONFIG_DEBUG)
+.IF $(DEBUG)
 CFLAGS			+= -DDEBUG
 .ENDIF
 LIBCLEAN  		= *.dll *.lib *.a

Modified: trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/ops.c
===================================================================
--- trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/ops.c	2009-10-15 22:40:41 UTC (rev 4781)
+++ trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/ops.c	2009-10-16 01:08:07 UTC (rev 4782)
@@ -76,7 +76,7 @@

/* constant arrays to do several instructions in just one function */

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
 static char *x86emu_GenOpName[8] = {
     "ADD", "OR", "ADC", "SBB", "AND", "SUB", "XOR", "CMP"};
 #endif
@@ -157,7 +157,7 @@
     sar_long,
 };

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG

static char *opF6_names[8] =
   { "TEST\t", "", "NOT\t", "NEG\t", "MUL\t", "IMUL\t", "DIV\t", "IDIV\t" };
@@ -1278,7 +1278,7 @@
      */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -1356,7 +1356,7 @@
      */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -1472,7 +1472,7 @@
      */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -1548,7 +1548,7 @@
      */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -3080,7 +3080,7 @@
      */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -3155,7 +3155,7 @@
      */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -3632,7 +3632,7 @@
      */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -3703,7 +3703,7 @@
      */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -3805,7 +3805,7 @@
      */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -3878,7 +3878,7 @@
      */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -4863,7 +4863,7 @@
     /* Yet another special case instruction. */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings
@@ -4927,7 +4927,7 @@
     /* Yet another special case instruction. */
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
     if (DEBUG_DECODE()) {
         /* XXX DECODE_PRINTF may be changed to something more
            general, so that it is important to leave the strings

Modified: trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/x86emu/debug.h
===================================================================
--- trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/x86emu/debug.h	2009-10-15 22:40:41 UTC (rev 4781)
+++ trunk/coreboot-v2/util/vgabios/x86emu/src/x86emu/x86emu/debug.h	2009-10-16 01:08:07 UTC (rev 4782)
@@ -48,7 +48,7 @@
 #define CHECK_MEM_ACCESS_F              0x4 /*using regular linear pointer */
 #define CHECK_DATA_ACCESS_F             0x8 /*using segment:offset*/

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
 # define CHECK_IP_FETCH()               (M.x86.check & CHECK_IP_FETCH_F)
 # define CHECK_SP_ACCESS()              (M.x86.check & CHECK_SP_ACCESS_F)
 # define CHECK_MEM_ACCESS()             (M.x86.check & CHECK_MEM_ACCESS_F)
@@ -60,7 +60,7 @@
 # define CHECK_DATA_ACCESS()
 #endif

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
 # define DEBUG_INSTRUMENT()     (M.x86.debug & DEBUG_INSTRUMENT_F)
 # define DEBUG_DECODE()         (M.x86.debug & DEBUG_DECODE_F)
 # define DEBUG_TRACE()          (M.x86.debug & DEBUG_TRACE_F)
@@ -99,7 +99,7 @@
 # define DEBUG_DECODE_NOPRINT() 0
 #endif

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG

# define DECODE_PRINTF(x)       if (DEBUG_DECODE()) \
                                     x86emu_decode_printf(x)
@@ -129,7 +129,7 @@
 # define SAVE_IP_CS(x,y)
 #endif

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
 #define TRACE_REGS()                                        \
     if (DEBUG_DISASSEMBLE()) {                              \
         x86emu_just_disassemble();                          \
@@ -140,7 +140,7 @@
 # define TRACE_REGS()
 #endif

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
 # define SINGLE_STEP()      if (DEBUG_STEP()) x86emu_single_step()
 #else
 # define SINGLE_STEP()
@@ -150,7 +150,7 @@
     TRACE_REGS();           \
     SINGLE_STEP()

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
 # define START_OF_INSTR()
 # define END_OF_INSTR()     EndOfTheInstructionProcedure: x86emu_end_instr();
 # define END_OF_INSTR_NO_TRACE()    x86emu_end_instr();
@@ -160,7 +160,7 @@
 # define END_OF_INSTR_NO_TRACE()
 #endif

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
 # define  CALL_TRACE(u,v,w,x,s)                                 \
     if (DEBUG_TRACECALLREGS())                                  \
         x86emu_dump_regs();                                     \
@@ -176,7 +176,7 @@
 # define RETURN_TRACE(n,u,v)
 #endif

-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
 #define DB(x)   x
 #else
 #define DB(x)