From a810a2de170565529464072edf2102443aaa9fab Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Sun, 7 Dec 2008 17:16:42 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5919 c046a42c-6fe2-441c-8c8c-71466251a162 --- tcg/tcg-op.h | 4 ++-- tcg/tcg.c | 2 +- tcg/tcg.h | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h index dc40446..728d681 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -132,7 +132,7 @@ static inline void tcg_gen_ldst_op_i64(int opc, TCGv_i64 val, TCGv_ptr base, 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_i32(int opc, TCGv_i32 arg1, TCGv_i32 arg2, } 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); diff --git a/tcg/tcg.c b/tcg/tcg.c index 78e7f93..e211e6e 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -747,7 +747,7 @@ char *tcg_get_arg_str_i32(TCGContext *s, char *buf, int buf_size, TCGv_i32 arg) 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) diff --git a/tcg/tcg.h b/tcg/tcg.h index 0581020..8d0d691 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -126,20 +126,20 @@ typedef tcg_target_ulong TCGArg; 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) -- 2.7.4