Add a --enable-debug-tcg option to configure
PATCH v2 1/1 Add a --enable-debug-tcg option to configure
This patch allows DEBUG_TCGV to be defined (and also prevents NDEBUG from being defined) when passing an option to the configure script. This should help to prevent any accidental changes that enable DEBUG_TCGV in tcg/tcg.h from being committed in future, and may help to encourage testing with DEBUG_TCGV enabled.
Changes from v1:
Suppressed definition of NDEBUG when debugging is enabled Renamed the option from 'debug-tcgv' to 'debug-tcg'
tcg.c +5 -3
@@ -22,9 +22,6 @@* THE SOFTWARE. */ -/* define it to suppress various consistency checks (faster) */ -#define NDEBUG -/* define it to use liveness analysis (better code) */ #define USE_LIVENESS_ANALYSIS
@@ -45,6 +42,11 @@#include "qemu-common.h" #include "cache-utils.h" +#ifndef DEBUG_TCG +/* define it to suppress various consistency checks (faster) */ +#define NDEBUG +#endif +/* Note: the long term plan is to reduce the dependancies on the QEMU CPU definitions. Currently they are used for qemu_ld/st instructions */
tcg.h +4 -1
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu-common.h" #include "tcg-target.h" #if TCG_TARGET_REG_BITS ==32
@@ -120,7 +121,9 @@are aliases for target_ulong and host pointer sized values respectively. */ -//#define DEBUG_TCGV 1 +#ifdef DEBUG_TCG +#define DEBUG_TCGV 1 +#endif #ifdef DEBUG_TCGV
configure +10 -0
@@ -153,6 +153,7 @@ ;; esac gprof="no" +debug_tcg="no" sparse="no" strip_opt="yes" bigendian="no"
@@ -394,6 +395,10 @@ ;; --audio-drv-list=*) audio_drv_list="$optarg" ;; + --enable-debug-tcg) debug_tcg="yes" + ;; + --disable-debug-tcg) debug_tcg="no" + ;; --enable-sparse) sparse="yes" ;; --disable-sparse) sparse="no"
@@ -562,6 +567,8 @@ echo " --make=MAKE use specified make [$make]" echo " --install=INSTALL use specified install [$install]" echo " --static enable static build [$static]" +echo " --enable-debug-tcg enable TCG debugging" +echo " --disable-debug-tcg disable TCG debugging (default)" echo " --enable-sparse enable sparse checker" echo " --disable-sparse disable sparse checker (default)" echo " --disable-strip disable stripping binaries"
@@ -1359,6 +1366,9 @@ exit 1 ;; esac +if test "$debug_tcg" = "yes" ; then + echo "#define DEBUG_TCG 1" >> $config_h +fi if test "$sparse" = "yes" ; then echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_mak echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_mak
Signature · 1 line
Stuart Brady
Aurelien Jarno
AppliedQuoted 11 lines · Stuart Brady
This patch allows
DEBUG_TCGVto be defined (and also prevents NDEBUG from being defined) when passing an option to the configure script. This should help to prevent any accidental changes that enableDEBUG_TCGVintcg/tcg.hfrom being committed in future, and may help to encourage testing withDEBUG_TCGVenabled.Changes from v1:
Suppressed definition of NDEBUG when debugging is enabled Renamed the option from 'debug-tcgv' to 'debug-tcg'Signed-off-by Stuart Brady <[email protected]>
Thanks, applied.
Quoted 96 lines
Index:
tcg/tcg.c
===================================================================tcg.c +5
-3@@ -22,9 +22,6 @@* THE SOFTWARE. */ -/* define it to suppress various consistency checks (faster) */ -#define NDEBUG -/* define it to use liveness analysis (better code) */ #define USE_LIVENESS_ANALYSIS @@ -45,6 +42,11 @@#include "qemu-common.h" #include "cache-utils.h" +#ifndef DEBUG_TCG +/* define it to suppress various consistency checks (faster) */ +#define NDEBUG +#endif +/* Note: the long term plan is to reduce the dependancies on the QEMU CPU definitions. Currently they are used for qemu_ld/st instructions */ Index:
tcg/tcg.h
===================================================================tcg.h +4
-1@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu-common.h" #include "tcg-target.h" #if TCG_TARGET_REG_BITS ==32 @@ -120,7 +121,9 @@are aliases for target_ulong and host pointer sized values respectively. */ -//#define DEBUG_TCGV 1 +#ifdef DEBUG_TCG +#define DEBUG_TCGV 1 +#endif #ifdef DEBUG_TCGV Index: configure
===================================================================configure +10
-0@@ -153,6 +153,7 @@ ;; esac gprof="no" +debug_tcg="no" sparse="no" strip_opt="yes" bigendian="no"@@ -394,6 +395,10 @@ ;; --audio-drv-list=*) audio_drv_list="$optarg" ;; + --enable-debug-tcg) debug_tcg="yes" + ;; + --disable-debug-tcg) debug_tcg="no" + ;; --enable-sparse) sparse="yes" ;; --disable-sparse) sparse="no"@@ -562,6 +567,8 @@ echo " --make=MAKE use specified make [$make]" echo " --install=INSTALL use specified install [$install]" echo " --static enable static build [$static]" +echo " --enable-debug-tcg enable TCG debugging" +echo " --disable-debug-tcg disable TCG debugging (default)" echo " --enable-sparse enable sparse checker" echo " --disable-sparse disable sparse checker (default)" echo " --disable-strip disable stripping binaries"@@ -1359,6 +1366,9 @@ exit 1 ;; esac +if test "$debug_tcg" = "yes" ; then + echo "#define DEBUG_TCG 1" >> $config_h +fi if test "$sparse" = "yes" ; then echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_mak echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_makSignature · 1 line
Stuart Brady
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net