From 7d0d5bd95c81784719e9745f5be411969eeef7af Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Tue, 29 Mar 2011 12:44:15 +0000 Subject: [PATCH] Make newer GCCs happy Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3690 --- src/cpu/core_dyn_x86.cpp | 7 ++----- src/cpu/core_dyn_x86/decoder.h | 8 ++++++-- src/cpu/core_dynrec.cpp | 8 +++----- src/cpu/core_dynrec/decoder.h | 8 ++++++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/cpu/core_dyn_x86.cpp b/src/cpu/core_dyn_x86.cpp index 851a04ed..ddf36393 100644 --- a/src/cpu/core_dyn_x86.cpp +++ b/src/cpu/core_dyn_x86.cpp @@ -61,11 +61,8 @@ #define DYN_PAGE_HASH (4096>>DYN_HASH_SHIFT) #define DYN_LINKS (16) -#if 0 -#define DYN_LOG LOG_MSG -#else -#define DYN_LOG -#endif +//#define DYN_LOG 1 //Turn logging on + #if C_FPU #define CPU_FPU 1 //Enable FPU escape instructions diff --git a/src/cpu/core_dyn_x86/decoder.h b/src/cpu/core_dyn_x86/decoder.h index 0f024541..dcdbcb30 100644 --- a/src/cpu/core_dyn_x86/decoder.h +++ b/src/cpu/core_dyn_x86/decoder.h @@ -2104,7 +2104,9 @@ restart_prefix: case 0xbf:dyn_mov_ev_gw(true);break; default: - DYN_LOG("Unhandled dual opcode 0F%02X",dual_code); +#if DYN_LOG + LOG_MSG("Unhandled dual opcode 0F%02X",dual_code); +#endif goto illegalopcode; } }break; @@ -2670,7 +2672,9 @@ restart_prefix: }} break; default: -// DYN_LOG("Dynamic unhandled opcode %X",opcode); +#if DYN_LOG +// LOG_MSG("Dynamic unhandled opcode %X",opcode); +#endif goto illegalopcode; } } diff --git a/src/cpu/core_dynrec.cpp b/src/cpu/core_dynrec.cpp index 79f9e15a..aa607653 100644 --- a/src/cpu/core_dynrec.cpp +++ b/src/cpu/core_dynrec.cpp @@ -62,11 +62,9 @@ #define DYN_PAGE_HASH (4096>>DYN_HASH_SHIFT) #define DYN_LINKS (16) -#if 0 -#define DYN_LOG LOG_MSG -#else -#define DYN_LOG -#endif + +//#define DYN_LOG 1 //Turn Logging on. + #if C_FPU #define CPU_FPU 1 //Enable FPU escape instructions diff --git a/src/cpu/core_dynrec/decoder.h b/src/cpu/core_dynrec/decoder.h index 0ca887c2..2d658e4c 100644 --- a/src/cpu/core_dynrec/decoder.h +++ b/src/cpu/core_dynrec/decoder.h @@ -242,7 +242,9 @@ restart_prefix: case 0xbf:dyn_movx_ev_gw(true);break; default: -// DYN_LOG("Unhandled dual opcode 0F%02X",dual_code); +#if DYN_LOG +// LOG_MSG("Unhandled dual opcode 0F%02X",dual_code); +#endif goto illegalopcode; } break; @@ -579,7 +581,9 @@ restart_prefix: break; default: -// DYN_LOG("Dynrec unhandled opcode %X",opcode); +#if DYN_LOG +// LOG_MSG("Dynrec unhandled opcode %X",opcode); +#endif goto illegalopcode; } }