diff mbox series

[v4,148/163] tcg/tci: Remove support for add2/sub2

Message ID 20250415192515.232910-149-richard.henderson@linaro.org
State New
Headers show
Series tcg: Convert to TCGOutOp structures | expand

Commit Message

Richard Henderson April 15, 2025, 7:24 p.m. UTC 
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 tcg/tci/tcg-target-has.h |  8 ++---
 tcg/tci.c                | 66 +++-------------------------------------
 tcg/tci/tcg-target.c.inc | 28 -----------------
 3 files changed, 9 insertions(+), 93 deletions(-)

Comments

Pierrick Bouvier April 16, 2025, 7:37 p.m. UTC | #1 
On 4/15/25 12:24, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   tcg/tci/tcg-target-has.h |  8 ++---
>   tcg/tci.c                | 66 +++-------------------------------------
>   tcg/tci/tcg-target.c.inc | 28 -----------------
>   3 files changed, 9 insertions(+), 93 deletions(-)
> 
> diff --git a/tcg/tci/tcg-target-has.h b/tcg/tci/tcg-target-has.h
> index 6063f32f7b..310d45ba62 100644
> --- a/tcg/tci/tcg-target-has.h
> +++ b/tcg/tci/tcg-target-has.h
> @@ -8,13 +8,13 @@
>   #define TCG_TARGET_HAS_H
>   
>   #define TCG_TARGET_HAS_qemu_st8_i32     0
> -#define TCG_TARGET_HAS_add2_i32         1
> -#define TCG_TARGET_HAS_sub2_i32         1
> +#define TCG_TARGET_HAS_add2_i32         0
> +#define TCG_TARGET_HAS_sub2_i32         0
>   
>   #if TCG_TARGET_REG_BITS == 64
>   #define TCG_TARGET_HAS_extr_i64_i32     0
> -#define TCG_TARGET_HAS_add2_i64         1
> -#define TCG_TARGET_HAS_sub2_i64         1
> +#define TCG_TARGET_HAS_add2_i64         0
> +#define TCG_TARGET_HAS_sub2_i64         0
>   #endif /* TCG_TARGET_REG_BITS == 64 */
>   
>   #define TCG_TARGET_HAS_qemu_ldst_i128   0
> diff --git a/tcg/tci.c b/tcg/tci.c
> index d65ff2b8f1..a18478a07a 100644
> --- a/tcg/tci.c
> +++ b/tcg/tci.c
> @@ -179,17 +179,6 @@ static void tci_args_rrrrrc(uint32_t insn, TCGReg *r0, TCGReg *r1,
>       *c5 = extract32(insn, 28, 4);
>   }
>   
> -static void tci_args_rrrrrr(uint32_t insn, TCGReg *r0, TCGReg *r1,
> -                            TCGReg *r2, TCGReg *r3, TCGReg *r4, TCGReg *r5)
> -{
> -    *r0 = extract32(insn, 8, 4);
> -    *r1 = extract32(insn, 12, 4);
> -    *r2 = extract32(insn, 16, 4);
> -    *r3 = extract32(insn, 20, 4);
> -    *r4 = extract32(insn, 24, 4);
> -    *r5 = extract32(insn, 28, 4);
> -}
> -
>   static bool tci_compare32(uint32_t u0, uint32_t u1, TCGCond condition)
>   {
>       bool result = false;
> @@ -370,13 +359,12 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env,
>       for (;;) {
>           uint32_t insn;
>           TCGOpcode opc;
> -        TCGReg r0, r1, r2, r3, r4, r5;
> +        TCGReg r0, r1, r2, r3, r4;
>           tcg_target_ulong t1;
>           TCGCond condition;
>           uint8_t pos, len;
>           uint32_t tmp32;
>           uint64_t tmp64, taddr;
> -        uint64_t T1, T2;
>           MemOpIdx oi;
>           int32_t ofs;
>           void *ptr;
> @@ -445,9 +433,9 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env,
>   #if TCG_TARGET_REG_BITS == 32
>           case INDEX_op_setcond2_i32:
>               tci_args_rrrrrc(insn, &r0, &r1, &r2, &r3, &r4, &condition);
> -            T1 = tci_uint64(regs[r2], regs[r1]);
> -            T2 = tci_uint64(regs[r4], regs[r3]);
> -            regs[r0] = tci_compare64(T1, T2, condition);
> +            regs[r0] = tci_compare64(tci_uint64(regs[r2], regs[r1]),
> +                                     tci_uint64(regs[r4], regs[r3]),
> +                                     condition);
>               break;
>   #elif TCG_TARGET_REG_BITS == 64
>           case INDEX_op_setcond:
> @@ -717,22 +705,6 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env,
>                   tb_ptr = ptr;
>               }
>               break;
> -#if TCG_TARGET_REG_BITS == 32 || TCG_TARGET_HAS_add2_i32
> -        case INDEX_op_add2_i32:
> -            tci_args_rrrrrr(insn, &r0, &r1, &r2, &r3, &r4, &r5);
> -            T1 = tci_uint64(regs[r3], regs[r2]);
> -            T2 = tci_uint64(regs[r5], regs[r4]);
> -            tci_write_reg64(regs, r1, r0, T1 + T2);
> -            break;
> -#endif
> -#if TCG_TARGET_REG_BITS == 32 || TCG_TARGET_HAS_sub2_i32
> -        case INDEX_op_sub2_i32:
> -            tci_args_rrrrrr(insn, &r0, &r1, &r2, &r3, &r4, &r5);
> -            T1 = tci_uint64(regs[r3], regs[r2]);
> -            T2 = tci_uint64(regs[r5], regs[r4]);
> -            tci_write_reg64(regs, r1, r0, T1 - T2);
> -            break;
> -#endif
>           case INDEX_op_bswap16:
>               tci_args_rr(insn, &r0, &r1);
>               regs[r0] = bswap16(regs[r1]);
> @@ -786,24 +758,6 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env,
>               tci_args_rrr(insn, &r0, &r1, &r2);
>               regs[r0] = regs[r1] ? ctz64(regs[r1]) : regs[r2];
>               break;
> -#if TCG_TARGET_HAS_add2_i64
> -        case INDEX_op_add2_i64:
> -            tci_args_rrrrrr(insn, &r0, &r1, &r2, &r3, &r4, &r5);
> -            T1 = regs[r2] + regs[r4];
> -            T2 = regs[r3] + regs[r5] + (T1 < regs[r2]);
> -            regs[r0] = T1;
> -            regs[r1] = T2;
> -            break;
> -#endif
> -#if TCG_TARGET_HAS_add2_i64
> -        case INDEX_op_sub2_i64:
> -            tci_args_rrrrrr(insn, &r0, &r1, &r2, &r3, &r4, &r5);
> -            T1 = regs[r2] - regs[r4];
> -            T2 = regs[r3] - regs[r5] - (regs[r2] < regs[r4]);
> -            regs[r0] = T1;
> -            regs[r1] = T2;
> -            break;
> -#endif
>   
>               /* Shift/rotate operations (64 bit). */
>   
> @@ -952,7 +906,7 @@ int print_insn_tci(bfd_vma addr, disassemble_info *info)
>       const char *op_name;
>       uint32_t insn;
>       TCGOpcode op;
> -    TCGReg r0, r1, r2, r3, r4, r5;
> +    TCGReg r0, r1, r2, r3, r4;
>       tcg_target_ulong i1;
>       int32_t s2;
>       TCGCond c;
> @@ -1125,16 +1079,6 @@ int print_insn_tci(bfd_vma addr, disassemble_info *info)
>                              str_r(r2), str_r(r3));
>           break;
>   
> -    case INDEX_op_add2_i32:
> -    case INDEX_op_add2_i64:
> -    case INDEX_op_sub2_i32:
> -    case INDEX_op_sub2_i64:
> -        tci_args_rrrrrr(insn, &r0, &r1, &r2, &r3, &r4, &r5);
> -        info->fprintf_func(info->stream, "%-12s  %s, %s, %s, %s, %s, %s",
> -                           op_name, str_r(r0), str_r(r1), str_r(r2),
> -                           str_r(r3), str_r(r4), str_r(r5));
> -        break;
> -
>       case INDEX_op_qemu_ld_i64:
>       case INDEX_op_qemu_st_i64:
>           if (TCG_TARGET_REG_BITS == 32) {
> diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc
> index 947aa1aada..35c0c91f3e 100644
> --- a/tcg/tci/tcg-target.c.inc
> +++ b/tcg/tci/tcg-target.c.inc
> @@ -66,12 +66,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
>       case INDEX_op_st_i64:
>           return C_O0_I2(r, r);
>   
> -    case INDEX_op_add2_i32:
> -    case INDEX_op_add2_i64:
> -    case INDEX_op_sub2_i32:
> -    case INDEX_op_sub2_i64:
> -        return C_O2_I4(r, r, r, r, r, r);
> -
>       case INDEX_op_qemu_ld_i32:
>           return C_O1_I1(r, r);
>       case INDEX_op_qemu_ld_i64:
> @@ -346,22 +340,6 @@ static void tcg_out_op_rrrrrc(TCGContext *s, TCGOpcode op,
>       tcg_out32(s, insn);
>   }
>   
> -static void tcg_out_op_rrrrrr(TCGContext *s, TCGOpcode op,
> -                              TCGReg r0, TCGReg r1, TCGReg r2,
> -                              TCGReg r3, TCGReg r4, TCGReg r5)
> -{
> -    tcg_insn_unit insn = 0;
> -
> -    insn = deposit32(insn, 0, 8, op);
> -    insn = deposit32(insn, 8, 4, r0);
> -    insn = deposit32(insn, 12, 4, r1);
> -    insn = deposit32(insn, 16, 4, r2);
> -    insn = deposit32(insn, 20, 4, r3);
> -    insn = deposit32(insn, 24, 4, r4);
> -    insn = deposit32(insn, 28, 4, r5);
> -    tcg_out32(s, insn);
> -}
> -
>   static void tcg_out_ldst(TCGContext *s, TCGOpcode op, TCGReg val,
>                            TCGReg base, intptr_t offset)
>   {
> @@ -1182,12 +1160,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
>           tcg_out_ldst(s, opc, args[0], args[1], args[2]);
>           break;
>   
> -    CASE_32_64(add2)
> -    CASE_32_64(sub2)
> -        tcg_out_op_rrrrrr(s, opc, args[0], args[1], args[2],
> -                          args[3], args[4], args[5]);
> -        break;
> -
>       case INDEX_op_qemu_ld_i64:
>       case INDEX_op_qemu_st_i64:
>           if (TCG_TARGET_REG_BITS == 32) {

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff mbox series

Patch

diff --git a/tcg/tci/tcg-target-has.h b/tcg/tci/tcg-target-has.h
index 6063f32f7b..310d45ba62 100644
--- a/tcg/tci/tcg-target-has.h
+++ b/tcg/tci/tcg-target-has.h
@@ -8,13 +8,13 @@ 
 #define TCG_TARGET_HAS_H
 
 #define TCG_TARGET_HAS_qemu_st8_i32     0
-#define TCG_TARGET_HAS_add2_i32         1
-#define TCG_TARGET_HAS_sub2_i32         1
+#define TCG_TARGET_HAS_add2_i32         0
+#define TCG_TARGET_HAS_sub2_i32         0
 
 #if TCG_TARGET_REG_BITS == 64
 #define TCG_TARGET_HAS_extr_i64_i32     0
-#define TCG_TARGET_HAS_add2_i64         1
-#define TCG_TARGET_HAS_sub2_i64         1
+#define TCG_TARGET_HAS_add2_i64         0
+#define TCG_TARGET_HAS_sub2_i64         0
 #endif /* TCG_TARGET_REG_BITS == 64 */
 
 #define TCG_TARGET_HAS_qemu_ldst_i128   0
diff --git a/tcg/tci.c b/tcg/tci.c
index d65ff2b8f1..a18478a07a 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -179,17 +179,6 @@  static void tci_args_rrrrrc(uint32_t insn, TCGReg *r0, TCGReg *r1,
     *c5 = extract32(insn, 28, 4);
 }
 
-static void tci_args_rrrrrr(uint32_t insn, TCGReg *r0, TCGReg *r1,
-                            TCGReg *r2, TCGReg *r3, TCGReg *r4, TCGReg *r5)
-{
-    *r0 = extract32(insn, 8, 4);
-    *r1 = extract32(insn, 12, 4);
-    *r2 = extract32(insn, 16, 4);
-    *r3 = extract32(insn, 20, 4);
-    *r4 = extract32(insn, 24, 4);
-    *r5 = extract32(insn, 28, 4);
-}
-
 static bool tci_compare32(uint32_t u0, uint32_t u1, TCGCond condition)
 {
     bool result = false;
@@ -370,13 +359,12 @@  uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env,
     for (;;) {
         uint32_t insn;
         TCGOpcode opc;
-        TCGReg r0, r1, r2, r3, r4, r5;
+        TCGReg r0, r1, r2, r3, r4;
         tcg_target_ulong t1;
         TCGCond condition;
         uint8_t pos, len;
         uint32_t tmp32;
         uint64_t tmp64, taddr;
-        uint64_t T1, T2;
         MemOpIdx oi;
         int32_t ofs;
         void *ptr;
@@ -445,9 +433,9 @@  uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env,
 #if TCG_TARGET_REG_BITS == 32
         case INDEX_op_setcond2_i32:
             tci_args_rrrrrc(insn, &r0, &r1, &r2, &r3, &r4, &condition);
-            T1 = tci_uint64(regs[r2], regs[r1]);
-            T2 = tci_uint64(regs[r4], regs[r3]);
-            regs[r0] = tci_compare64(T1, T2, condition);
+            regs[r0] = tci_compare64(tci_uint64(regs[r2], regs[r1]),
+                                     tci_uint64(regs[r4], regs[r3]),
+                                     condition);
             break;
 #elif TCG_TARGET_REG_BITS == 64
         case INDEX_op_setcond:
@@ -717,22 +705,6 @@  uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env,
                 tb_ptr = ptr;
             }
             break;
-#if TCG_TARGET_REG_BITS == 32 || TCG_TARGET_HAS_add2_i32
-        case INDEX_op_add2_i32:
-            tci_args_rrrrrr(insn, &r0, &r1, &r2, &r3, &r4, &r5);
-            T1 = tci_uint64(regs[r3], regs[r2]);
-            T2 = tci_uint64(regs[r5], regs[r4]);
-            tci_write_reg64(regs, r1, r0, T1 + T2);
-            break;
-#endif
-#if TCG_TARGET_REG_BITS == 32 || TCG_TARGET_HAS_sub2_i32
-        case INDEX_op_sub2_i32:
-            tci_args_rrrrrr(insn, &r0, &r1, &r2, &r3, &r4, &r5);
-            T1 = tci_uint64(regs[r3], regs[r2]);
-            T2 = tci_uint64(regs[r5], regs[r4]);
-            tci_write_reg64(regs, r1, r0, T1 - T2);
-            break;
-#endif
         case INDEX_op_bswap16:
             tci_args_rr(insn, &r0, &r1);
             regs[r0] = bswap16(regs[r1]);
@@ -786,24 +758,6 @@  uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env,
             tci_args_rrr(insn, &r0, &r1, &r2);
             regs[r0] = regs[r1] ? ctz64(regs[r1]) : regs[r2];
             break;
-#if TCG_TARGET_HAS_add2_i64
-        case INDEX_op_add2_i64:
-            tci_args_rrrrrr(insn, &r0, &r1, &r2, &r3, &r4, &r5);
-            T1 = regs[r2] + regs[r4];
-            T2 = regs[r3] + regs[r5] + (T1 < regs[r2]);
-            regs[r0] = T1;
-            regs[r1] = T2;
-            break;
-#endif
-#if TCG_TARGET_HAS_add2_i64
-        case INDEX_op_sub2_i64:
-            tci_args_rrrrrr(insn, &r0, &r1, &r2, &r3, &r4, &r5);
-            T1 = regs[r2] - regs[r4];
-            T2 = regs[r3] - regs[r5] - (regs[r2] < regs[r4]);
-            regs[r0] = T1;
-            regs[r1] = T2;
-            break;
-#endif
 
             /* Shift/rotate operations (64 bit). */
 
@@ -952,7 +906,7 @@  int print_insn_tci(bfd_vma addr, disassemble_info *info)
     const char *op_name;
     uint32_t insn;
     TCGOpcode op;
-    TCGReg r0, r1, r2, r3, r4, r5;
+    TCGReg r0, r1, r2, r3, r4;
     tcg_target_ulong i1;
     int32_t s2;
     TCGCond c;
@@ -1125,16 +1079,6 @@  int print_insn_tci(bfd_vma addr, disassemble_info *info)
                            str_r(r2), str_r(r3));
         break;
 
-    case INDEX_op_add2_i32:
-    case INDEX_op_add2_i64:
-    case INDEX_op_sub2_i32:
-    case INDEX_op_sub2_i64:
-        tci_args_rrrrrr(insn, &r0, &r1, &r2, &r3, &r4, &r5);
-        info->fprintf_func(info->stream, "%-12s  %s, %s, %s, %s, %s, %s",
-                           op_name, str_r(r0), str_r(r1), str_r(r2),
-                           str_r(r3), str_r(r4), str_r(r5));
-        break;
-
     case INDEX_op_qemu_ld_i64:
     case INDEX_op_qemu_st_i64:
         if (TCG_TARGET_REG_BITS == 32) {
diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc
index 947aa1aada..35c0c91f3e 100644
--- a/tcg/tci/tcg-target.c.inc
+++ b/tcg/tci/tcg-target.c.inc
@@ -66,12 +66,6 @@  tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
     case INDEX_op_st_i64:
         return C_O0_I2(r, r);
 
-    case INDEX_op_add2_i32:
-    case INDEX_op_add2_i64:
-    case INDEX_op_sub2_i32:
-    case INDEX_op_sub2_i64:
-        return C_O2_I4(r, r, r, r, r, r);
-
     case INDEX_op_qemu_ld_i32:
         return C_O1_I1(r, r);
     case INDEX_op_qemu_ld_i64:
@@ -346,22 +340,6 @@  static void tcg_out_op_rrrrrc(TCGContext *s, TCGOpcode op,
     tcg_out32(s, insn);
 }
 
-static void tcg_out_op_rrrrrr(TCGContext *s, TCGOpcode op,
-                              TCGReg r0, TCGReg r1, TCGReg r2,
-                              TCGReg r3, TCGReg r4, TCGReg r5)
-{
-    tcg_insn_unit insn = 0;
-
-    insn = deposit32(insn, 0, 8, op);
-    insn = deposit32(insn, 8, 4, r0);
-    insn = deposit32(insn, 12, 4, r1);
-    insn = deposit32(insn, 16, 4, r2);
-    insn = deposit32(insn, 20, 4, r3);
-    insn = deposit32(insn, 24, 4, r4);
-    insn = deposit32(insn, 28, 4, r5);
-    tcg_out32(s, insn);
-}
-
 static void tcg_out_ldst(TCGContext *s, TCGOpcode op, TCGReg val,
                          TCGReg base, intptr_t offset)
 {
@@ -1182,12 +1160,6 @@  static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
         tcg_out_ldst(s, opc, args[0], args[1], args[2]);
         break;
 
-    CASE_32_64(add2)
-    CASE_32_64(sub2)
-        tcg_out_op_rrrrrr(s, opc, args[0], args[1], args[2],
-                          args[3], args[4], args[5]);
-        break;
-
     case INDEX_op_qemu_ld_i64:
     case INDEX_op_qemu_st_i64:
         if (TCG_TARGET_REG_BITS == 32) {