| Message ID | 20210517205025.3777947-16-matheus.ferst@eldorado.org.br |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v5,01/23] target/ppc: Introduce gen_icount_io_start | expand |
On Mon, May 17, 2021 at 05:50:17PM -0300, matheus.ferst@eldorado.org.br wrote: > From: Richard Henderson <richard.henderson@linaro.org> > > These are all connected by macros in the legacy decoding. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br> Applied to ppc-for-6.1, thanks. > --- > target/ppc/insn32.decode | 37 ++++++ > target/ppc/translate.c | 147 ++++----------------- > target/ppc/translate/fixedpoint-impl.c.inc | 89 +++++++++++++ > 3 files changed, 150 insertions(+), 123 deletions(-) > > diff --git a/target/ppc/insn32.decode b/target/ppc/insn32.decode > index e7c062d8b4..70f64c235b 100644 > --- a/target/ppc/insn32.decode > +++ b/target/ppc/insn32.decode > @@ -20,6 +20,43 @@ > &D rt ra si:int64_t > @D ...... rt:5 ra:5 si:s16 &D > > +%ds_si 2:s14 !function=times_4 > +@DS ...... rt:5 ra:5 .............. .. &D si=%ds_si > + > +&X rt ra rb > +@X ...... rt:5 ra:5 rb:5 .......... . &X > + > +### Fixed-Point Load Instructions > + > +LBZ 100010 ..... ..... ................ @D > +LBZU 100011 ..... ..... ................ @D > +LBZX 011111 ..... ..... ..... 0001010111 - @X > +LBZUX 011111 ..... ..... ..... 0001110111 - @X > + > +LHZ 101000 ..... ..... ................ @D > +LHZU 101001 ..... ..... ................ @D > +LHZX 011111 ..... ..... ..... 0100010111 - @X > +LHZUX 011111 ..... ..... ..... 0100110111 - @X > + > +LHA 101010 ..... ..... ................ @D > +LHAU 101011 ..... ..... ................ @D > +LHAX 011111 ..... ..... ..... 0101010111 - @X > +LHAXU 011111 ..... ..... ..... 0101110111 - @X > + > +LWZ 100000 ..... ..... ................ @D > +LWZU 100001 ..... ..... ................ @D > +LWZX 011111 ..... ..... ..... 0000010111 - @X > +LWZUX 011111 ..... ..... ..... 0000110111 - @X > + > +LWA 111010 ..... ..... ..............10 @DS > +LWAX 011111 ..... ..... ..... 0101010101 - @X > +LWAUX 011111 ..... ..... ..... 0101110101 - @X > + > +LD 111010 ..... ..... ..............00 @DS > +LDU 111010 ..... ..... ..............01 @DS > +LDX 011111 ..... ..... ..... 0000010101 - @X > +LDUX 011111 ..... ..... ..... 0000110101 - @X > + > ### Fixed-Point Arithmetic Instructions > > ADDI 001110 ..... ..... ................ @D > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index 5bf9001141..e037efcfe1 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -3409,54 +3409,6 @@ GEN_QEMU_STORE_64(st64, DEF_MEMOP(MO_Q)) > GEN_QEMU_STORE_64(st64r, BSWAP_MEMOP(MO_Q)) > #endif > > -#define GEN_LD(name, ldop, opc, type) \ > -static void glue(gen_, name)(DisasContext *ctx) \ > -{ \ > - TCGv EA; \ > - gen_set_access_type(ctx, ACCESS_INT); \ > - EA = tcg_temp_new(); \ > - gen_addr_imm_index(ctx, EA, 0); \ > - gen_qemu_##ldop(ctx, cpu_gpr[rD(ctx->opcode)], EA); \ > - tcg_temp_free(EA); \ > -} > - > -#define GEN_LDU(name, ldop, opc, type) \ > -static void glue(gen_, name##u)(DisasContext *ctx) \ > -{ \ > - TCGv EA; \ > - if (unlikely(rA(ctx->opcode) == 0 || \ > - rA(ctx->opcode) == rD(ctx->opcode))) { \ > - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); \ > - return; \ > - } \ > - gen_set_access_type(ctx, ACCESS_INT); \ > - EA = tcg_temp_new(); \ > - if (type == PPC_64B) \ > - gen_addr_imm_index(ctx, EA, 0x03); \ > - else \ > - gen_addr_imm_index(ctx, EA, 0); \ > - gen_qemu_##ldop(ctx, cpu_gpr[rD(ctx->opcode)], EA); \ > - tcg_gen_mov_tl(cpu_gpr[rA(ctx->opcode)], EA); \ > - tcg_temp_free(EA); \ > -} > - > -#define GEN_LDUX(name, ldop, opc2, opc3, type) \ > -static void glue(gen_, name##ux)(DisasContext *ctx) \ > -{ \ > - TCGv EA; \ > - if (unlikely(rA(ctx->opcode) == 0 || \ > - rA(ctx->opcode) == rD(ctx->opcode))) { \ > - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); \ > - return; \ > - } \ > - gen_set_access_type(ctx, ACCESS_INT); \ > - EA = tcg_temp_new(); \ > - gen_addr_reg_index(ctx, EA); \ > - gen_qemu_##ldop(ctx, cpu_gpr[rD(ctx->opcode)], EA); \ > - tcg_gen_mov_tl(cpu_gpr[rA(ctx->opcode)], EA); \ > - tcg_temp_free(EA); \ > -} > - > #define GEN_LDX_E(name, ldop, opc2, opc3, type, type2, chk) \ > static void glue(gen_, name##x)(DisasContext *ctx) \ > { \ > @@ -3475,21 +3427,6 @@ static void glue(gen_, name##x)(DisasContext *ctx) \ > #define GEN_LDX_HVRM(name, ldop, opc2, opc3, type) \ > GEN_LDX_E(name, ldop, opc2, opc3, type, PPC_NONE, CHK_HVRM) > > -#define GEN_LDS(name, ldop, op, type) \ > -GEN_LD(name, ldop, op | 0x20, type); \ > -GEN_LDU(name, ldop, op | 0x21, type); \ > -GEN_LDUX(name, ldop, 0x17, op | 0x01, type); \ > -GEN_LDX(name, ldop, 0x17, op | 0x00, type) > - > -/* lbz lbzu lbzux lbzx */ > -GEN_LDS(lbz, ld8u, 0x02, PPC_INTEGER); > -/* lha lhau lhaux lhax */ > -GEN_LDS(lha, ld16s, 0x0A, PPC_INTEGER); > -/* lhz lhzu lhzux lhzx */ > -GEN_LDS(lhz, ld16u, 0x08, PPC_INTEGER); > -/* lwz lwzu lwzux lwzx */ > -GEN_LDS(lwz, ld32u, 0x00, PPC_INTEGER); > - > #define GEN_LDEPX(name, ldop, opc2, opc3) \ > static void glue(gen_, name##epx)(DisasContext *ctx) \ > { \ > @@ -3510,47 +3447,12 @@ GEN_LDEPX(ld, DEF_MEMOP(MO_Q), 0x1D, 0x00) > #endif > > #if defined(TARGET_PPC64) > -/* lwaux */ > -GEN_LDUX(lwa, ld32s, 0x15, 0x0B, PPC_64B); > -/* lwax */ > -GEN_LDX(lwa, ld32s, 0x15, 0x0A, PPC_64B); > -/* ldux */ > -GEN_LDUX(ld, ld64_i64, 0x15, 0x01, PPC_64B); > -/* ldx */ > -GEN_LDX(ld, ld64_i64, 0x15, 0x00, PPC_64B); > - > /* CI load/store variants */ > GEN_LDX_HVRM(ldcix, ld64_i64, 0x15, 0x1b, PPC_CILDST) > GEN_LDX_HVRM(lwzcix, ld32u, 0x15, 0x15, PPC_CILDST) > GEN_LDX_HVRM(lhzcix, ld16u, 0x15, 0x19, PPC_CILDST) > GEN_LDX_HVRM(lbzcix, ld8u, 0x15, 0x1a, PPC_CILDST) > > -static void gen_ld(DisasContext *ctx) > -{ > - TCGv EA; > - if (Rc(ctx->opcode)) { > - if (unlikely(rA(ctx->opcode) == 0 || > - rA(ctx->opcode) == rD(ctx->opcode))) { > - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); > - return; > - } > - } > - gen_set_access_type(ctx, ACCESS_INT); > - EA = tcg_temp_new(); > - gen_addr_imm_index(ctx, EA, 0x03); > - if (ctx->opcode & 0x02) { > - /* lwa (lwau is undefined) */ > - gen_qemu_ld32s(ctx, cpu_gpr[rD(ctx->opcode)], EA); > - } else { > - /* ld - ldu */ > - gen_qemu_ld64_i64(ctx, cpu_gpr[rD(ctx->opcode)], EA); > - } > - if (Rc(ctx->opcode)) { > - tcg_gen_mov_tl(cpu_gpr[rA(ctx->opcode)], EA); > - } > - tcg_temp_free(EA); > -} > - > /* lq */ > static void gen_lq(DisasContext *ctx) > { > @@ -7723,6 +7625,14 @@ static inline void set_avr64(int regno, TCGv_i64 src, bool high) > tcg_gen_st_i64(src, cpu_env, avr64_offset(regno, high)); > } > > +/* > + * Helpers for decodetree used by !function for decoding arguments. > + */ > +static int times_4(DisasContext *ctx, int x) > +{ > + return x * 4; > +} > + > /* > * Helpers for trans_* functions to check for specific insns flags. > * Use token pasting to ensure that we use the proper flag with the > @@ -7749,6 +7659,21 @@ static inline void set_avr64(int regno, TCGv_i64 src, bool high) > # define REQUIRE_64BIT(CTX) REQUIRE_INSNS_FLAGS(CTX, 64B) > #endif > > +/* > + * Helpers for implementing sets of trans_* functions. > + * Defer the implementation of NAME to FUNC, with optional extra arguments. > + */ > +#define TRANS(NAME, FUNC, ...) \ > + static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ > + { return FUNC(ctx, a, __VA_ARGS__); } > + > +#define TRANS64(NAME, FUNC, ...) \ > + static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ > + { REQUIRE_64BIT(ctx); return FUNC(ctx, a, __VA_ARGS__); } > + > +/* TODO: More TRANS* helpers for extra insn_flags checks. */ > + > + > #include "decode-insn32.c.inc" > #include "decode-insn64.c.inc" > #include "translate/fixedpoint-impl.c.inc" > @@ -7933,7 +7858,6 @@ GEN_HANDLER2_E(extswsli1, "extswsli", 0x1F, 0x1B, 0x1B, 0x00000000, > PPC_NONE, PPC2_ISA300), > #endif > #if defined(TARGET_PPC64) > -GEN_HANDLER(ld, 0x3A, 0xFF, 0xFF, 0x00000000, PPC_64B), > GEN_HANDLER(lq, 0x38, 0xFF, 0xFF, 0x00000000, PPC_64BX), > GEN_HANDLER(std, 0x3E, 0xFF, 0xFF, 0x00000000, PPC_64B), > #endif > @@ -8299,34 +8223,11 @@ GEN_PPC64_R2(rldcr, 0x1E, 0x09), > GEN_PPC64_R4(rldimi, 0x1E, 0x06), > #endif > > -#undef GEN_LD > -#undef GEN_LDU > -#undef GEN_LDUX > #undef GEN_LDX_E > -#undef GEN_LDS > -#define GEN_LD(name, ldop, opc, type) \ > -GEN_HANDLER(name, opc, 0xFF, 0xFF, 0x00000000, type), > -#define GEN_LDU(name, ldop, opc, type) \ > -GEN_HANDLER(name##u, opc, 0xFF, 0xFF, 0x00000000, type), > -#define GEN_LDUX(name, ldop, opc2, opc3, type) \ > -GEN_HANDLER(name##ux, 0x1F, opc2, opc3, 0x00000001, type), > #define GEN_LDX_E(name, ldop, opc2, opc3, type, type2, chk) \ > GEN_HANDLER_E(name##x, 0x1F, opc2, opc3, 0x00000001, type, type2), > -#define GEN_LDS(name, ldop, op, type) \ > -GEN_LD(name, ldop, op | 0x20, type) \ > -GEN_LDU(name, ldop, op | 0x21, type) \ > -GEN_LDUX(name, ldop, 0x17, op | 0x01, type) \ > -GEN_LDX(name, ldop, 0x17, op | 0x00, type) > - > -GEN_LDS(lbz, ld8u, 0x02, PPC_INTEGER) > -GEN_LDS(lha, ld16s, 0x0A, PPC_INTEGER) > -GEN_LDS(lhz, ld16u, 0x08, PPC_INTEGER) > -GEN_LDS(lwz, ld32u, 0x00, PPC_INTEGER) > + > #if defined(TARGET_PPC64) > -GEN_LDUX(lwa, ld32s, 0x15, 0x0B, PPC_64B) > -GEN_LDX(lwa, ld32s, 0x15, 0x0A, PPC_64B) > -GEN_LDUX(ld, ld64_i64, 0x15, 0x01, PPC_64B) > -GEN_LDX(ld, ld64_i64, 0x15, 0x00, PPC_64B) > GEN_LDX_E(ldbr, ld64ur_i64, 0x14, 0x10, PPC_NONE, PPC2_DBRX, CHK_NONE) > > /* HV/P7 and later only */ > diff --git a/target/ppc/translate/fixedpoint-impl.c.inc b/target/ppc/translate/fixedpoint-impl.c.inc > index ce034a14a7..6140dd41ca 100644 > --- a/target/ppc/translate/fixedpoint-impl.c.inc > +++ b/target/ppc/translate/fixedpoint-impl.c.inc > @@ -36,6 +36,95 @@ static bool resolve_PLS_D(DisasContext *ctx, arg_D *d, arg_PLS_D *a) > return true; > } > > +/* > + * Fixed-Point Load/Store Instructions > + */ > + > +static bool do_ldst(DisasContext *ctx, int rt, int ra, TCGv displ, bool update, > + bool store, MemOp mop) > +{ > + TCGv ea; > + > + if (update && (ra == 0 || (!store && ra == rt))) { > + gen_invalid(ctx); > + return true; > + } > + gen_set_access_type(ctx, ACCESS_INT); > + > + ea = tcg_temp_new(); > + if (ra) { > + tcg_gen_add_tl(ea, cpu_gpr[ra], displ); > + } else { > + tcg_gen_mov_tl(ea, displ); > + } > + if (NARROW_MODE(ctx)) { > + tcg_gen_ext32u_tl(ea, ea); > + } > + mop ^= ctx->default_tcg_memop_mask; > + if (store) { > + tcg_gen_qemu_st_tl(cpu_gpr[rt], ea, ctx->mem_idx, mop); > + } else { > + tcg_gen_qemu_ld_tl(cpu_gpr[rt], ea, ctx->mem_idx, mop); > + } > + if (update) { > + tcg_gen_mov_tl(cpu_gpr[ra], ea); > + } > + tcg_temp_free(ea); > + > + return true; > +} > + > +static bool do_ldst_D(DisasContext *ctx, arg_D *a, bool update, bool store, > + MemOp mop) > +{ > + return do_ldst(ctx, a->rt, a->ra, tcg_constant_tl(a->si), update, store, mop); > +} > + > +static bool do_ldst_X(DisasContext *ctx, arg_X *a, bool update, > + bool store, MemOp mop) > +{ > + return do_ldst(ctx, a->rt, a->ra, cpu_gpr[a->rb], update, store, mop); > +} > + > +/* Load Byte and Zero */ > +TRANS(LBZ, do_ldst_D, false, false, MO_UB) > +TRANS(LBZX, do_ldst_X, false, false, MO_UB) > +TRANS(LBZU, do_ldst_D, true, false, MO_UB) > +TRANS(LBZUX, do_ldst_X, true, false, MO_UB) > + > +/* Load Halfword and Zero */ > +TRANS(LHZ, do_ldst_D, false, false, MO_UW) > +TRANS(LHZX, do_ldst_X, false, false, MO_UW) > +TRANS(LHZU, do_ldst_D, true, false, MO_UW) > +TRANS(LHZUX, do_ldst_X, true, false, MO_UW) > + > +/* Load Halfword Algebraic */ > +TRANS(LHA, do_ldst_D, false, false, MO_SW) > +TRANS(LHAX, do_ldst_X, false, false, MO_SW) > +TRANS(LHAU, do_ldst_D, true, false, MO_SW) > +TRANS(LHAXU, do_ldst_X, true, false, MO_SW) > + > +/* Load Word and Zero */ > +TRANS(LWZ, do_ldst_D, false, false, MO_UL) > +TRANS(LWZX, do_ldst_X, false, false, MO_UL) > +TRANS(LWZU, do_ldst_D, true, false, MO_UL) > +TRANS(LWZUX, do_ldst_X, true, false, MO_UL) > + > +/* Load Word Algebraic */ > +TRANS64(LWA, do_ldst_D, false, false, MO_SL) > +TRANS64(LWAX, do_ldst_X, false, false, MO_SL) > +TRANS64(LWAUX, do_ldst_X, true, false, MO_SL) > + > +/* Load Doubleword */ > +TRANS64(LD, do_ldst_D, false, false, MO_Q) > +TRANS64(LDX, do_ldst_X, false, false, MO_Q) > +TRANS64(LDU, do_ldst_D, true, false, MO_Q) > +TRANS64(LDUX, do_ldst_X, true, false, MO_Q) > + > +/* > + * Fixed-Point Arithmetic Instructions > + */ > + > static bool trans_ADDI(DisasContext *ctx, arg_D *a) > { > if (a->ra) { -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
diff --git a/target/ppc/insn32.decode b/target/ppc/insn32.decode index e7c062d8b4..70f64c235b 100644 --- a/target/ppc/insn32.decode +++ b/target/ppc/insn32.decode @@ -20,6 +20,43 @@ &D rt ra si:int64_t @D ...... rt:5 ra:5 si:s16 &D +%ds_si 2:s14 !function=times_4 +@DS ...... rt:5 ra:5 .............. .. &D si=%ds_si + +&X rt ra rb +@X ...... rt:5 ra:5 rb:5 .......... . &X + +### Fixed-Point Load Instructions + +LBZ 100010 ..... ..... ................ @D +LBZU 100011 ..... ..... ................ @D +LBZX 011111 ..... ..... ..... 0001010111 - @X +LBZUX 011111 ..... ..... ..... 0001110111 - @X + +LHZ 101000 ..... ..... ................ @D +LHZU 101001 ..... ..... ................ @D +LHZX 011111 ..... ..... ..... 0100010111 - @X +LHZUX 011111 ..... ..... ..... 0100110111 - @X + +LHA 101010 ..... ..... ................ @D +LHAU 101011 ..... ..... ................ @D +LHAX 011111 ..... ..... ..... 0101010111 - @X +LHAXU 011111 ..... ..... ..... 0101110111 - @X + +LWZ 100000 ..... ..... ................ @D +LWZU 100001 ..... ..... ................ @D +LWZX 011111 ..... ..... ..... 0000010111 - @X +LWZUX 011111 ..... ..... ..... 0000110111 - @X + +LWA 111010 ..... ..... ..............10 @DS +LWAX 011111 ..... ..... ..... 0101010101 - @X +LWAUX 011111 ..... ..... ..... 0101110101 - @X + +LD 111010 ..... ..... ..............00 @DS +LDU 111010 ..... ..... ..............01 @DS +LDX 011111 ..... ..... ..... 0000010101 - @X +LDUX 011111 ..... ..... ..... 0000110101 - @X + ### Fixed-Point Arithmetic Instructions ADDI 001110 ..... ..... ................ @D diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 5bf9001141..e037efcfe1 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -3409,54 +3409,6 @@ GEN_QEMU_STORE_64(st64, DEF_MEMOP(MO_Q)) GEN_QEMU_STORE_64(st64r, BSWAP_MEMOP(MO_Q)) #endif -#define GEN_LD(name, ldop, opc, type) \ -static void glue(gen_, name)(DisasContext *ctx) \ -{ \ - TCGv EA; \ - gen_set_access_type(ctx, ACCESS_INT); \ - EA = tcg_temp_new(); \ - gen_addr_imm_index(ctx, EA, 0); \ - gen_qemu_##ldop(ctx, cpu_gpr[rD(ctx->opcode)], EA); \ - tcg_temp_free(EA); \ -} - -#define GEN_LDU(name, ldop, opc, type) \ -static void glue(gen_, name##u)(DisasContext *ctx) \ -{ \ - TCGv EA; \ - if (unlikely(rA(ctx->opcode) == 0 || \ - rA(ctx->opcode) == rD(ctx->opcode))) { \ - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); \ - return; \ - } \ - gen_set_access_type(ctx, ACCESS_INT); \ - EA = tcg_temp_new(); \ - if (type == PPC_64B) \ - gen_addr_imm_index(ctx, EA, 0x03); \ - else \ - gen_addr_imm_index(ctx, EA, 0); \ - gen_qemu_##ldop(ctx, cpu_gpr[rD(ctx->opcode)], EA); \ - tcg_gen_mov_tl(cpu_gpr[rA(ctx->opcode)], EA); \ - tcg_temp_free(EA); \ -} - -#define GEN_LDUX(name, ldop, opc2, opc3, type) \ -static void glue(gen_, name##ux)(DisasContext *ctx) \ -{ \ - TCGv EA; \ - if (unlikely(rA(ctx->opcode) == 0 || \ - rA(ctx->opcode) == rD(ctx->opcode))) { \ - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); \ - return; \ - } \ - gen_set_access_type(ctx, ACCESS_INT); \ - EA = tcg_temp_new(); \ - gen_addr_reg_index(ctx, EA); \ - gen_qemu_##ldop(ctx, cpu_gpr[rD(ctx->opcode)], EA); \ - tcg_gen_mov_tl(cpu_gpr[rA(ctx->opcode)], EA); \ - tcg_temp_free(EA); \ -} - #define GEN_LDX_E(name, ldop, opc2, opc3, type, type2, chk) \ static void glue(gen_, name##x)(DisasContext *ctx) \ { \ @@ -3475,21 +3427,6 @@ static void glue(gen_, name##x)(DisasContext *ctx) \ #define GEN_LDX_HVRM(name, ldop, opc2, opc3, type) \ GEN_LDX_E(name, ldop, opc2, opc3, type, PPC_NONE, CHK_HVRM) -#define GEN_LDS(name, ldop, op, type) \ -GEN_LD(name, ldop, op | 0x20, type); \ -GEN_LDU(name, ldop, op | 0x21, type); \ -GEN_LDUX(name, ldop, 0x17, op | 0x01, type); \ -GEN_LDX(name, ldop, 0x17, op | 0x00, type) - -/* lbz lbzu lbzux lbzx */ -GEN_LDS(lbz, ld8u, 0x02, PPC_INTEGER); -/* lha lhau lhaux lhax */ -GEN_LDS(lha, ld16s, 0x0A, PPC_INTEGER); -/* lhz lhzu lhzux lhzx */ -GEN_LDS(lhz, ld16u, 0x08, PPC_INTEGER); -/* lwz lwzu lwzux lwzx */ -GEN_LDS(lwz, ld32u, 0x00, PPC_INTEGER); - #define GEN_LDEPX(name, ldop, opc2, opc3) \ static void glue(gen_, name##epx)(DisasContext *ctx) \ { \ @@ -3510,47 +3447,12 @@ GEN_LDEPX(ld, DEF_MEMOP(MO_Q), 0x1D, 0x00) #endif #if defined(TARGET_PPC64) -/* lwaux */ -GEN_LDUX(lwa, ld32s, 0x15, 0x0B, PPC_64B); -/* lwax */ -GEN_LDX(lwa, ld32s, 0x15, 0x0A, PPC_64B); -/* ldux */ -GEN_LDUX(ld, ld64_i64, 0x15, 0x01, PPC_64B); -/* ldx */ -GEN_LDX(ld, ld64_i64, 0x15, 0x00, PPC_64B); - /* CI load/store variants */ GEN_LDX_HVRM(ldcix, ld64_i64, 0x15, 0x1b, PPC_CILDST) GEN_LDX_HVRM(lwzcix, ld32u, 0x15, 0x15, PPC_CILDST) GEN_LDX_HVRM(lhzcix, ld16u, 0x15, 0x19, PPC_CILDST) GEN_LDX_HVRM(lbzcix, ld8u, 0x15, 0x1a, PPC_CILDST) -static void gen_ld(DisasContext *ctx) -{ - TCGv EA; - if (Rc(ctx->opcode)) { - if (unlikely(rA(ctx->opcode) == 0 || - rA(ctx->opcode) == rD(ctx->opcode))) { - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); - return; - } - } - gen_set_access_type(ctx, ACCESS_INT); - EA = tcg_temp_new(); - gen_addr_imm_index(ctx, EA, 0x03); - if (ctx->opcode & 0x02) { - /* lwa (lwau is undefined) */ - gen_qemu_ld32s(ctx, cpu_gpr[rD(ctx->opcode)], EA); - } else { - /* ld - ldu */ - gen_qemu_ld64_i64(ctx, cpu_gpr[rD(ctx->opcode)], EA); - } - if (Rc(ctx->opcode)) { - tcg_gen_mov_tl(cpu_gpr[rA(ctx->opcode)], EA); - } - tcg_temp_free(EA); -} - /* lq */ static void gen_lq(DisasContext *ctx) { @@ -7723,6 +7625,14 @@ static inline void set_avr64(int regno, TCGv_i64 src, bool high) tcg_gen_st_i64(src, cpu_env, avr64_offset(regno, high)); } +/* + * Helpers for decodetree used by !function for decoding arguments. + */ +static int times_4(DisasContext *ctx, int x) +{ + return x * 4; +} + /* * Helpers for trans_* functions to check for specific insns flags. * Use token pasting to ensure that we use the proper flag with the @@ -7749,6 +7659,21 @@ static inline void set_avr64(int regno, TCGv_i64 src, bool high) # define REQUIRE_64BIT(CTX) REQUIRE_INSNS_FLAGS(CTX, 64B) #endif +/* + * Helpers for implementing sets of trans_* functions. + * Defer the implementation of NAME to FUNC, with optional extra arguments. + */ +#define TRANS(NAME, FUNC, ...) \ + static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ + { return FUNC(ctx, a, __VA_ARGS__); } + +#define TRANS64(NAME, FUNC, ...) \ + static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ + { REQUIRE_64BIT(ctx); return FUNC(ctx, a, __VA_ARGS__); } + +/* TODO: More TRANS* helpers for extra insn_flags checks. */ + + #include "decode-insn32.c.inc" #include "decode-insn64.c.inc" #include "translate/fixedpoint-impl.c.inc" @@ -7933,7 +7858,6 @@ GEN_HANDLER2_E(extswsli1, "extswsli", 0x1F, 0x1B, 0x1B, 0x00000000, PPC_NONE, PPC2_ISA300), #endif #if defined(TARGET_PPC64) -GEN_HANDLER(ld, 0x3A, 0xFF, 0xFF, 0x00000000, PPC_64B), GEN_HANDLER(lq, 0x38, 0xFF, 0xFF, 0x00000000, PPC_64BX), GEN_HANDLER(std, 0x3E, 0xFF, 0xFF, 0x00000000, PPC_64B), #endif @@ -8299,34 +8223,11 @@ GEN_PPC64_R2(rldcr, 0x1E, 0x09), GEN_PPC64_R4(rldimi, 0x1E, 0x06), #endif -#undef GEN_LD -#undef GEN_LDU -#undef GEN_LDUX #undef GEN_LDX_E -#undef GEN_LDS -#define GEN_LD(name, ldop, opc, type) \ -GEN_HANDLER(name, opc, 0xFF, 0xFF, 0x00000000, type), -#define GEN_LDU(name, ldop, opc, type) \ -GEN_HANDLER(name##u, opc, 0xFF, 0xFF, 0x00000000, type), -#define GEN_LDUX(name, ldop, opc2, opc3, type) \ -GEN_HANDLER(name##ux, 0x1F, opc2, opc3, 0x00000001, type), #define GEN_LDX_E(name, ldop, opc2, opc3, type, type2, chk) \ GEN_HANDLER_E(name##x, 0x1F, opc2, opc3, 0x00000001, type, type2), -#define GEN_LDS(name, ldop, op, type) \ -GEN_LD(name, ldop, op | 0x20, type) \ -GEN_LDU(name, ldop, op | 0x21, type) \ -GEN_LDUX(name, ldop, 0x17, op | 0x01, type) \ -GEN_LDX(name, ldop, 0x17, op | 0x00, type) - -GEN_LDS(lbz, ld8u, 0x02, PPC_INTEGER) -GEN_LDS(lha, ld16s, 0x0A, PPC_INTEGER) -GEN_LDS(lhz, ld16u, 0x08, PPC_INTEGER) -GEN_LDS(lwz, ld32u, 0x00, PPC_INTEGER) + #if defined(TARGET_PPC64) -GEN_LDUX(lwa, ld32s, 0x15, 0x0B, PPC_64B) -GEN_LDX(lwa, ld32s, 0x15, 0x0A, PPC_64B) -GEN_LDUX(ld, ld64_i64, 0x15, 0x01, PPC_64B) -GEN_LDX(ld, ld64_i64, 0x15, 0x00, PPC_64B) GEN_LDX_E(ldbr, ld64ur_i64, 0x14, 0x10, PPC_NONE, PPC2_DBRX, CHK_NONE) /* HV/P7 and later only */ diff --git a/target/ppc/translate/fixedpoint-impl.c.inc b/target/ppc/translate/fixedpoint-impl.c.inc index ce034a14a7..6140dd41ca 100644 --- a/target/ppc/translate/fixedpoint-impl.c.inc +++ b/target/ppc/translate/fixedpoint-impl.c.inc @@ -36,6 +36,95 @@ static bool resolve_PLS_D(DisasContext *ctx, arg_D *d, arg_PLS_D *a) return true; } +/* + * Fixed-Point Load/Store Instructions + */ + +static bool do_ldst(DisasContext *ctx, int rt, int ra, TCGv displ, bool update, + bool store, MemOp mop) +{ + TCGv ea; + + if (update && (ra == 0 || (!store && ra == rt))) { + gen_invalid(ctx); + return true; + } + gen_set_access_type(ctx, ACCESS_INT); + + ea = tcg_temp_new(); + if (ra) { + tcg_gen_add_tl(ea, cpu_gpr[ra], displ); + } else { + tcg_gen_mov_tl(ea, displ); + } + if (NARROW_MODE(ctx)) { + tcg_gen_ext32u_tl(ea, ea); + } + mop ^= ctx->default_tcg_memop_mask; + if (store) { + tcg_gen_qemu_st_tl(cpu_gpr[rt], ea, ctx->mem_idx, mop); + } else { + tcg_gen_qemu_ld_tl(cpu_gpr[rt], ea, ctx->mem_idx, mop); + } + if (update) { + tcg_gen_mov_tl(cpu_gpr[ra], ea); + } + tcg_temp_free(ea); + + return true; +} + +static bool do_ldst_D(DisasContext *ctx, arg_D *a, bool update, bool store, + MemOp mop) +{ + return do_ldst(ctx, a->rt, a->ra, tcg_constant_tl(a->si), update, store, mop); +} + +static bool do_ldst_X(DisasContext *ctx, arg_X *a, bool update, + bool store, MemOp mop) +{ + return do_ldst(ctx, a->rt, a->ra, cpu_gpr[a->rb], update, store, mop); +} + +/* Load Byte and Zero */ +TRANS(LBZ, do_ldst_D, false, false, MO_UB) +TRANS(LBZX, do_ldst_X, false, false, MO_UB) +TRANS(LBZU, do_ldst_D, true, false, MO_UB) +TRANS(LBZUX, do_ldst_X, true, false, MO_UB) + +/* Load Halfword and Zero */ +TRANS(LHZ, do_ldst_D, false, false, MO_UW) +TRANS(LHZX, do_ldst_X, false, false, MO_UW) +TRANS(LHZU, do_ldst_D, true, false, MO_UW) +TRANS(LHZUX, do_ldst_X, true, false, MO_UW) + +/* Load Halfword Algebraic */ +TRANS(LHA, do_ldst_D, false, false, MO_SW) +TRANS(LHAX, do_ldst_X, false, false, MO_SW) +TRANS(LHAU, do_ldst_D, true, false, MO_SW) +TRANS(LHAXU, do_ldst_X, true, false, MO_SW) + +/* Load Word and Zero */ +TRANS(LWZ, do_ldst_D, false, false, MO_UL) +TRANS(LWZX, do_ldst_X, false, false, MO_UL) +TRANS(LWZU, do_ldst_D, true, false, MO_UL) +TRANS(LWZUX, do_ldst_X, true, false, MO_UL) + +/* Load Word Algebraic */ +TRANS64(LWA, do_ldst_D, false, false, MO_SL) +TRANS64(LWAX, do_ldst_X, false, false, MO_SL) +TRANS64(LWAUX, do_ldst_X, true, false, MO_SL) + +/* Load Doubleword */ +TRANS64(LD, do_ldst_D, false, false, MO_Q) +TRANS64(LDX, do_ldst_X, false, false, MO_Q) +TRANS64(LDU, do_ldst_D, true, false, MO_Q) +TRANS64(LDUX, do_ldst_X, true, false, MO_Q) + +/* + * Fixed-Point Arithmetic Instructions + */ + static bool trans_ADDI(DisasContext *ctx, arg_D *a) { if (a->ra) {