[Qemu-devel] [PATCH] Some fixes for TCG debugging

["Laurent Desnogues" <laurent.desnogues@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

Hello,

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.

I am currently compiling all targets to see if this reveals some other
errors.


Laurent

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: tcg-debug.patch --]
[-- Type: text/x-patch; name=tcg-debug.patch, Size: 1847 bytes --]

Index: tcg/tcg-op.h
===================================================================
--- tcg/tcg-op.h	(revision 5733)
+++ tcg/tcg-op.h	(working copy)
@@ -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);
Index: tcg/tcg.c
===================================================================
--- tcg/tcg.c	(revision 5733)
+++ tcg/tcg.c	(working copy)
@@ -746,7 +746,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)
Index: tcg/tcg.h
===================================================================
--- tcg/tcg.h	(revision 5733)
+++ tcg/tcg.h	(working copy)
@@ -131,7 +131,7 @@
 
 typedef struct
 {
-    int n;
+    int n2;
 } TCGv_i64;
 
 #define MAKE_TCGV_I32(i) __extension__                  \
@@ -139,7 +139,7 @@
 #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_I64(t) ((t).n2)
 #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)