Message ID | 20210517205025.3777947-17-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:18PM -0300, matheus.ferst@eldorado.org.br wrote: > From: Richard Henderson <richard.henderson@linaro.org> > > 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/insn64.decode | 15 +++++++++++++++ > target/ppc/translate/fixedpoint-impl.c.inc | 16 ++++++++++++++++ > 2 files changed, 31 insertions(+) > > diff --git a/target/ppc/insn64.decode b/target/ppc/insn64.decode > index 9aa5097a98..547bd1736f 100644 > --- a/target/ppc/insn64.decode > +++ b/target/ppc/insn64.decode > @@ -24,6 +24,21 @@ > ...... rt:5 ra:5 ................ \ > &PLS_D si=%pls_si > > +### Fixed-Point Load Instructions > + > +PLBZ 000001 10 0--.-- .................. \ > + 100010 ..... ..... ................ @PLS_D > +PLHZ 000001 10 0--.-- .................. \ > + 101000 ..... ..... ................ @PLS_D > +PLHA 000001 10 0--.-- .................. \ > + 101010 ..... ..... ................ @PLS_D > +PLWZ 000001 10 0--.-- .................. \ > + 100000 ..... ..... ................ @PLS_D > +PLWA 000001 00 0--.-- .................. \ > + 101001 ..... ..... ................ @PLS_D > +PLD 000001 00 0--.-- .................. \ > + 111001 ..... ..... ................ @PLS_D > + > ### Fixed-Point Arithmetic Instructions > > PADDI 000001 10 0--.-- .................. \ > diff --git a/target/ppc/translate/fixedpoint-impl.c.inc b/target/ppc/translate/fixedpoint-impl.c.inc > index 6140dd41ca..7687f31d6f 100644 > --- a/target/ppc/translate/fixedpoint-impl.c.inc > +++ b/target/ppc/translate/fixedpoint-impl.c.inc > @@ -80,6 +80,16 @@ static bool do_ldst_D(DisasContext *ctx, arg_D *a, bool update, bool store, > return do_ldst(ctx, a->rt, a->ra, tcg_constant_tl(a->si), update, store, mop); > } > > +static bool do_ldst_PLS_D(DisasContext *ctx, arg_PLS_D *a, bool update, > + bool store, MemOp mop) > +{ > + arg_D d; > + if (!resolve_PLS_D(ctx, &d, a)) { > + return true; > + } > + return do_ldst_D(ctx, &d, update, store, mop); > +} > + > static bool do_ldst_X(DisasContext *ctx, arg_X *a, bool update, > bool store, MemOp mop) > { > @@ -91,35 +101,41 @@ 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) > +TRANS(PLBZ, do_ldst_PLS_D, false, 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) > +TRANS(PLHZ, do_ldst_PLS_D, false, 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) > +TRANS(PLHA, do_ldst_PLS_D, false, 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) > +TRANS(PLWZ, do_ldst_PLS_D, false, 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) > +TRANS64(PLWA, do_ldst_PLS_D, false, 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) > +TRANS64(PLD, do_ldst_PLS_D, false, false, MO_Q) > > /* > * Fixed-Point Arithmetic Instructions -- 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/insn64.decode b/target/ppc/insn64.decode index 9aa5097a98..547bd1736f 100644 --- a/target/ppc/insn64.decode +++ b/target/ppc/insn64.decode @@ -24,6 +24,21 @@ ...... rt:5 ra:5 ................ \ &PLS_D si=%pls_si +### Fixed-Point Load Instructions + +PLBZ 000001 10 0--.-- .................. \ + 100010 ..... ..... ................ @PLS_D +PLHZ 000001 10 0--.-- .................. \ + 101000 ..... ..... ................ @PLS_D +PLHA 000001 10 0--.-- .................. \ + 101010 ..... ..... ................ @PLS_D +PLWZ 000001 10 0--.-- .................. \ + 100000 ..... ..... ................ @PLS_D +PLWA 000001 00 0--.-- .................. \ + 101001 ..... ..... ................ @PLS_D +PLD 000001 00 0--.-- .................. \ + 111001 ..... ..... ................ @PLS_D + ### Fixed-Point Arithmetic Instructions PADDI 000001 10 0--.-- .................. \ diff --git a/target/ppc/translate/fixedpoint-impl.c.inc b/target/ppc/translate/fixedpoint-impl.c.inc index 6140dd41ca..7687f31d6f 100644 --- a/target/ppc/translate/fixedpoint-impl.c.inc +++ b/target/ppc/translate/fixedpoint-impl.c.inc @@ -80,6 +80,16 @@ static bool do_ldst_D(DisasContext *ctx, arg_D *a, bool update, bool store, return do_ldst(ctx, a->rt, a->ra, tcg_constant_tl(a->si), update, store, mop); } +static bool do_ldst_PLS_D(DisasContext *ctx, arg_PLS_D *a, bool update, + bool store, MemOp mop) +{ + arg_D d; + if (!resolve_PLS_D(ctx, &d, a)) { + return true; + } + return do_ldst_D(ctx, &d, update, store, mop); +} + static bool do_ldst_X(DisasContext *ctx, arg_X *a, bool update, bool store, MemOp mop) { @@ -91,35 +101,41 @@ 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) +TRANS(PLBZ, do_ldst_PLS_D, false, 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) +TRANS(PLHZ, do_ldst_PLS_D, false, 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) +TRANS(PLHA, do_ldst_PLS_D, false, 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) +TRANS(PLWZ, do_ldst_PLS_D, false, 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) +TRANS64(PLWA, do_ldst_PLS_D, false, 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) +TRANS64(PLD, do_ldst_PLS_D, false, false, MO_Q) /* * Fixed-Point Arithmetic Instructions