diff options
| author | Richard Henderson <rth@twiddle.net> | 2014-04-28 12:18:00 -0400 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2014-05-12 11:13:12 -0700 |
| commit | fdd8ec71847b5167a4be524c2d22d186fc3b6e3a (patch) | |
| tree | a0d11a98719c19928424eb08416c75a6624d8bf0 | |
| parent | 00d7a1acabbb875ff0a4bd8f8d9bd69051f36666 (diff) | |
| download | qemu-fdd8ec71847b5167a4be524c2d22d186fc3b6e3a.zip qemu-fdd8ec71847b5167a4be524c2d22d186fc3b6e3a.tar.gz qemu-fdd8ec71847b5167a4be524c2d22d186fc3b6e3a.tar.bz2 | |
tcg-ppc64: Rename tcg_out_calli to tcg_out_call
Merge the existing tcg_out_call into tcg_out_op.
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | tcg/ppc64/tcg-target.c | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 4a0b7db..d80f2d9 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -707,7 +707,7 @@ static void tcg_out_b(TCGContext *s, int mask, tcg_insn_unit *target) } } -static void tcg_out_calli(TCGContext *s, void *target) +static void tcg_out_call(TCGContext *s, tcg_insn_unit *target) { #ifdef __APPLE__ tcg_out_b(s, LK, target); @@ -740,23 +740,6 @@ static void tcg_out_calli(TCGContext *s, void *target) #endif } -static void tcg_out_call(TCGContext *s, TCGArg arg, int const_arg) -{ - if (const_arg) { - tcg_out_calli(s, (void *)(uintptr_t)arg); - } else { -#ifdef __APPLE__ - tcg_out32(s, MTSPR | RS(arg) | LR); - tcg_out32(s, BCLR | BO_ALWAYS | LK); -#else - tcg_out32(s, LD | TAI(TCG_REG_R0, arg, 0)); - tcg_out32(s, MTSPR | RA(TCG_REG_R0) | CTR); - tcg_out32(s, LD | TAI(TCG_REG_R2, arg, 8)); - tcg_out32(s, BCCTR | BO_ALWAYS | LK); -#endif - } -} - static void tcg_out_mem_long(TCGContext *s, int opi, int opx, TCGReg rt, TCGReg base, tcg_target_long offset) { @@ -971,7 +954,7 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_R5, lb->mem_index); tcg_out32(s, MFSPR | RT(TCG_REG_R6) | LR); - tcg_out_calli(s, qemu_ld_helpers[opc & ~MO_SIGN]); + tcg_out_call(s, qemu_ld_helpers[opc & ~MO_SIGN]); if (opc & MO_SIGN) { uint32_t insn = qemu_exts_opc[opc & MO_SIZE]; @@ -1001,7 +984,7 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_R6, lb->mem_index); tcg_out32(s, MFSPR | RT(TCG_REG_R7) | LR); - tcg_out_calli(s, qemu_st_helpers[opc]); + tcg_out_call(s, qemu_st_helpers[opc]); tcg_out_b(s, 0, lb->raddr); } @@ -1520,7 +1503,19 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, } break; case INDEX_op_call: - tcg_out_call(s, args[0], const_args[0]); + if (const_args[0]) { + tcg_out_call(s, (void *)(uintptr_t)arg); + } else { +#ifdef __APPLE__ + tcg_out32(s, MTSPR | RS(arg) | LR); + tcg_out32(s, BCLR | BO_ALWAYS | LK); +#else + tcg_out32(s, LD | TAI(TCG_REG_R0, arg, 0)); + tcg_out32(s, MTSPR | RA(TCG_REG_R0) | CTR); + tcg_out32(s, LD | TAI(TCG_REG_R2, arg, 8)); + tcg_out32(s, BCCTR | BO_ALWAYS | LK); +#endif + } break; case INDEX_op_movi_i32: tcg_out_movi(s, TCG_TYPE_I32, args[0], args[1]); |