From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L9NFS-0005i4-5m for qemu-devel@nongnu.org; Sun, 07 Dec 2008 12:16:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L9NFR-0005gu-5P for qemu-devel@nongnu.org; Sun, 07 Dec 2008 12:16:49 -0500 Received: from [199.232.76.173] (port=45948 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L9NFQ-0005gY-S3 for qemu-devel@nongnu.org; Sun, 07 Dec 2008 12:16:48 -0500 Received: from savannah.gnu.org ([199.232.41.3]:41252 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L9NFQ-0008WV-1p for qemu-devel@nongnu.org; Sun, 07 Dec 2008 12:16:48 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L9NFM-0002OA-KI for qemu-devel@nongnu.org; Sun, 07 Dec 2008 17:16:44 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L9NFL-0002O1-Tw for qemu-devel@nongnu.org; Sun, 07 Dec 2008 17:16:44 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Sun, 07 Dec 2008 17:16:43 +0000 Subject: [Qemu-devel] [5919] Some fixes for TCG debugging Reply-To: 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 Revision: 5919 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5919 Author: blueswir1 Date: 2008-12-07 17:16:42 +0000 (Sun, 07 Dec 2008) Log Message: ----------- Some fixes for TCG debugging This fixes a few things after Paul's improvements for TCG debugging: - change TCGv_i64 field name to something different from TCGv_i32 - fix things in tcg that the above change made visible. Signed-off-by: Laurent Desnogues Modified Paths: -------------- trunk/tcg/tcg-op.h trunk/tcg/tcg.c trunk/tcg/tcg.h Modified: trunk/tcg/tcg-op.h =================================================================== --- trunk/tcg/tcg-op.h 2008-12-07 16:23:22 UTC (rev 5918) +++ trunk/tcg/tcg-op.h 2008-12-07 17:16:42 UTC (rev 5919) @@ -132,7 +132,7 @@ TCGArg offset) { *gen_opc_ptr++ = opc; - *gen_opparam_ptr++ = GET_TCGV_I32(val); + *gen_opparam_ptr++ = GET_TCGV_I64(val); *gen_opparam_ptr++ = GET_TCGV_PTR(base); *gen_opparam_ptr++ = offset; } @@ -166,7 +166,7 @@ } static inline void tcg_gen_op4_i64(int opc, TCGv_i64 arg1, TCGv_i64 arg2, - TCGv_i64 arg3, TCGv_i32 arg4) + TCGv_i64 arg3, TCGv_i64 arg4) { *gen_opc_ptr++ = opc; *gen_opparam_ptr++ = GET_TCGV_I64(arg1); Modified: trunk/tcg/tcg.c =================================================================== --- trunk/tcg/tcg.c 2008-12-07 16:23:22 UTC (rev 5918) +++ trunk/tcg/tcg.c 2008-12-07 17:16:42 UTC (rev 5919) @@ -747,7 +747,7 @@ char *tcg_get_arg_str_i64(TCGContext *s, char *buf, int buf_size, TCGv_i64 arg) { - return tcg_get_arg_str_idx(s, buf, buf_size, GET_TCGV_I32(arg)); + return tcg_get_arg_str_idx(s, buf, buf_size, GET_TCGV_I64(arg)); } static int helper_cmp(const void *p1, const void *p2) Modified: trunk/tcg/tcg.h =================================================================== --- trunk/tcg/tcg.h 2008-12-07 16:23:22 UTC (rev 5918) +++ trunk/tcg/tcg.h 2008-12-07 17:16:42 UTC (rev 5919) @@ -126,20 +126,20 @@ typedef struct { - int n; + int i32; } TCGv_i32; typedef struct { - int n; + int i64; } TCGv_i64; #define MAKE_TCGV_I32(i) __extension__ \ ({ TCGv_i32 make_tcgv_tmp = {i}; make_tcgv_tmp;}) #define MAKE_TCGV_I64(i) __extension__ \ ({ TCGv_i64 make_tcgv_tmp = {i}; make_tcgv_tmp;}) -#define GET_TCGV_I32(t) ((t).n) -#define GET_TCGV_I64(t) ((t).n) +#define GET_TCGV_I32(t) ((t).i32) +#define GET_TCGV_I64(t) ((t).i64) #if TCG_TARGET_REG_BITS == 32 #define TCGV_LOW(t) MAKE_TCGV_I32(GET_TCGV_I64(t)) #define TCGV_HIGH(t) MAKE_TCGV_I32(GET_TCGV_I64(t) + 1)