[Qemu-devel] [4553] More TCGv type fixes.

[Paul Brook]

Revision: 4553
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4553
Author:   pbrook
Date:     2008-05-24 02:24:25 +0000 (Sat, 24 May 2008)

Log Message:
-----------
More TCGv type fixes.

Modified Paths:
--------------
    trunk/target-sparc/translate.c
    trunk/tcg/tcg-op.h

Modified: trunk/target-sparc/translate.c
===================================================================
--- trunk/target-sparc/translate.c      2008-05-24 02:22:00 UTC (rev 4552)
+++ trunk/target-sparc/translate.c      2008-05-24 02:24:25 UTC (rev 4553)
@@ -4401,7 +4401,8 @@
                     /* V9 stqf, store quad fpreg */
                     CHECK_FPU_FEATURE(dc, FLOAT128);
                     gen_op_load_fpr_QT0(QFPREG(rd));
-                    tcg_gen_helper_0_2(helper_stqf, cpu_addr, dc->mem_idx);
+                    tcg_gen_helper_0_2(helper_stqf, cpu_addr,
+                                       tcg_const_i32(dc->mem_idx));
                     break;
 #else /* !TARGET_SPARC64 */
                     /* stdfq, store floating point queue */

Modified: trunk/tcg/tcg-op.h
===================================================================
--- trunk/tcg/tcg-op.h  2008-05-24 02:22:00 UTC (rev 4552)
+++ trunk/tcg/tcg-op.h  2008-05-24 02:24:25 UTC (rev 4553)
@@ -56,6 +56,13 @@
     *gen_opparam_ptr++ = arg2;
 }
 
+static inline void tcg_gen_op2ii(int opc, TCGArg arg1, TCGArg arg2)
+{
+    *gen_opc_ptr++ = opc;
+    *gen_opparam_ptr++ = arg1;
+    *gen_opparam_ptr++ = arg2;
+}
+
 static inline void tcg_gen_op3(int opc, TCGv arg1, TCGv arg2, TCGv arg3)
 {
     *gen_opc_ptr++ = opc;
@@ -1406,8 +1413,8 @@
 {
     /* XXX: must really use a 32 bit size for TCGArg in all cases */
 #if TARGET_LONG_BITS > TCG_TARGET_REG_BITS
-    tcg_gen_op2i(INDEX_op_debug_insn_start, 
-                 (uint32_t)(pc), (uint32_t)(pc >> 32));
+    tcg_gen_op2ii(INDEX_op_debug_insn_start, 
+                  (uint32_t)(pc), (uint32_t)(pc >> 32));
 #else
     tcg_gen_op1i(INDEX_op_debug_insn_start, pc);
 #endif