From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LtMZ8-00079G-Lg for qemu-devel@nongnu.org; Mon, 13 Apr 2009 09:51:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LtMZ2-000783-Fr for qemu-devel@nongnu.org; Mon, 13 Apr 2009 09:51:13 -0400 Received: from [199.232.76.173] (port=41220 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LtMZ0-00077k-V9 for qemu-devel@nongnu.org; Mon, 13 Apr 2009 09:51:07 -0400 Received: from mtaout02-winn.ispmail.ntl.com ([81.103.221.48]:28499) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LtMZ0-0005A5-Dz for qemu-devel@nongnu.org; Mon, 13 Apr 2009 09:51:06 -0400 Received: from aamtaout04-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout02-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20090413135105.HYRF4080.mtaout02-winn.ispmail.ntl.com@aamtaout04-winn.ispmail.ntl.com> for ; Mon, 13 Apr 2009 14:51:05 +0100 Received: from miranda.arrow ([213.107.22.181]) by aamtaout04-winn.ispmail.ntl.com (InterMail vG.2.02.00.01 201-2161-120-102-20060912) with ESMTP id <20090413135105.ICWE22934.aamtaout04-winn.ispmail.ntl.com@miranda.arrow> for ; Mon, 13 Apr 2009 14:51:05 +0100 Received: from sdb by miranda.arrow with local (Exim 4.63) (envelope-from ) id 1LtMZJ-0003P3-Pt for qemu-devel@nongnu.org; Mon, 13 Apr 2009 14:51:25 +0100 Date: Mon, 13 Apr 2009 14:51:25 +0100 From: Stuart Brady Message-ID: <20090413135125.GA13077@miranda.arrow> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] [v2] Add a --enable-debug-tcg option to configure Reply-To: Stuart Brady , qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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' Signed-off-by: Stuart Brady Index: tcg/tcg.c =================================================================== --- tcg/tcg.c (revision 7095) +++ tcg/tcg.c (working copy) @@ -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/tcg.h (revision 7095) +++ tcg/tcg.h (working copy) @@ -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 (revision 7095) +++ configure (working copy) @@ -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 -- Stuart Brady