Re: [PATCH v5 11/57] tcg/tci: Reuse tci_args_l for calls.

2021-03-16 Thread Philippe Mathieu-Daudé
On 3/11/21 3:39 PM, Richard Henderson wrote:
> Signed-off-by: Richard Henderson 
> ---
>  tcg/tci.c | 38 +++---
>  1 file changed, 19 insertions(+), 19 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé 



[PATCH v5 11/57] tcg/tci: Reuse tci_args_l for calls.

2021-03-11 Thread Richard Henderson
Signed-off-by: Richard Henderson 
---
 tcg/tci.c | 38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/tcg/tci.c b/tcg/tci.c
index cfbe039fa6..066e27b492 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -435,30 +435,30 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState 
*env,
 
 switch (opc) {
 case INDEX_op_call:
-t0 = tci_read_i(_ptr);
+tci_args_l(_ptr, );
 tci_tb_ptr = (uintptr_t)tb_ptr;
 #if TCG_TARGET_REG_BITS == 32
-tmp64 = ((helper_function)t0)(tci_read_reg(regs, TCG_REG_R0),
-  tci_read_reg(regs, TCG_REG_R1),
-  tci_read_reg(regs, TCG_REG_R2),
-  tci_read_reg(regs, TCG_REG_R3),
-  tci_read_reg(regs, TCG_REG_R4),
-  tci_read_reg(regs, TCG_REG_R5),
-  tci_read_reg(regs, TCG_REG_R6),
-  tci_read_reg(regs, TCG_REG_R7),
-  tci_read_reg(regs, TCG_REG_R8),
-  tci_read_reg(regs, TCG_REG_R9),
-  tci_read_reg(regs, TCG_REG_R10),
-  tci_read_reg(regs, TCG_REG_R11));
+tmp64 = ((helper_function)ptr)(tci_read_reg(regs, TCG_REG_R0),
+   tci_read_reg(regs, TCG_REG_R1),
+   tci_read_reg(regs, TCG_REG_R2),
+   tci_read_reg(regs, TCG_REG_R3),
+   tci_read_reg(regs, TCG_REG_R4),
+   tci_read_reg(regs, TCG_REG_R5),
+   tci_read_reg(regs, TCG_REG_R6),
+   tci_read_reg(regs, TCG_REG_R7),
+   tci_read_reg(regs, TCG_REG_R8),
+   tci_read_reg(regs, TCG_REG_R9),
+   tci_read_reg(regs, TCG_REG_R10),
+   tci_read_reg(regs, TCG_REG_R11));
 tci_write_reg(regs, TCG_REG_R0, tmp64);
 tci_write_reg(regs, TCG_REG_R1, tmp64 >> 32);
 #else
-tmp64 = ((helper_function)t0)(tci_read_reg(regs, TCG_REG_R0),
-  tci_read_reg(regs, TCG_REG_R1),
-  tci_read_reg(regs, TCG_REG_R2),
-  tci_read_reg(regs, TCG_REG_R3),
-  tci_read_reg(regs, TCG_REG_R4),
-  tci_read_reg(regs, TCG_REG_R5));
+tmp64 = ((helper_function)ptr)(tci_read_reg(regs, TCG_REG_R0),
+   tci_read_reg(regs, TCG_REG_R1),
+   tci_read_reg(regs, TCG_REG_R2),
+   tci_read_reg(regs, TCG_REG_R3),
+   tci_read_reg(regs, TCG_REG_R4),
+   tci_read_reg(regs, TCG_REG_R5));
 tci_write_reg(regs, TCG_REG_R0, tmp64);
 #endif
 break;
-- 
2.25.1