target/ppc: Moving instructions to decodetree specification
cover target/ppc: Moving instructions to decodetree specification
We recently had a QEMU decodetree hackathon at our org focusing on moving instructions to decodetree specification. I have consolidated the patches generated out of this effort in this series. Though I have done a round of review on all of them, might share some more review comments later.
The checkpatch.pl script emits false error for a couple of patches which are of the following nature :
TRANS(STWAT, do_st_atomic, DEF_MEMOP(MO_UL))
static bool trans_LDAT(DisasContext *ctx, arg_LDAT *a)
^
I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).
Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?
Gitlab CI: https://gitlab.com/rathc/qemu/-/pipelines/2540725424
Please note that check-python-tox and migration-compat-aarch64 from CI fails in the upstream master branch as seen in the following:
https://gitlab.com/rathc/qemu/-/pipelines/2537246569
Thanks,
Chinmay
Aboorva Devarajan (3):
target/ppc: Move vector merge instructions to decodetree target/ppc: Move vector pack instructions to decodetree target/ppc: Move GPR atomic load/store instructions to decodetree
Amit Machhiwal (2):
target/ppc: Move fixed-point Shift insns to decodetree target/ppc: Move fixed-point byte-reversal store insns to decodetree
Mukesh Kumar Chaurasiya (IBM) (2):
target/ppc: convert slw,srw instruction via decode spec target/ppc: convert sraw[i] instruction via decode spec
Nikhil Kumar Singh (3):
target/ppc: Migrate extswsli to decodetree target/ppc: Migrate atomic loads to decodetree target/ppc: Convert cache instructions to decodetree
Ojaswin Mujoo (7):
target/ppc: Move isync instruction to decodetree. target/ppc: Convert b{a, l, la} to decode tree target/ppc: move various conditional branch insns to decodetree target/ppc: Fix TRANS* macro variadic arguments handling target/ppc: Move wait instruction to decodetree target/ppc: Move sleep & friends to decodetree target/ppc: Refactor sleep and its variants to use a common helper
Shivang Upadhyay (4):
target/ppc: Move Condition Register access instructions to decodetree. target/ppc: Move Condition Register logical instructions to
decodetree.
target/ppc: Move Fixed-Point Load/Store String instructions to
decodetree.
target/ppc: Move VMX integer arithmetic and BCD instructions to
decodetree.
Shivani Nittor (1):
target/ppc : Convert mcrf to decode tree
Tanushree Shah (2):
target/ppc: Move rlwimi, rlwinm instructions to decodetree target/ppc: Move lmw, stmw instructions to decodetree
Utkarsh Verma (1):
target/ppc: Move st{b, h, w, d, q}cx instructions to decodetree
Vishal Chourasia (3):
target/ppc: Move mfmsr, mtmsr[d] instructions to decodetree target/ppc: Move byte-reverse instructions to decodetree target/ppc: Move system call and rfi instructions to decodetree
target/ppc/helper.h | 100 +- target/ppc/insn32.decode | 244 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 18 +- target/ppc/tcg-excp_helper.c | 10 +- target/ppc/translate.c | 2592 ++++------------- target/ppc/translate/branch-impl.c.inc | 181 ++ target/ppc/translate/fixedpoint-impl.c.inc | 936 ++++++ target/ppc/translate/misc-impl.c.inc | 175 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 30 + target/ppc/translate/storage-ctrl-impl.c.inc | 117 + target/ppc/translate/vmx-impl.c.inc | 360 +-- target/ppc/translate/vmx-ops.c.inc | 41 - 14 files changed, 2529 insertions(+), 2358 deletions(-)
Signature · 1 line
2.53.0
RFC PATCH 1/28 target/ppc: Migrate extswsli to decodetree
From: Nikhil Kumar Singh <[email protected]>
Move EXTSWSLI to decodetree using the XS-form layout with a custom %xs_sh field to represent the fractured shift encoding.
This replaces legacy GEN_HANDLER-based implementations with a single trans_EXTSWSLI() handler.
The implementation intentionally operates directly on the destination GPR to preserve exact TCG output and avoid introducing temporary variables, matching legacy behavior.
Testing:
- Verified TCG equivalence with legacy implementation.
--- target/ppc/insn32.decode | 8 ++++++++ target/ppc/translate.c | 43 ++++++++++++++-------------------------- 2 files changed, 23 insertions(+), 28 deletions(-)
target/ppc/insn32.decode +8 -0
@@ -117,6 +117,11 @@ &X_sa_rc rs ra rc @X_sa_rc ...... rs:5 ra:5 ..... .......... rc:1 &X_sa_rc +# XS-form with fractured shift amount +%xs_sh 1:1 11:5 +&XS rs ra sh rc +@XS ...... rs:5 ra:5 ..... ......... . rc:1 &XS sh=%xs_sh + %x_frtp 22:4 !function=times_2 %x_frap 17:4 !function=times_2 %x_frbp 12:4 !function=times_2
@@ -1301,6 +1306,9 @@ XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNP 111011 ... -- .... 0 ..... 01111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair +##Extend Sign Word and Shift Left Immediate XS-form +EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS + ## Vector Division Instructions VDIVSW 000100 ..... ..... ..... 00110001011 @VX
target/ppc/translate.c +15 -28
61 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH 2/28 target/ppc: Migrate atomic loads to decodetree
In reply to Chinmay RathFrom: Nikhil Kumar Singh <[email protected]>
Migrate load-and-reserve instructions (lbarx, lharx, lwarx, ldarx, lqarx) to decodetree using the X-form layout.
A shared helper (do_load_locked) is introduced for standard-width variants, while LQARX is handled separately due to its 128-bit semantics and register pairing constraints.
The implementation preserves legacy behavior, including:
- Reservation granularity and overwrite semantics
- Alignment requirements
- Invalid instruction cases for LQARX
Testing:
- Verified TCG equivalence with legacy implementation
--- target/ppc/insn32.decode | 7 ++ target/ppc/translate.c | 142 ++++++++++++++++++++++----------------- 2 files changed, 87 insertions(+), 62 deletions(-)
target/ppc/insn32.decode +7 -0
@@ -1309,6 +1309,13 @@ XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair ##Extend Sign Word and Shift Left Immediate XS-form EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS +## Load and Reserve Instructions +LBARX 011111 ..... ..... ..... 0000110100 . @X_rc +LHARX 011111 ..... ..... ..... 0001110100 . @X_rc +LWARX 011111 ..... ..... ..... 0000010100 . @X_rc +LDARX 011111 ..... ..... ..... 0001010100 . @X_rc +LQARX 011111 ..... ..... ..... 0100010100 . @X_rc + ## Vector Division Instructions VDIVSW 000100 ..... ..... ..... 00110001011 @VX
target/ppc/translate.c +80 -62
175 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [RFC PATCH 02/28] target/ppc: Migrate atomic loads to decodetree
Quoted 157 lines · Chinmay Rath
From: Nikhil Kumar Singh <[email protected]>
Migrate load-and-reserve instructions (lbarx, lharx, lwarx, ldarx, lqarx) to decodetree using the X-form layout.
A shared helper (
do_load_locked) is introduced for standard-width variants, while LQARX is handled separately due to its 128-bit semantics and register pairing constraints.The implementation preserves legacy behavior, including:
- Reservation granularity and overwrite semantics
- Alignment requirements
- Invalid instruction cases for LQARXTesting:
- Verified TCG equivalence with legacy implementationSigned-off-by Nikhil Kumar Singh <[email protected]>Signed-off-by Chinmay Rath <[email protected]>[cr: ppc32 build fix, using @X_rc for decode]--- target/ppc/insn32.decode | 7 ++ target/ppc/translate.c | 142 ++++++++++++++++++++++----------------- 2 files changed, 87 insertions(+), 62 deletions(-)target/ppc/insn32.decode +7
-0@@ -1309,6 +1309,13 @@ XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair ##Extend Sign Word and Shift Left Immediate XS-form EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS +## Load and Reserve Instructions +LBARX 011111 ..... ..... ..... 0000110100 . @X_rc +LHARX 011111 ..... ..... ..... 0001110100 . @X_rc +LWARX 011111 ..... ..... ..... 0000010100 . @X_rc +LDARX 011111 ..... ..... ..... 0001010100 . @X_rc +LQARX 011111 ..... ..... ..... 0100010100 . @X_rc + ## Vector Division Instructions VDIVSW 000100 ..... ..... ..... 00110001011 @VXtarget/ppc/translate.c +32
-57@@ -2947,30 +2947,6 @@ static void gen_isync(DisasContext *ctx) ctx->base.is_jmp =DISAS_EXIT_UPDATE ; } -static void gen_load_locked (DisasContext *ctx,MemOp memop) -{ -TCGv gpr = cpu_gpr[rD (ctx->opcode)]; -TCGv t0 =tcg_temp_new (); - -gen_set_access_type (ctx,ACCESS_RES ); -gen_addr_reg_index (ctx, t0); -tcg_gen_qemu_ld_tl (gpr, t0, ctx->mem_idx,DEF_MEMOP (memop) |MO_ALIGN ); -tcg_gen_mov_tl (cpu_reserve, t0); -tcg_gen_movi_tl (cpu_reserve_length,memop_size (memop)); -tcg_gen_mov_tl (cpu_reserve_val, gpr); -} - -#define LARX (name, memop) \ -static void gen_##name(DisasContext *ctx) \ -{ \ - gen_load_locked(ctx, memop); \ -} - -/* lwarx */ -LARX(lbarx, MO_UB) -LARX(lharx, MO_UW) -LARX(lwarx, MO_UL) -static void gen_fetch_inc_conditional (DisasContext *ctx,MemOp memop,TCGv EA ,TCGCond cond,int addend) {@@ -3219,42 +3195,9 @@ STCX(sthcx_, MO_UW) STCX(stwcx_, MO_UL)#if defined(TARGET_PPC64 ) -/* ldarx */ -LARX (ldarx,MO_UQ )/* stdcx. */ STCX (stdcx_,MO_UQ ) -/* lqarx */ -static void gen_lqarx (DisasContext *ctx) -{ -int rd =rD (ctx->opcode); -TCGv EA , hi, lo; -TCGv_i128 t16; - -if (unlikely ((rd &1 ) || (rd ==rA (ctx->opcode)) || - (rd ==rB (ctx->opcode)))) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); -return ; - } - -gen_set_access_type (ctx,ACCESS_RES ); -EA =tcg_temp_new (); -gen_addr_reg_index (ctx,EA ); - -/* Note that the low part is always in RD+1, even in LE mode. */ - lo = cpu_gpr[rd +1 ]; - hi = cpu_gpr[rd]; - - t16 =tcg_temp_new_i128 (); -tcg_gen_qemu_ld_i128 (t16,EA , ctx->mem_idx,DEF_MEMOP (MO_128 |MO_ALIGN )); -tcg_gen_extr_i128_i64 (lo, hi, t16); - -tcg_gen_mov_tl (cpu_reserve,EA ); -tcg_gen_movi_tl (cpu_reserve_length,16 ); -tcg_gen_st_tl (hi, tcg_env, offsetof(CPUPPCState , reserve_val)); -tcg_gen_st_tl (lo, tcg_env, offsetof(CPUPPCState , reserve_val2)); -} - /* stqcx. */static void gen_stqcx_ (DisasContext *ctx) {@@ -5741,6 +5684,86 @@ static bool trans_EXTSWSLI(DisasContext *ctx, arg_XS *a)return true; } +/* +* Load-and-reserve core +*/ +static bool do_load_locked (DisasContext *ctx,arg_X_rc *a,MemOp memop) +{ +TCGv EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); +TCGv gpr = cpu_gpr[a->rt]; + +gen_set_access_type (ctx,ACCESS_RES ); + +tcg_gen_qemu_ld_tl (gpr,EA , ctx->mem_idx, memop |MO_ALIGN ); + +tcg_gen_mov_tl (cpu_reserve,EA ); +tcg_gen_movi_tl (cpu_reserve_length,memop_size (memop)); + +tcg_gen_mov_tl (cpu_reserve_val, gpr); + +return true; +} + +static bool trans_LBARX (DisasContext *ctx,arg_LBARX *a) +{ +REQUIRE_INSNS_FLAGS2 (ctx,ATOMIC_ISA206 ); +return do_load_locked (ctx, a,DEF_MEMOP (MO_UB )); +} + +static bool trans_LHARX (DisasContext *ctx,arg_LHARX *a) +{ +REQUIRE_INSNS_FLAGS2 (ctx,ATOMIC_ISA206 ); +return do_load_locked (ctx, a,DEF_MEMOP (MO_UW )); +} +
target/ppc/translate.c static bool trans_EXTSWSLI(DisasContext *ctx, arg_XS *a) · line 5728
Quoted 10 lines
target/ppc/translate.c +10
-0+static bool trans_LWARX (DisasContext *ctx,arg_LWARX *a) +{ +return do_load_locked (ctx, a,DEF_MEMOP (MO_UL )); +} + +static bool trans_LDARX (DisasContext *ctx,arg_LDARX *a) +{ +REQUIRE_64BIT (ctx); +return do_load_locked (ctx, a,DEF_MEMOP (MO_UQ )); +}
For the above 4 trans_XXX() handlers making use of do_load_locked(), please use TRANS, TRANS64, TRANS_FLAGS, etc macros.
Thanks,
Chinmay
Quoted 60 lines
target/ppc/translate.c +38
-5+ +static bool trans_LQARX (DisasContext *ctx,arg_LQARX *a) +{ +REQUIRE_64BIT (ctx); +REQUIRE_INSNS_FLAGS2 (ctx,ISA207S ); +#if defined(TARGET_PPC64 ) +TCGv EA ; +TCGv_i128 t16; +/* Must use even register and avoid overlap */ +if (unlikely ((a->rt &1 ) || (a->rt == a->ra) || (a->rt == a->rb))) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); +return true; + } + +gen_set_access_type (ctx,ACCESS_RES ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + t16 =tcg_temp_new_i128 (); + +tcg_gen_qemu_ld_i128 (t16,EA , ctx->mem_idx, +DEF_MEMOP (MO_128 |MO_ALIGN )); + +tcg_gen_extr_i128_i64 (cpu_gpr[a->rt +1 ], + cpu_gpr[a->rt], + t16); + +tcg_gen_mov_tl (cpu_reserve,EA ); +tcg_gen_movi_tl (cpu_reserve_length,16 ); + +tcg_gen_st_i64 (cpu_gpr[a->rt], + tcg_env, offsetof(CPUPPCState , reserve_val)); +tcg_gen_st_i64 (cpu_gpr[a->rt +1 ], + tcg_env, offsetof(CPUPPCState , reserve_val2)); +#else +qemu_build_not_reached (); +#endif +return true; +} +#include "translate/fixedpoint-impl.c.inc" #include "translate/fp-impl.c.inc" @@ -5853,9 +5876,6 @@ GEN_HANDLER(lswx, 0x1F, 0x15, 0x10, 0x00000001, PPC_STRING),GEN_HANDLER (stswi,0x1F ,0x15 ,0x16 ,0x00000001 ,PPC_STRING ),GEN_HANDLER (stswx,0x1F ,0x15 ,0x14 ,0x00000001 ,PPC_STRING ),GEN_HANDLER (isync,0x13 ,0x16 ,0x04 ,0x03FFF801 ,PPC_MEM ), -GEN_HANDLER_E (lbarx,0x1F ,0x14 ,0x01 ,0 ,PPC_NONE ,PPC2_ATOMIC_ISA206 ), -GEN_HANDLER_E (lharx,0x1F ,0x14 ,0x03 ,0 ,PPC_NONE ,PPC2_ATOMIC_ISA206 ), -GEN_HANDLER (lwarx,0x1F ,0x14 ,0x00 ,0x00000000 ,PPC_RES ),GEN_HANDLER_E (lwat,0x1F ,0x06 ,0x12 ,0x00000001 ,PPC_NONE ,PPC2_ISA300 ),GEN_HANDLER_E (stwat,0x1F ,0x06 ,0x16 ,0x00000001 ,PPC_NONE ,PPC2_ISA300 ), GEN_HANDLER_E(stbcx_, 0x1F, 0x16, 0x15, 0, PPC_NONE, PPC2_ATOMIC_ISA206),@@ -5864,8 +5884,6 @@ GEN_HANDLER2(stwcx_, "stwcx.", 0x1F, 0x16, 0x04, 0x00000000, PPC_RES),#if defined(TARGET_PPC64 )GEN_HANDLER_E (ldat,0x1F ,0x06 ,0x13 ,0x00000001 ,PPC_NONE ,PPC2_ISA300 ),GEN_HANDLER_E (stdat,0x1F ,0x06 ,0x17 ,0x00000001 ,PPC_NONE ,PPC2_ISA300 ), -GEN_HANDLER (ldarx,0x1F ,0x14 ,0x02 ,0x00000000 ,PPC_64B ), -GEN_HANDLER_E (lqarx,0x1F ,0x14 ,0x08 ,0 ,PPC_NONE ,PPC2_LSQ_ISA207 ),GEN_HANDLER2 (stdcx_,"stdcx." ,0x1F ,0x16 ,0x06 ,0x00000000 ,PPC_64B ), GEN_HANDLER_E(stqcx_, 0x1F, 0x16, 0x05, 0, PPC_NONE, PPC2_LSQ_ISA207), #endif
RFC PATCH v2 1/1 target/ppc: Migrate atomic loads to decodetree
Migrate load-and-reserve instructions (lbarx, lharx, lwarx, ldarx, lqarx) to decodetree using the X-form layout.
A shared helper (do_load_locked) is introduced for standard-width variants, while LQARX is handled separately due to its 128-bit semantics and register pairing constraints.
The implementation preserves legacy behavior, including:
- Reservation granularity and overwrite semantics
- Alignment requirements
- Invalid instruction cases for LQARX
Testing:
- Verified TCG equivalence with legacy implementation
---
v1 -> v2:
- Replaced verbose trans_XXX() handlers for lbarx, lharx, lwarx, and ldarx with TRANS, TRANS64, and TRANS_FLAGS2 macros (per Chinmay).
target/ppc/insn32.decode | 7 +++ target/ppc/translate.c | 124 +++++++++++++++++++-------------------- 2 files changed, 69 insertions(+), 62 deletions(-)
target/ppc/insn32.decode +7 -0
@@ -1309,6 +1309,13 @@ XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair ##Extend Sign Word and Shift Left Immediate XS-form EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS +## Load and Reserve Instructions +LBARX 011111 ..... ..... ..... 0000110100 . @X_rc +LHARX 011111 ..... ..... ..... 0001110100 . @X_rc +LWARX 011111 ..... ..... ..... 0000010100 . @X_rc +LDARX 011111 ..... ..... ..... 0001010100 . @X_rc +LQARX 011111 ..... ..... ..... 0100010100 . @X_rc + ## Vector Division Instructions VDIVSW 000100 ..... ..... ..... 00110001011 @VX
target/ppc/translate.c +62 -62
157 lines not on this page · raw message
Signature · 1 line
2.54.0
RFC PATCH 3/28 target/ppc: Convert cache instructions to decodetree
In reply to Chinmay RathFrom: Nikhil Kumar Singh <[email protected]>
Convert cache management instructions to decodetree using the X-form layout and dedicated translation functions.
Legacy GEN_HANDLER-based implementations are removed.
The implementation preserves legacy semantics, including:
- MMU-visible accesses for instructions treated as loads (e.g. dcbt, dcbtst, dcbtep, dcbtstep)
- Supervisor and BookE-specific constraints
- Effective address computation via do_ea_calc()
Instructions that were defined as no-ops in the legacy implementation remain no-ops here.
Testing:
- Verified TCG equivalence for all cache operations
--- target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 25 ++ target/ppc/mem_helper.c | 8 +- target/ppc/translate.c | 484 +++++++++++++++++++++------------------ 4 files changed, 288 insertions(+), 237 deletions(-)
target/ppc/helper.h +4 -4
@@ -48,12 +48,12 @@ DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) DEF_HELPER_4(lsw, void, env, tl, i32, i32) DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) -DEF_HELPER_FLAGS_3(dcbz, TCG_CALL_NO_WG, void, env, tl, int) +DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int)#ifdef TARGET_PPC64 -DEF_HELPER_FLAGS_2(dcbzl, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(DCBZL, TCG_CALL_NO_WG, void, env, tl)#endif -DEF_HELPER_FLAGS_2(icbi, TCG_CALL_NO_WG, void, env, tl) -DEF_HELPER_FLAGS_2(icbiep, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBI, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBIEP, TCG_CALL_NO_WG, void, env, tl) DEF_HELPER_5(lscbx, tl, env, tl, i32, i32, i32)#if defined(TARGET_PPC64 )
target/ppc/insn32.decode +25 -0
@@ -1306,6 +1306,31 @@ XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNP 111011 ... -- .... 0 ..... 01111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair +## Cache Management Instructions +DCBF 011111 ..... ..... ..... 0001010110 - @X +DCBFEP 011111 ..... ..... ..... 0001111111 - @X +DCBI 011111 ..... ..... ..... 0111010110 - @X +DCBST 011111 ..... ..... ..... 0000110110 - @X +DCBSTEP 011111 ..... ..... ..... 0000111111 - @X +DCBA 011111 ..... ..... ..... 1011110110 - @X + +DCBT 011111 ..... ..... ..... 0100010110 - @X +DCBTEP 011111 ..... ..... ..... 0100111111 - @X +DCBTST 011111 ..... ..... ..... 0011110110 - @X +DCBTSTEP 011111 ..... ..... ..... 0011111111 - @X + +DCBTLS 011111 ..... ..... ..... 0010100110 - @X +DCBLC 011111 ..... ..... ..... 0110000110 - @X + +DCBZ 011111 ..... ..... ..... 1111110110 - @X +DCBZEP 011111 ..... ..... ..... 1111111111 - @X +ICBI 011111 ..... ..... ..... 1111010110 - @X +ICBIEP 011111 ..... ..... ..... 1111011111 - @X + +DST 011111 ..... ..... ..... 0101010110 - @X +DSTST 011111 ..... ..... ..... 0101110110 - @X +DSS 011111 ..... ..... ..... 1100110110 - @X + ##Extend Sign Word and Shift Left Immediate XS-form EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS
target/ppc/mem_helper.c +4 -4
@@ -319,13 +319,13 @@ static void dcbz_common(CPUPPCState *env, target_ulong addr,clear_helper_retaddr (); } -void helper_dcbz (CPUPPCState *env,target_ulong addr,int mmu_idx) +void helper_DCBZ (CPUPPCState *env,target_ulong addr,int mmu_idx) {dcbz_common (env, addr, mmu_idx, env->dcache_line_size,GETPC ()); }#ifdef TARGET_PPC64 -void helper_dcbzl (CPUPPCState *env,target_ulong addr) +void helper_DCBZL (CPUPPCState *env,target_ulong addr) {int dcbz_size = env->dcache_line_size;
@@ -341,7 +341,7 @@ void helper_dcbzl(CPUPPCState *env, target_ulong addr) }#endif -void helper_icbi (CPUPPCState *env,target_ulong addr) +void helper_ICBI (CPUPPCState *env,target_ulong addr) {unsigned mmu_idx =cpu_mmu_index (env_cpu (env), false);MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN , mmu_idx);
@@ -357,7 +357,7 @@ void helper_icbi(CPUPPCState *env, target_ulong addr)cpu_ldl_mmu (env, addr, oi,GETPC ()); } -void helper_icbiep (CPUPPCState *env,target_ulong addr) +void helper_ICBIEP (CPUPPCState *env,target_ulong addr) {#if !defined(CONFIG_USER_ONLY )MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN ,PPC_TLB_EPID_LOAD );
target/ppc/translate.c +255 -229
502 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [RFC PATCH 03/28] target/ppc: Convert cache instructions to decodetree
target/ppc/translate.c static bool trans_LQARX(DisasContext *ctx, arg_LQARX *a) · line 5655
Quoted 11 lines · Chinmay Rath
From: Nikhil Kumar Singh <[email protected]>
target/ppc/translate.c +10
-0+static bool trans_DCBF (DisasContext *ctx,arg_X *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS (ctx,CACHE ); + +if (a->rt !=0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); +return true; + }
As per v3.1 ISA (page 1064), DCBF instruction has form
DCBF RA,RB,L
L => a->rt, as per the decodetree.
in ISA, L can have values of 0/1/3/4/6 (other values are UB). Extended Mnemonices sections gives a good idea of the usage, for specific values of L.
Extended |Equivalent to:
-----------------------------
dcbf RA,RB | dcbf RA,RB,0 dcbfl RA,RB | dcbf RA,RB,1 dcbflp RA,RB | dcbf RA,RB,3 dcbfps RA,RB | dcbf RA,RB,4 dcbstps RA,RB | dcbf RA,RB,6
It would be good if you can align this (new) implementaion, with ISA.
target/ppc/translate.c static bool trans_LQARX(DisasContext *ctx, arg_LQARX *a) · line 5662
Quoted 7 lines
target/ppc/translate.c +7
-0+ +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); +gen_qemu_ld8u (ctx,EA ,EA ); + +return true; +}
Otherwise, LGTM.
~Shivang.
RFC PATCH v2 1/1 target/ppc: Convert cache instructions to decodetree
In reply to Chinmay RathConvert cache management instructions to decodetree using the X-form layout and dedicated translation functions.
Legacy GEN_HANDLER-based implementations are removed.
The implementation preserves legacy semantics, including:
- MMU-visible accesses for instructions treated as loads (e.g. dcbt, dcbtst, dcbtep, dcbtstep)
- Supervisor and BookE-specific constraints
- Effective address computation via do_ea_calc()
Instructions that were defined as no-ops in the legacy implementation remain no-ops here.
Testing:
- Verified TCG equivalence for all cache operations
--- target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 25 ++ target/ppc/mem_helper.c | 8 +- target/ppc/translate.c | 495 +++++++++++++++++++++------------------ 4 files changed, 299 insertions(+), 237 deletions(-)
target/ppc/helper.h +4 -4
@@ -48,12 +48,12 @@ DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) DEF_HELPER_4(lsw, void, env, tl, i32, i32) DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) -DEF_HELPER_FLAGS_3(dcbz, TCG_CALL_NO_WG, void, env, tl, int) +DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int)#ifdef TARGET_PPC64 -DEF_HELPER_FLAGS_2(dcbzl, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(DCBZL, TCG_CALL_NO_WG, void, env, tl)#endif -DEF_HELPER_FLAGS_2(icbi, TCG_CALL_NO_WG, void, env, tl) -DEF_HELPER_FLAGS_2(icbiep, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBI, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBIEP, TCG_CALL_NO_WG, void, env, tl) DEF_HELPER_5(lscbx, tl, env, tl, i32, i32, i32)#if defined(TARGET_PPC64 )
target/ppc/insn32.decode +25 -0
@@ -1306,6 +1306,31 @@ XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNP 111011 ... -- .... 0 ..... 01111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair +## Cache Management Instructions +DCBF 011111 ..... ..... ..... 0001010110 - @X +DCBFEP 011111 ..... ..... ..... 0001111111 - @X +DCBI 011111 ..... ..... ..... 0111010110 - @X +DCBST 011111 ..... ..... ..... 0000110110 - @X +DCBSTEP 011111 ..... ..... ..... 0000111111 - @X +DCBA 011111 ..... ..... ..... 1011110110 - @X + +DCBT 011111 ..... ..... ..... 0100010110 - @X +DCBTEP 011111 ..... ..... ..... 0100111111 - @X +DCBTST 011111 ..... ..... ..... 0011110110 - @X +DCBTSTEP 011111 ..... ..... ..... 0011111111 - @X + +DCBTLS 011111 ..... ..... ..... 0010100110 - @X +DCBLC 011111 ..... ..... ..... 0110000110 - @X + +DCBZ 011111 ..... ..... ..... 1111110110 - @X +DCBZEP 011111 ..... ..... ..... 1111111111 - @X +ICBI 011111 ..... ..... ..... 1111010110 - @X +ICBIEP 011111 ..... ..... ..... 1111011111 - @X + +DST 011111 ..... ..... ..... 0101010110 - @X +DSTST 011111 ..... ..... ..... 0101110110 - @X +DSS 011111 ..... ..... ..... 1100110110 - @X + ##Extend Sign Word and Shift Left Immediate XS-form EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS
target/ppc/mem_helper.c +4 -4
@@ -319,13 +319,13 @@ static void dcbz_common(CPUPPCState *env, target_ulong addr,clear_helper_retaddr (); } -void helper_dcbz (CPUPPCState *env,target_ulong addr,int mmu_idx) +void helper_DCBZ (CPUPPCState *env,target_ulong addr,int mmu_idx) {dcbz_common (env, addr, mmu_idx, env->dcache_line_size,GETPC ()); }#ifdef TARGET_PPC64 -void helper_dcbzl (CPUPPCState *env,target_ulong addr) +void helper_DCBZL (CPUPPCState *env,target_ulong addr) {int dcbz_size = env->dcache_line_size;
@@ -341,7 +341,7 @@ void helper_dcbzl(CPUPPCState *env, target_ulong addr) }#endif -void helper_icbi (CPUPPCState *env,target_ulong addr) +void helper_ICBI (CPUPPCState *env,target_ulong addr) {unsigned mmu_idx =cpu_mmu_index (env_cpu (env), false);MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN , mmu_idx);
@@ -357,7 +357,7 @@ void helper_icbi(CPUPPCState *env, target_ulong addr)cpu_ldl_mmu (env, addr, oi,GETPC ()); } -void helper_icbiep (CPUPPCState *env,target_ulong addr) +void helper_ICBIEP (CPUPPCState *env,target_ulong addr) {#if !defined(CONFIG_USER_ONLY )MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN ,PPC_TLB_EPID_LOAD );
target/ppc/translate.c +266 -229
513 lines not on this page · raw message
Signature · 1 line
2.54.0
Re: [RFC PATCH v2] target/ppc: Convert cache instructions to decodetree
Quoted 5 lines · Nikhil Kumar Singh
+
REQUIRE_INSNS_FLAGS(ctx, CACHE);
+
+ /*
+ * As per PowerISA v3.1, the L field (mapped toa->rtin X-form) + * can have values 0, 1, 3, 4, or 6. Other values are Undefined
Quoted 8 lines
Behavior (UB).
+ */
+ switch (a->rt) {
+ case 0: /* dcbf */
+ case 1: /* dcbfl */
+ case 3: /* dcbflp */
+ case 4: /* dcbfps */
+ case 6: /* dcbstps */
Thanks for this addition Nikhil.
~Shivang.
Re: [RFC PATCH v2] target/ppc: Convert cache instructions to decodetree
In reply to Nikhil Kumar SinghQuoted 70 lines · Nikhil Kumar Singh
Convert cache management instructions to decodetree using the X-form layout and dedicated translation functions.
Legacy GEN_HANDLER-based implementations are removed.
The implementation preserves legacy semantics, including:
- MMU-visible accesses for instructions treated as loads (e.g. dcbt, dcbtst, dcbtep, dcbtstep)
- Supervisor and BookE-specific constraints
- Effective address computation viado_ea_calc()Instructions that were defined as no-ops in the legacy implementation remain no-ops here.
Testing:
- Verified TCG equivalence for all cache operationsSigned-off-by Nikhil Kumar Singh <[email protected]>Signed-off-by Chinmay Rath <[email protected]>[cr: linux user build, flag check, helper function fixes]--- target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 25 ++ target/ppc/mem_helper.c | 8 +- target/ppc/translate.c | 495 +++++++++++++++++++++------------------ 4 files changed, 299 insertions(+), 237 deletions(-)target/ppc/helper.h +4
-4@@ -48,12 +48,12 @@ DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) DEF_HELPER_4(lsw, void, env, tl, i32, i32) DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) -DEF_HELPER_FLAGS_3(dcbz, TCG_CALL_NO_WG, void, env, tl, int) +DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int)#ifdef TARGET_PPC64 -DEF_HELPER_FLAGS_2(dcbzl, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(DCBZL, TCG_CALL_NO_WG, void, env, tl)#endif -DEF_HELPER_FLAGS_2(icbi, TCG_CALL_NO_WG, void, env, tl) -DEF_HELPER_FLAGS_2(icbiep, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBI, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBIEP, TCG_CALL_NO_WG, void, env, tl) DEF_HELPER_5(lscbx, tl, env, tl, i32, i32, i32)#if defined(TARGET_PPC64 )target/ppc/insn32.decode +14
-0@@ -1306,6 +1306,31 @@ XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNP 111011 ... -- .... 0 ..... 01111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair +## Cache Management Instructions +DCBF 011111 ..... ..... ..... 0001010110 - @X +DCBFEP 011111 ..... ..... ..... 0001111111 - @X +DCBI 011111 ..... ..... ..... 0111010110 - @X +DCBST 011111 ..... ..... ..... 0000110110 - @X +DCBSTEP 011111 ..... ..... ..... 0000111111 - @X +DCBA 011111 ..... ..... ..... 1011110110 - @X + +DCBT 011111 ..... ..... ..... 0100010110 - @X +DCBTEP 011111 ..... ..... ..... 0100111111 - @X +DCBTST 011111 ..... ..... ..... 0011110110 - @X +DCBTSTEP 011111 ..... ..... ..... 0011111111 - @X + +DCBTLS 011111 ..... ..... ..... 0010100110 - @X
target/ppc/insn32.decode XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair · line 1332
Quoted 10 lines
target/ppc/insn32.decode +10
-0+DCBLC 011111 ..... ..... ..... 0110000110 - @X + +DCBZ 011111 ..... ..... ..... 1111110110 - @X +DCBZEP 011111 ..... ..... ..... 1111111111 - @X +ICBI 011111 ..... ..... ..... 1111010110 - @X +ICBIEP 011111 ..... ..... ..... 1111011111 - @X + +DST 011111 ..... ..... ..... 0101010110 - @X +DSTST 011111 ..... ..... ..... 0101110110 - @X +DSS 011111 ..... ..... ..... 1100110110 - @X
Just noticed that many of the instructions above do not accurately represent the reserved bits, and take them as part of the rt field in the arg_X struct.
Eg, as per ISA 3.1C :
For DCBF : Bits 6-7 are reserved and bits 8-10 are L field. In your patch, you are including the reserved bits as part of the L field, which is misleading IMO and could be a recipe for wrong emulation if the reserved bits are given meaning at some point. For DCBZ: Bits 6-10 are reserved which is not represented here.
I have not checked individually for all the 20 odd instructions but I guess one would expect the instructions to be represented correctly in the spec.
-Chinmay
Quoted 562 lines
target/ppc/insn32.decode +1
-0+ ##Extend Sign Word and Shift Left Immediate XS-form EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XStarget/ppc/mem_helper.c +4
-4@@ -319,13 +319,13 @@ static void dcbz_common(CPUPPCState *env, target_ulong addr,clear_helper_retaddr (); } -void helper_dcbz (CPUPPCState *env,target_ulong addr,int mmu_idx) +void helper_DCBZ (CPUPPCState *env,target_ulong addr,int mmu_idx) {dcbz_common (env, addr, mmu_idx, env->dcache_line_size,GETPC ()); }#ifdef TARGET_PPC64 -void helper_dcbzl (CPUPPCState *env,target_ulong addr) +void helper_DCBZL (CPUPPCState *env,target_ulong addr) {int dcbz_size = env->dcache_line_size;@@ -341,7 +341,7 @@ void helper_dcbzl(CPUPPCState *env, target_ulong addr) }#endif -void helper_icbi (CPUPPCState *env,target_ulong addr) +void helper_ICBI (CPUPPCState *env,target_ulong addr) {unsigned mmu_idx =cpu_mmu_index (env_cpu (env), false);MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN , mmu_idx);@@ -357,7 +357,7 @@ void helper_icbi(CPUPPCState *env, target_ulong addr)cpu_ldl_mmu (env, addr, oi,GETPC ()); } -void helper_icbiep (CPUPPCState *env,target_ulong addr) +void helper_ICBIEP (CPUPPCState *env,target_ulong addr) {#if !defined(CONFIG_USER_ONLY )MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN ,PPC_TLB_EPID_LOAD );target/ppc/translate.c +266
-229@@ -4296,216 +4296,6 @@ static void gen_setb(DisasContext *ctx) }#endif -/*** Cache management ***/ - -/* dcbf */ -static void gen_dcbf (DisasContext *ctx) -{ -/* XXX: specification says this is treated as a load by the MMU */ -TCGv t0; -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -gen_qemu_ld8u (ctx, t0, t0); -} - -/* dcbfep (external PID dcbf) */ -static void gen_dcbfep (DisasContext *ctx) -{ -/* XXX: specification says this is treated as a load by the MMU */ -TCGv t0; -CHK_SV (ctx); -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -tcg_gen_qemu_ld_tl (t0, t0,PPC_TLB_EPID_LOAD ,DEF_MEMOP (MO_UB )); -} - -/* dcbi (Supervisor only) */ -static void gen_dcbi (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -TCGv EA , val; - -CHK_SV (ctx); -EA =tcg_temp_new (); -gen_set_access_type (ctx,ACCESS_CACHE ); -gen_addr_reg_index (ctx,EA ); - val =tcg_temp_new (); -/* XXX: specification says this should be treated as a store by the MMU */ -gen_qemu_ld8u (ctx, val,EA ); -gen_qemu_st8 (ctx, val,EA ); -#endif /* defined(CONFIG_USER_ONLY) */ -} - -/* dcdst */ -static void gen_dcbst (DisasContext *ctx) -{ -/* XXX: specification say this is treated as a load by the MMU */ -TCGv t0; -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -gen_qemu_ld8u (ctx, t0, t0); -} - -/* dcbstep (dcbstep External PID version) */ -static void gen_dcbstep (DisasContext *ctx) -{ -/* XXX: specification say this is treated as a load by the MMU */ -TCGv t0; -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -tcg_gen_qemu_ld_tl (t0, t0,PPC_TLB_EPID_LOAD ,DEF_MEMOP (MO_UB )); -} - -/* dcbt */ -static void gen_dcbt (DisasContext *ctx) -{ -/* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtep */ -static void gen_dcbtep (DisasContext *ctx) -{ -/* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtst */ -static void gen_dcbtst (DisasContext *ctx) -{ -/* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtstep */ -static void gen_dcbtstep (DisasContext *ctx) -{ -/* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtls */ -static void gen_dcbtls (DisasContext *ctx) -{ -/* Always fails locking the cache */ -TCGv t0 =tcg_temp_new (); -gen_load_spr (t0, SPR_Exxx_L1CSR0); -tcg_gen_ori_tl (t0, t0,L1CSR0_CUL ); -gen_store_spr (SPR_Exxx_L1CSR0, t0); -} - -/* dcblc */ -static void gen_dcblc (DisasContext *ctx) -{ -/* -* interpreted as no-op -*/ -} - -/* dcbz */ -static void gen_dcbz (DisasContext *ctx) -{ -TCGv tcgv_addr =tcg_temp_new (); - -gen_set_access_type (ctx,ACCESS_CACHE ); -gen_addr_reg_index (ctx, tcgv_addr); - -#ifdef TARGET_PPC64 -if (ctx->excp_model ==POWERPC_EXCP_970 && !(ctx->opcode &0x00200000 )) { -gen_helper_dcbzl (tcg_env, tcgv_addr); -return ; - } -#endif - -gen_helper_dcbz (tcg_env, tcgv_addr,tcg_constant_i32 (ctx->mem_idx)); -} - -/* dcbzep */ -static void gen_dcbzep (DisasContext *ctx) -{ -TCGv tcgv_addr =tcg_temp_new (); - -gen_set_access_type (ctx,ACCESS_CACHE ); -gen_addr_reg_index (ctx, tcgv_addr); -gen_helper_dcbz (tcg_env, tcgv_addr,tcg_constant_i32 (PPC_TLB_EPID_STORE )); -} - -/* dst / dstt */ -static void gen_dst (DisasContext *ctx) -{ -if (rA (ctx->opcode) ==0 ) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); - }else { -/* interpreted as no-op */ - } -} - -/* dstst /dststt */ -static void gen_dstst (DisasContext *ctx) -{ -if (rA (ctx->opcode) ==0 ) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); - }else { -/* interpreted as no-op */ - } - -} - -/* dss / dssall */ -static void gen_dss (DisasContext *ctx) -{ -/* interpreted as no-op */ -} - -/* icbi */ -static void gen_icbi (DisasContext *ctx) -{ -TCGv t0; -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -gen_helper_icbi (tcg_env, t0); -} - -/* icbiep */ -static void gen_icbiep (DisasContext *ctx) -{ -TCGv t0; -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -gen_helper_icbiep (tcg_env, t0); -} - -/* Optional: */ -/* dcba */ -static void gen_dcba (DisasContext *ctx) -{ -/* -* interpreted as no-op -* XXX: specification say this is treated as a store by the MMU -* but does not generate any exception -*/ -} -/*** Segment register manipulation ***/ /* Supervisor only: */ @@ -5764,6 +5554,272 @@ static bool trans_LQARX(DisasContext *ctx, arg_LQARX *a)return true; } +/* +* Cache Management Instructions (decodetree) +*/ + +static bool trans_DCBA (DisasContext *ctx,arg_X *a) +{ +REQUIRE_INSNS_FLAGS (ctx,CACHE_DCBA ); +return true; +} + +static bool trans_DCBT (DisasContext *ctx,arg_X *a) +{ +REQUIRE_INSNS_FLAGS (ctx,CACHE ); +return true; +} + +static bool trans_DCBTEP (DisasContext *ctx,arg_X *a) +{ +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); +return true; +} + +static bool trans_DCBTST (DisasContext *ctx,arg_X *a) +{ +REQUIRE_INSNS_FLAGS (ctx,CACHE ); +return true; +} + +static bool trans_DCBTSTEP (DisasContext *ctx,arg_X *a) +{ +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); +return true; +} + +static bool trans_DCBLC (DisasContext *ctx,arg_X *a) +{ +/* Requires either PPC_BOOKE or PPC2_BOOKE206 */ +if (!(ctx->insns_flags &PPC_BOOKE ) && + !(ctx->insns_flags2 &PPC2_BOOKE206 )) { +return false; + } +return true; +} + +static bool trans_DSS (DisasContext *ctx,arg_X *a) +{ +REQUIRE_INSNS_FLAGS (ctx,ALTIVEC ); +return true; +} + +static bool trans_DCBTLS (DisasContext *ctx,arg_X *a) +{ +TCGv t0 =tcg_temp_new (); + +/* Requires either PPC_BOOKE or PPC2_BOOKE206 */ +if (!(ctx->insns_flags &PPC_BOOKE ) && + !(ctx->insns_flags2 &PPC2_BOOKE206 )) { +return false; + } + +gen_load_spr (t0, SPR_Exxx_L1CSR0); +tcg_gen_ori_tl (t0, t0,L1CSR0_CUL ); +gen_store_spr (SPR_Exxx_L1CSR0, t0); + +return true; +} + +static bool trans_DST (DisasContext *ctx,arg_X *a) +{ +REQUIRE_INSNS_FLAGS (ctx,ALTIVEC ); + +if (a->ra ==0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); + } + +return true; +} + +static bool trans_DSTST (DisasContext *ctx,arg_X *a) +{ +REQUIRE_INSNS_FLAGS (ctx,ALTIVEC ); + +if (a->ra ==0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); + } + +return true; +} + +static bool trans_DCBF (DisasContext *ctx,arg_X *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS (ctx,CACHE ); + +/* +* As per PowerISA v3.1, the L field (mapped to a->rt in X-form) +* can have values 0, 1, 3, 4, or 6. Other values are Undefined Behavior (UB). +*/ +switch (a->rt) { +case 0 :/* dcbf */ +case 1 :/* dcbfl */ +case 3 :/* dcbflp */ +case 4 :/* dcbfps */ +case 6 :/* dcbstps */ +break ; +default : +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); +return true; + } + +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); +gen_qemu_ld8u (ctx,EA ,EA ); + +return true; +} + +static bool trans_DCBST (DisasContext *ctx,arg_X *a) +{ + +if (a->rt !=0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); +return true; + } + +/* Flags check overlaps with trans_DCBF */ +return trans_DCBF (ctx, a); +} + +static bool trans_DCBFEP (DisasContext *ctx,arg_X *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); + +/* Per ISA: RT must be zero for cache management instructions */ +if (a->rt !=0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); +return true; + } + +REQUIRE_SV (ctx); + +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + +tcg_gen_qemu_ld_tl (EA ,EA ,PPC_TLB_EPID_LOAD ,DEF_MEMOP (MO_UB )); + +return true; +} + +static bool trans_DCBSTEP (DisasContext *ctx,arg_X *a) +{ +/* Flags check overlaps with trans_DCBFEP */ +return trans_DCBFEP (ctx, a); +} + +static bool trans_DCBI (DisasContext *ctx,arg_X *a) +{ +#if defined(CONFIG_USER_ONLY ) +gen_priv_opc (ctx); +return true; +#else +TCGv EA , val; +REQUIRE_INSNS_FLAGS (ctx,CACHE ); + +if (a->rt !=0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); +return true; + } + +REQUIRE_SV (ctx); +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + val =tcg_temp_new (); + +gen_qemu_ld8u (ctx, val,EA ); +gen_qemu_st8 (ctx, val,EA ); + +return true; +#endif +} + +static bool trans_ICBI (DisasContext *ctx,arg_X *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS (ctx,CACHE_ICBI ); + +if (a->rt !=0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); +return true; + } + + +gen_set_access_type (ctx,ACCESS_CACHE ); + +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); +gen_helper_ICBI (tcg_env,EA ); + +return true; +} + +static bool trans_ICBIEP (DisasContext *ctx,arg_X *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); +REQUIRE_SV (ctx); + +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + +gen_helper_ICBIEP (tcg_env,EA ); +return true; +} + +static bool trans_DCBZ (DisasContext *ctx,arg_X *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS (ctx,CACHE_DCBZ ); + +if (a->rt !=0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); +return true; + } + + +gen_set_access_type (ctx,ACCESS_CACHE ); + +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + +#if defined(TARGET_PPC64 ) +if (ctx->excp_model ==POWERPC_EXCP_970 && + !(ctx->opcode &0x00200000 )) { +gen_helper_DCBZL (tcg_env,EA ); +return true; + } +#endif + +gen_helper_DCBZ (tcg_env,EA ,tcg_constant_i32 (ctx->mem_idx)); +return true; +} + +static bool trans_DCBZEP (DisasContext *ctx,arg_X *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); + +if (a->rt !=0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); +return true; + } + +REQUIRE_SV (ctx); + +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + +gen_helper_DCBZ (tcg_env,EA ,tcg_constant_i32 (PPC_TLB_EPID_STORE )); +return true; +} +#include "translate/fixedpoint-impl.c.inc" #include "translate/fp-impl.c.inc" @@ -5928,25 +5984,6 @@ GEN_HANDLER_E(mcrxrx, 0x1F, 0x00, 0x12, 0x007FF801, PPC_NONE, PPC2_ISA300),#endif GEN_HANDLER (mtmsr,0x1F ,0x12 ,0x04 ,0x001EF801 ,PPC_MISC ),GEN_HANDLER (mtspr,0x1F ,0x13 ,0x0E ,0x00000000 ,PPC_MISC ), -GEN_HANDLER (dcbf,0x1F ,0x16 ,0x02 ,0x03C00001 ,PPC_CACHE ), -GEN_HANDLER_E (dcbfep,0x1F ,0x1F ,0x03 ,0x03C00001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER (dcbi,0x1F ,0x16 ,0x0E ,0x03E00001 ,PPC_CACHE ), -GEN_HANDLER (dcbst,0x1F ,0x16 ,0x01 ,0x03E00001 ,PPC_CACHE ), -GEN_HANDLER_E (dcbstep,0x1F ,0x1F ,0x01 ,0x03E00001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER (dcbt,0x1F ,0x16 ,0x08 ,0x00000001 ,PPC_CACHE ), -GEN_HANDLER_E (dcbtep,0x1F ,0x1F ,0x09 ,0x00000001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER (dcbtst,0x1F ,0x16 ,0x07 ,0x00000001 ,PPC_CACHE ), -GEN_HANDLER_E (dcbtstep,0x1F ,0x1F ,0x07 ,0x00000001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER_E (dcbtls,0x1F ,0x06 ,0x05 ,0x02000001 ,PPC_BOOKE ,PPC2_BOOKE206 ), -GEN_HANDLER_E (dcblc,0x1F ,0x06 ,0x0c ,0x02000001 ,PPC_BOOKE ,PPC2_BOOKE206 ), -GEN_HANDLER (dcbz,0x1F ,0x16 ,0x1F ,0x03C00001 ,PPC_CACHE_DCBZ ), -GEN_HANDLER_E (dcbzep,0x1F ,0x1F ,0x1F ,0x03C00001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER (dst,0x1F ,0x16 ,0x0A ,0x01800001 ,PPC_ALTIVEC ), -GEN_HANDLER (dstst,0x1F ,0x16 ,0x0B ,0x01800001 ,PPC_ALTIVEC ), -GEN_HANDLER (dss,0x1F ,0x16 ,0x19 ,0x019FF801 ,PPC_ALTIVEC ), -GEN_HANDLER (icbi,0x1F ,0x16 ,0x1E ,0x03E00001 ,PPC_CACHE_ICBI ), -GEN_HANDLER_E (icbiep,0x1F ,0x1F ,0x1E ,0x03E00001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER (dcba,0x1F ,0x16 ,0x17 ,0x03E00001 ,PPC_CACHE_DCBA ),GEN_HANDLER (mfsr,0x1F ,0x13 ,0x12 ,0x0010F801 ,PPC_SEGMENT ),GEN_HANDLER (mfsrin,0x1F ,0x13 ,0x14 ,0x001F0001 ,PPC_SEGMENT ), GEN_HANDLER(mtsr, 0x1F, 0x12, 0x06, 0x0010F801, PPC_SEGMENT),
RFC PATCH v3 1/1 target/ppc: Convert cache instructions to decodetree
Convert cache management instructions to decodetree using custom X-form layouts (@X_ea, @X_l, @X_th) and dedicated translation functions. This ensures reserved bits are accurately represented and ignored by the decoder, rather than being erroneously parsed into instruction fields.
Legacy GEN_HANDLER-based implementations are removed.
The implementation preserves legacy semantics, including:
- MMU-visible accesses for instructions treated as loads (e.g. dcbt, dcbtst, dcbtep, dcbtstep)
- Supervisor and BookE-specific constraints
- Effective address computation via do_ea_calc()
Instructions that were defined as no-ops in the legacy implementation remain no-ops here.
Testing:
- Verified TCG equivalence for all cache operations
---
v2 -> v3:
- Addressed feedback from Chinmay regarding reserved bits.
- Defined custom formats (@X_ea, @X_l, @X_th) in insn32.decode to explicitly capture and ignore reserved bits, preventing them from being mapped to the 'rt' field.
- Removed manual 'rt != 0' reserved bit checks from translation functions.
target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 34 +++ target/ppc/mem_helper.c | 8 +- target/ppc/translate.c | 468 ++++++++++++++++++++------------------- 4 files changed, 281 insertions(+), 237 deletions(-)
target/ppc/helper.h +4 -4
@@ -48,12 +48,12 @@ DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) DEF_HELPER_4(lsw, void, env, tl, i32, i32) DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) -DEF_HELPER_FLAGS_3(dcbz, TCG_CALL_NO_WG, void, env, tl, int) +DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int)#ifdef TARGET_PPC64 -DEF_HELPER_FLAGS_2(dcbzl, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(DCBZL, TCG_CALL_NO_WG, void, env, tl)#endif -DEF_HELPER_FLAGS_2(icbi, TCG_CALL_NO_WG, void, env, tl) -DEF_HELPER_FLAGS_2(icbiep, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBI, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBIEP, TCG_CALL_NO_WG, void, env, tl)#if defined(TARGET_PPC64 )DEF_HELPER_4 (DIVDEU , i64, env, i64, i64, i32)
target/ppc/insn32.decode +34 -0
@@ -1306,6 +1306,40 @@ XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNP 111011 ... -- .... 0 ..... 01111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair +## Cache Management Instructions +&X_ea ign ra rb +@X_ea ...... ign:5 ra:5 rb:5 .......... . &X_ea + +&X_l ign l ra rb +@X_l ...... ign:2 l:3 ra:5 rb:5 .......... . &X_l + +&X_th th ra rb +@X_th ...... th:5 ra:5 rb:5 .......... . &X_th + +DCBF 011111 .. ... ..... ..... 0001010110 - @X_l +DCBFEP 011111 ..... ..... ..... 0001111111 - @X_ea +DCBI 011111 ..... ..... ..... 0111010110 - @X_ea +DCBST 011111 ..... ..... ..... 0000110110 - @X_ea +DCBSTEP 011111 ..... ..... ..... 0000111111 - @X_ea +DCBA 011111 ..... ..... ..... 1011110110 - @X_ea + +DCBT 011111 ..... ..... ..... 0100010110 - @X_th +DCBTEP 011111 ..... ..... ..... 0100111111 - @X_ea +DCBTST 011111 ..... ..... ..... 0011110110 - @X_th +DCBTSTEP 011111 ..... ..... ..... 0011111111 - @X_ea + +DCBTLS 011111 ..... ..... ..... 0010100110 - @X_th +DCBLC 011111 ..... ..... ..... 0110000110 - @X_th + +DCBZ 011111 ..... ..... ..... 1111110110 - @X_ea +DCBZEP 011111 ..... ..... ..... 1111111111 - @X_ea +ICBI 011111 ..... ..... ..... 1111010110 - @X_ea +ICBIEP 011111 ..... ..... ..... 1111011111 - @X_ea + +DST 011111 ..... ..... ..... 0101010110 - @X_ea +DSTST 011111 ..... ..... ..... 0101110110 - @X_ea +DSS 011111 ..... ..... ..... 1100110110 - @X_ea + ##Extend Sign Word and Shift Left Immediate XS-form EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS
target/ppc/mem_helper.c +4 -4
@@ -319,13 +319,13 @@ static void dcbz_common(CPUPPCState *env, target_ulong addr,clear_helper_retaddr (); } -void helper_dcbz (CPUPPCState *env,target_ulong addr,int mmu_idx) +void helper_DCBZ (CPUPPCState *env,target_ulong addr,int mmu_idx) {dcbz_common (env, addr, mmu_idx, env->dcache_line_size,GETPC ()); }#ifdef TARGET_PPC64 -void helper_dcbzl (CPUPPCState *env,target_ulong addr) +void helper_DCBZL (CPUPPCState *env,target_ulong addr) {int dcbz_size = env->dcache_line_size;
@@ -341,7 +341,7 @@ void helper_dcbzl(CPUPPCState *env, target_ulong addr) }#endif -void helper_icbi (CPUPPCState *env,target_ulong addr) +void helper_ICBI (CPUPPCState *env,target_ulong addr) {unsigned mmu_idx =cpu_mmu_index (env_cpu (env), false);MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN , mmu_idx);
@@ -357,7 +357,7 @@ void helper_icbi(CPUPPCState *env, target_ulong addr)cpu_ldl_mmu (env, addr, oi,GETPC ()); } -void helper_icbiep (CPUPPCState *env,target_ulong addr) +void helper_ICBIEP (CPUPPCState *env,target_ulong addr) {#if !defined(CONFIG_USER_ONLY )MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN ,PPC_TLB_EPID_LOAD );
target/ppc/translate.c +239 -229
486 lines not on this page · raw message
Signature · 1 line
2.54.0
Re: [RFC PATCH v3] target/ppc: Convert cache instructions to decodetree
Quoted 90 lines · Nikhil Kumar Singh
Convert cache management instructions to decodetree using custom X-form layouts (@X_ea, @X_l, @X_th) and dedicated translation functions. This ensures reserved bits are accurately represented and ignored by the decoder, rather than being erroneously parsed into instruction fields.
Legacy GEN_HANDLER-based implementations are removed.
The implementation preserves legacy semantics, including:
- MMU-visible accesses for instructions treated as loads (e.g. dcbt, dcbtst, dcbtep, dcbtstep)
- Supervisor and BookE-specific constraints
- Effective address computation viado_ea_calc()Instructions that were defined as no-ops in the legacy implementation remain no-ops here.
Testing:
- Verified TCG equivalence for all cache operationsSigned-off-by Nikhil Kumar Singh <[email protected]>Signed-off-by Chinmay Rath <[email protected]>[cr: linux user build, flag check, helper function fixes]---
v2 -> v3:
- Addressed feedback from Chinmay regarding reserved bits.
- Defined custom formats (@X_ea, @X_l, @X_th) in insn32.decode to explicitly capture and ignore reserved bits, preventing them from being mapped to the 'rt' field.
- Removed manual 'rt != 0' reserved bit checks from translation functions.target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 34 +++ target/ppc/mem_helper.c | 8 +- target/ppc/translate.c | 468 ++++++++++++++++++++------------------- 4 files changed, 281 insertions(+), 237 deletions(-)target/ppc/helper.h +4
-4@@ -48,12 +48,12 @@ DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) DEF_HELPER_4(lsw, void, env, tl, i32, i32) DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) -DEF_HELPER_FLAGS_3(dcbz, TCG_CALL_NO_WG, void, env, tl, int) +DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int)#ifdef TARGET_PPC64 -DEF_HELPER_FLAGS_2(dcbzl, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(DCBZL, TCG_CALL_NO_WG, void, env, tl)#endif -DEF_HELPER_FLAGS_2(icbi, TCG_CALL_NO_WG, void, env, tl) -DEF_HELPER_FLAGS_2(icbiep, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBI, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBIEP, TCG_CALL_NO_WG, void, env, tl)#if defined(TARGET_PPC64 )DEF_HELPER_4 (DIVDEU , i64, env, i64, i64, i32)target/ppc/insn32.decode +24
-0@@ -1306,6 +1306,40 @@ XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNP 111011 ... -- .... 0 ..... 01111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair +## Cache Management Instructions +&X_ea ign ra rb +@X_ea ...... ign:5 ra:5 rb:5 .......... . &X_ea + +&X_l ign l ra rb +@X_l ...... ign:2 l:3 ra:5 rb:5 .......... . &X_l + +&X_th th ra rb +@X_th ...... th:5 ra:5 rb:5 .......... . &X_th + +DCBF 011111 .. ... ..... ..... 0001010110 - @X_l +DCBFEP 011111 ..... ..... ..... 0001111111 - @X_ea +DCBI 011111 ..... ..... ..... 0111010110 - @X_ea +DCBST 011111 ..... ..... ..... 0000110110 - @X_ea +DCBSTEP 011111 ..... ..... ..... 0000111111 - @X_ea +DCBA 011111 ..... ..... ..... 1011110110 - @X_ea + +DCBT 011111 ..... ..... ..... 0100010110 - @X_th +DCBTEP 011111 ..... ..... ..... 0100111111 - @X_ea +DCBTST 011111 ..... ..... ..... 0011110110 - @X_th +DCBTSTEP 011111 ..... ..... ..... 0011111111 - @X_ea + +DCBTLS 011111 ..... ..... ..... 0010100110 - @X_th +DCBLC 011111 ..... ..... ..... 0110000110 - @X_th
target/ppc/insn32.decode XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair · line 1342
Quoted 10 lines
target/ppc/insn32.decode +10
-0+ +DCBZ 011111 ..... ..... ..... 1111110110 - @X_ea +DCBZEP 011111 ..... ..... ..... 1111111111 - @X_ea +ICBI 011111 ..... ..... ..... 1111010110 - @X_ea +ICBIEP 011111 ..... ..... ..... 1111011111 - @X_ea + +DST 011111 ..... ..... ..... 0101010110 - @X_ea +DSTST 011111 ..... ..... ..... 0101110110 - @X_ea +DSS 011111 ..... ..... ..... 1100110110 - @X_ea +
Nikhil,
Thanks for taking the time out for this v3. But I think there is some gap in understanding how reserved bits are represented in the decodetree specification. I am sorry but this is wrong as per the specs.
Kindly refer to the specification : https://www.qemu.org/docs/master/devel/decodetree.html to find the correct way.
Bits that are reserved and are to be ignored, are to be represented with a '-' as you have done for the 31st bit of every insn in this patch. Extracting them into a "ign" variable is not the right way. You are not ignoring those bits by naming them "ign" if you are still extracting those bits to a variable. I'd be happy to discuss this in detail if you want to.
Regards,
Chinmay
Quoted 534 lines
target/ppc/insn32.decode +0
-0##Extend Sign Word and Shift Left Immediate XS-form EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XStarget/ppc/mem_helper.c +4
-4@@ -319,13 +319,13 @@ static void dcbz_common(CPUPPCState *env, target_ulong addr,clear_helper_retaddr (); } -void helper_dcbz (CPUPPCState *env,target_ulong addr,int mmu_idx) +void helper_DCBZ (CPUPPCState *env,target_ulong addr,int mmu_idx) {dcbz_common (env, addr, mmu_idx, env->dcache_line_size,GETPC ()); }#ifdef TARGET_PPC64 -void helper_dcbzl (CPUPPCState *env,target_ulong addr) +void helper_DCBZL (CPUPPCState *env,target_ulong addr) {int dcbz_size = env->dcache_line_size;@@ -341,7 +341,7 @@ void helper_dcbzl(CPUPPCState *env, target_ulong addr) }#endif -void helper_icbi (CPUPPCState *env,target_ulong addr) +void helper_ICBI (CPUPPCState *env,target_ulong addr) {unsigned mmu_idx =cpu_mmu_index (env_cpu (env), false);MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN , mmu_idx);@@ -357,7 +357,7 @@ void helper_icbi(CPUPPCState *env, target_ulong addr)cpu_ldl_mmu (env, addr, oi,GETPC ()); } -void helper_icbiep (CPUPPCState *env,target_ulong addr) +void helper_ICBIEP (CPUPPCState *env,target_ulong addr) {#if !defined(CONFIG_USER_ONLY )MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN ,PPC_TLB_EPID_LOAD );target/ppc/translate.c +239
-229@@ -4296,216 +4296,6 @@ static void gen_setb(DisasContext *ctx) }#endif -/*** Cache management ***/ - -/* dcbf */ -static void gen_dcbf (DisasContext *ctx) -{ -/* XXX: specification says this is treated as a load by the MMU */ -TCGv t0; -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -gen_qemu_ld8u (ctx, t0, t0); -} - -/* dcbfep (external PID dcbf) */ -static void gen_dcbfep (DisasContext *ctx) -{ -/* XXX: specification says this is treated as a load by the MMU */ -TCGv t0; -CHK_SV (ctx); -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -tcg_gen_qemu_ld_tl (t0, t0,PPC_TLB_EPID_LOAD ,DEF_MEMOP (MO_UB )); -} - -/* dcbi (Supervisor only) */ -static void gen_dcbi (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -TCGv EA , val; - -CHK_SV (ctx); -EA =tcg_temp_new (); -gen_set_access_type (ctx,ACCESS_CACHE ); -gen_addr_reg_index (ctx,EA ); - val =tcg_temp_new (); -/* XXX: specification says this should be treated as a store by the MMU */ -gen_qemu_ld8u (ctx, val,EA ); -gen_qemu_st8 (ctx, val,EA ); -#endif /* defined(CONFIG_USER_ONLY) */ -} - -/* dcdst */ -static void gen_dcbst (DisasContext *ctx) -{ -/* XXX: specification say this is treated as a load by the MMU */ -TCGv t0; -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -gen_qemu_ld8u (ctx, t0, t0); -} - -/* dcbstep (dcbstep External PID version) */ -static void gen_dcbstep (DisasContext *ctx) -{ -/* XXX: specification say this is treated as a load by the MMU */ -TCGv t0; -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -tcg_gen_qemu_ld_tl (t0, t0,PPC_TLB_EPID_LOAD ,DEF_MEMOP (MO_UB )); -} - -/* dcbt */ -static void gen_dcbt (DisasContext *ctx) -{ -/* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtep */ -static void gen_dcbtep (DisasContext *ctx) -{ -/* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtst */ -static void gen_dcbtst (DisasContext *ctx) -{ -/* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtstep */ -static void gen_dcbtstep (DisasContext *ctx) -{ -/* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtls */ -static void gen_dcbtls (DisasContext *ctx) -{ -/* Always fails locking the cache */ -TCGv t0 =tcg_temp_new (); -gen_load_spr (t0, SPR_Exxx_L1CSR0); -tcg_gen_ori_tl (t0, t0,L1CSR0_CUL ); -gen_store_spr (SPR_Exxx_L1CSR0, t0); -} - -/* dcblc */ -static void gen_dcblc (DisasContext *ctx) -{ -/* -* interpreted as no-op -*/ -} - -/* dcbz */ -static void gen_dcbz (DisasContext *ctx) -{ -TCGv tcgv_addr =tcg_temp_new (); - -gen_set_access_type (ctx,ACCESS_CACHE ); -gen_addr_reg_index (ctx, tcgv_addr); - -#ifdef TARGET_PPC64 -if (ctx->excp_model ==POWERPC_EXCP_970 && !(ctx->opcode &0x00200000 )) { -gen_helper_dcbzl (tcg_env, tcgv_addr); -return ; - } -#endif - -gen_helper_dcbz (tcg_env, tcgv_addr,tcg_constant_i32 (ctx->mem_idx)); -} - -/* dcbzep */ -static void gen_dcbzep (DisasContext *ctx) -{ -TCGv tcgv_addr =tcg_temp_new (); - -gen_set_access_type (ctx,ACCESS_CACHE ); -gen_addr_reg_index (ctx, tcgv_addr); -gen_helper_dcbz (tcg_env, tcgv_addr,tcg_constant_i32 (PPC_TLB_EPID_STORE )); -} - -/* dst / dstt */ -static void gen_dst (DisasContext *ctx) -{ -if (rA (ctx->opcode) ==0 ) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); - }else { -/* interpreted as no-op */ - } -} - -/* dstst /dststt */ -static void gen_dstst (DisasContext *ctx) -{ -if (rA (ctx->opcode) ==0 ) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); - }else { -/* interpreted as no-op */ - } - -} - -/* dss / dssall */ -static void gen_dss (DisasContext *ctx) -{ -/* interpreted as no-op */ -} - -/* icbi */ -static void gen_icbi (DisasContext *ctx) -{ -TCGv t0; -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -gen_helper_icbi (tcg_env, t0); -} - -/* icbiep */ -static void gen_icbiep (DisasContext *ctx) -{ -TCGv t0; -gen_set_access_type (ctx,ACCESS_CACHE ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); -gen_helper_icbiep (tcg_env, t0); -} - -/* Optional: */ -/* dcba */ -static void gen_dcba (DisasContext *ctx) -{ -/* -* interpreted as no-op -* XXX: specification say this is treated as a store by the MMU -* but does not generate any exception -*/ -} -/*** Segment register manipulation ***/ /* Supervisor only: */ @@ -5746,6 +5536,245 @@ static bool trans_LQARX(DisasContext *ctx, arg_LQARX *a)return true; } +/* +* Cache Management Instructions (decodetree) +*/ + +static bool trans_DCBA (DisasContext *ctx,arg_X_ea *a) +{ +REQUIRE_INSNS_FLAGS (ctx,CACHE_DCBA ); +return true; +} + +static bool trans_DCBT (DisasContext *ctx,arg_X_th *a) +{ +REQUIRE_INSNS_FLAGS (ctx,CACHE ); +return true; +} + +static bool trans_DCBTEP (DisasContext *ctx,arg_X_ea *a) +{ +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); +return true; +} + +static bool trans_DCBTST (DisasContext *ctx,arg_X_th *a) +{ +REQUIRE_INSNS_FLAGS (ctx,CACHE ); +return true; +} + +static bool trans_DCBTSTEP (DisasContext *ctx,arg_X_ea *a) +{ +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); +return true; +} + +static bool trans_DCBLC (DisasContext *ctx,arg_X_th *a) +{ +/* Requires either PPC_BOOKE or PPC2_BOOKE206 */ +if (!(ctx->insns_flags &PPC_BOOKE ) && + !(ctx->insns_flags2 &PPC2_BOOKE206 )) { +return false; + } +return true; +} + +static bool trans_DSS (DisasContext *ctx,arg_X_ea *a) +{ +REQUIRE_INSNS_FLAGS (ctx,ALTIVEC ); +return true; +} + +static bool trans_DCBTLS (DisasContext *ctx,arg_X_th *a) +{ +TCGv t0 =tcg_temp_new (); + +/* Requires either PPC_BOOKE or PPC2_BOOKE206 */ +if (!(ctx->insns_flags &PPC_BOOKE ) && + !(ctx->insns_flags2 &PPC2_BOOKE206 )) { +return false; + } + +gen_load_spr (t0, SPR_Exxx_L1CSR0); +tcg_gen_ori_tl (t0, t0,L1CSR0_CUL ); +gen_store_spr (SPR_Exxx_L1CSR0, t0); + +return true; +} + +static bool trans_DST (DisasContext *ctx,arg_X_ea *a) +{ +REQUIRE_INSNS_FLAGS (ctx,ALTIVEC ); + +if (a->ra ==0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); + } + +return true; +} + +static bool trans_DSTST (DisasContext *ctx,arg_X_ea *a) +{ +REQUIRE_INSNS_FLAGS (ctx,ALTIVEC ); + +if (a->ra ==0 ) { +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); + } + +return true; +} + +static bool trans_DCBF (DisasContext *ctx,arg_X_l *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS (ctx,CACHE ); + +/* +* As per PowerISA v3.1, the L field can have values 0, 1, 3, 4, or 6. +* Other values are Undefined Behavior (UB). +*/ +switch (a->l) { +case 0 :/* dcbf */ +case 1 :/* dcbfl */ +case 3 :/* dcbflp */ +case 4 :/* dcbfps */ +case 6 :/* dcbstps */ +break ; +default : +gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); +return true; + } + +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); +gen_qemu_ld8u (ctx,EA ,EA ); + +return true; +} + +static bool trans_DCBST (DisasContext *ctx,arg_X_ea *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS (ctx,CACHE ); + +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); +gen_qemu_ld8u (ctx,EA ,EA ); + +return true; +} + +static bool trans_DCBFEP (DisasContext *ctx,arg_X_ea *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); + +REQUIRE_SV (ctx); + +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + +tcg_gen_qemu_ld_tl (EA ,EA ,PPC_TLB_EPID_LOAD ,DEF_MEMOP (MO_UB )); + +return true; +} + +static bool trans_DCBSTEP (DisasContext *ctx,arg_X_ea *a) +{ +return trans_DCBFEP (ctx, a); +} + +static bool trans_DCBI (DisasContext *ctx,arg_X_ea *a) +{ +#if defined(CONFIG_USER_ONLY ) +gen_priv_opc (ctx); +return true; +#else +TCGv EA , val; +REQUIRE_INSNS_FLAGS (ctx,CACHE ); + +REQUIRE_SV (ctx); + +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + val =tcg_temp_new (); + +gen_qemu_ld8u (ctx, val,EA ); +gen_qemu_st8 (ctx, val,EA ); + +return true; +#endif +} + +static bool trans_ICBI (DisasContext *ctx,arg_X_ea *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS (ctx,CACHE_ICBI ); + +gen_set_access_type (ctx,ACCESS_CACHE ); + +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); +gen_helper_ICBI (tcg_env,EA ); + +return true; +} + +static bool trans_ICBIEP (DisasContext *ctx,arg_X_ea *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); +REQUIRE_SV (ctx); + +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + +gen_helper_ICBIEP (tcg_env,EA ); +return true; +} + +static bool trans_DCBZ (DisasContext *ctx,arg_X_ea *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS (ctx,CACHE_DCBZ ); + +gen_set_access_type (ctx,ACCESS_CACHE ); + +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + +#if defined(TARGET_PPC64 ) +if (ctx->excp_model ==POWERPC_EXCP_970 && + !(ctx->opcode &0x00200000 )) { +gen_helper_DCBZL (tcg_env,EA ); +return true; + } +#endif + +gen_helper_DCBZ (tcg_env,EA ,tcg_constant_i32 (ctx->mem_idx)); +return true; +} + +static bool trans_DCBZEP (DisasContext *ctx,arg_X_ea *a) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); + +REQUIRE_SV (ctx); + +gen_set_access_type (ctx,ACCESS_CACHE ); +EA =do_ea_calc (ctx, a->ra, cpu_gpr[a->rb]); + +gen_helper_DCBZ (tcg_env,EA ,tcg_constant_i32 (PPC_TLB_EPID_STORE )); +return true; +} +#include "translate/fixedpoint-impl.c.inc" #include "translate/fp-impl.c.inc" @@ -5910,25 +5939,6 @@ GEN_HANDLER_E(mcrxrx, 0x1F, 0x00, 0x12, 0x007FF801, PPC_NONE, PPC2_ISA300),#endif GEN_HANDLER (mtmsr,0x1F ,0x12 ,0x04 ,0x001EF801 ,PPC_MISC ),GEN_HANDLER (mtspr,0x1F ,0x13 ,0x0E ,0x00000000 ,PPC_MISC ), -GEN_HANDLER (dcbf,0x1F ,0x16 ,0x02 ,0x03C00001 ,PPC_CACHE ), -GEN_HANDLER_E (dcbfep,0x1F ,0x1F ,0x03 ,0x03C00001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER (dcbi,0x1F ,0x16 ,0x0E ,0x03E00001 ,PPC_CACHE ), -GEN_HANDLER (dcbst,0x1F ,0x16 ,0x01 ,0x03E00001 ,PPC_CACHE ), -GEN_HANDLER_E (dcbstep,0x1F ,0x1F ,0x01 ,0x03E00001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER (dcbt,0x1F ,0x16 ,0x08 ,0x00000001 ,PPC_CACHE ), -GEN_HANDLER_E (dcbtep,0x1F ,0x1F ,0x09 ,0x00000001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER (dcbtst,0x1F ,0x16 ,0x07 ,0x00000001 ,PPC_CACHE ), -GEN_HANDLER_E (dcbtstep,0x1F ,0x1F ,0x07 ,0x00000001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER_E (dcbtls,0x1F ,0x06 ,0x05 ,0x02000001 ,PPC_BOOKE ,PPC2_BOOKE206 ), -GEN_HANDLER_E (dcblc,0x1F ,0x06 ,0x0c ,0x02000001 ,PPC_BOOKE ,PPC2_BOOKE206 ), -GEN_HANDLER (dcbz,0x1F ,0x16 ,0x1F ,0x03C00001 ,PPC_CACHE_DCBZ ), -GEN_HANDLER_E (dcbzep,0x1F ,0x1F ,0x1F ,0x03C00001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER (dst,0x1F ,0x16 ,0x0A ,0x01800001 ,PPC_ALTIVEC ), -GEN_HANDLER (dstst,0x1F ,0x16 ,0x0B ,0x01800001 ,PPC_ALTIVEC ), -GEN_HANDLER (dss,0x1F ,0x16 ,0x19 ,0x019FF801 ,PPC_ALTIVEC ), -GEN_HANDLER (icbi,0x1F ,0x16 ,0x1E ,0x03E00001 ,PPC_CACHE_ICBI ), -GEN_HANDLER_E (icbiep,0x1F ,0x1F ,0x1E ,0x03E00001 ,PPC_NONE ,PPC2_BOOKE206 ), -GEN_HANDLER (dcba,0x1F ,0x16 ,0x17 ,0x03E00001 ,PPC_CACHE_DCBA ),GEN_HANDLER (mfsr,0x1F ,0x13 ,0x12 ,0x0010F801 ,PPC_SEGMENT ),GEN_HANDLER (mfsrin,0x1F ,0x13 ,0x14 ,0x001F0001 ,PPC_SEGMENT ), GEN_HANDLER(mtsr, 0x1F, 0x12, 0x06, 0x0010F801, PPC_SEGMENT),
RFC PATCH v4 1/1 target/ppc: Convert cache instructions to decodetree
Convert cache management instructions to decodetree using custom X-form layouts (@X_ea, @X_l, @X_th) and dedicated translation functions. This ensures reserved bits are accurately represented and ignored by the decoder (using '-' in the patterns), rather than being erroneously parsed into instruction fields.
Legacy GEN_HANDLER-based implementations are removed.
The implementation preserves legacy semantics, including:
- MMU-visible accesses for instructions treated as loads (e.g. dcbt, dcbtst, dcbtep, dcbtstep)
- Supervisor and BookE-specific constraints
- Effective address computation via do_ea_calc()
Instructions that were defined as no-ops in the legacy implementation remain no-ops here.
Note on intentional behavior changes:
- dcbf now validates the L field against the Power ISA v3.1 set of
legal values (0, 1, 3, 4, 6).
- Reserved bits that were previously encoded as part of the opcode mask (and trapped if set) are now properly decoded as "don't care" ('-' in the pattern).
Testing:
- Verified TCG equivalence for all cache operations
---
v3 -> v4:
- Replaced 'ign' format fields with '-' in instruction patterns to correctly follow the QEMU decodetree specification.
- Fixed trans_DCBSTEP() incorrectly inheriting REQUIRE_SV() by separating it from trans_DCBFEP().
- Moved trans_DCBI() CACHE flag check outside of CONFIG_USER_ONLY to prevent incorrect privilege exceptions in user-mode.
v2 -> v3:
- Addressed feedback from Chinmay regarding reserved bits.
- Defined custom formats (@X_ea, @X_l, @X_th) in insn32.decode to explicitly capture and ignore reserved bits, preventing them from being mapped to the 'rt' field.
- Removed manual 'rt != 0' reserved bit checks from translation functions.
v1 -> v2:
- Added explicit validation for the 'L' field in dcbf to comply with PowerISA v3.1, properly raising an exception for Undefined Behavior (UB) values.
target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 35 +++ target/ppc/mem_helper.c | 8 +- target/ppc/translate.c | 478 ++++++++++++++++++++------------------- 4 files changed, 292 insertions(+), 237 deletions(-)
target/ppc/helper.h +4 -4
@@ -48,12 +48,12 @@ DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) DEF_HELPER_4(lsw, void, env, tl, i32, i32) DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) -DEF_HELPER_FLAGS_3(dcbz, TCG_CALL_NO_WG, void, env, tl, int) +DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int)#ifdef TARGET_PPC64 -DEF_HELPER_FLAGS_2(dcbzl, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(DCBZL, TCG_CALL_NO_WG, void, env, tl)#endif -DEF_HELPER_FLAGS_2(icbi, TCG_CALL_NO_WG, void, env, tl) -DEF_HELPER_FLAGS_2(icbiep, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBI, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBIEP, TCG_CALL_NO_WG, void, env, tl)#if defined(TARGET_PPC64 )DEF_HELPER_4 (DIVDEU , i64, env, i64, i64, i32)
target/ppc/insn32.decode +35 -0
@@ -1306,6 +1306,41 @@ XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNP 111011 ... -- .... 0 ..... 01111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair +## Cache Management Instructions + +&X_ea ra rb +@X_ea ...... ..... ra:5 rb:5 .......... . &X_ea + +&X_l l ra rb +@X_l ...... .. l:3 ra:5 rb:5 .......... . &X_l + +&X_th th ra rb +@X_th ...... th:5 ra:5 rb:5 .......... . &X_th + +DCBF 011111 -- ... ..... ..... 0001010110 - @X_l +DCBFEP 011111 ----- ..... ..... 0001111111 - @X_ea +DCBI 011111 ----- ..... ..... 0111010110 - @X_ea +DCBST 011111 ----- ..... ..... 0000110110 - @X_ea +DCBSTEP 011111 ----- ..... ..... 0000111111 - @X_ea +DCBA 011111 ----- ..... ..... 1011110110 - @X_ea + +DCBT 011111 ..... ..... ..... 0100010110 - @X_th +DCBTEP 011111 ----- ..... ..... 0100111111 - @X_ea +DCBTST 011111 ..... ..... ..... 0011110110 - @X_th +DCBTSTEP 011111 ----- ..... ..... 0011111111 - @X_ea + +DCBTLS 011111 ..... ..... ..... 0010100110 - @X_th +DCBLC 011111 ..... ..... ..... 0110000110 - @X_th + +DCBZ 011111 ----- ..... ..... 1111110110 - @X_ea +DCBZEP 011111 ----- ..... ..... 1111111111 - @X_ea +ICBI 011111 ----- ..... ..... 1111010110 - @X_ea +ICBIEP 011111 ----- ..... ..... 1111011111 - @X_ea + +DST 011111 ----- ..... ..... 0101010110 - @X_ea +DSTST 011111 ----- ..... ..... 0101110110 - @X_ea +DSS 011111 ----- ..... ..... 1100110110 - @X_ea + ##Extend Sign Word and Shift Left Immediate XS-form EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS
target/ppc/mem_helper.c +4 -4
@@ -319,13 +319,13 @@ static void dcbz_common(CPUPPCState *env, target_ulong addr,clear_helper_retaddr (); } -void helper_dcbz (CPUPPCState *env,target_ulong addr,int mmu_idx) +void helper_DCBZ (CPUPPCState *env,target_ulong addr,int mmu_idx) {dcbz_common (env, addr, mmu_idx, env->dcache_line_size,GETPC ()); }#ifdef TARGET_PPC64 -void helper_dcbzl (CPUPPCState *env,target_ulong addr) +void helper_DCBZL (CPUPPCState *env,target_ulong addr) {int dcbz_size = env->dcache_line_size;
@@ -341,7 +341,7 @@ void helper_dcbzl(CPUPPCState *env, target_ulong addr) }#endif -void helper_icbi (CPUPPCState *env,target_ulong addr) +void helper_ICBI (CPUPPCState *env,target_ulong addr) {unsigned mmu_idx =cpu_mmu_index (env_cpu (env), false);MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN , mmu_idx);
@@ -357,7 +357,7 @@ void helper_icbi(CPUPPCState *env, target_ulong addr)cpu_ldl_mmu (env, addr, oi,GETPC ()); } -void helper_icbiep (CPUPPCState *env,target_ulong addr) +void helper_ICBIEP (CPUPPCState *env,target_ulong addr) {#if !defined(CONFIG_USER_ONLY )MemOpIdx oi =make_memop_idx (MO_UL |MO_UNALN ,PPC_TLB_EPID_LOAD );
target/ppc/translate.c +249 -229
496 lines not on this page · raw message
Signature · 1 line
2.54.0
tasmiya
Tested-byRe: [RFC PATCH v2] target/ppc: Convert cache instructions to decodetree
In reply to Chinmay RathI tested the patch on my setup and can confirm it fixes the "illegal instruction" issue I was seeing with HTX mdt.all on a KVM guest.
*Issue observed (before patch) :*
With HTX mdt.all running on the guest, hxecpu would crash with:
/"hxecpu[7487]: illegal instruction (4) at 7fffbc401054 nip 7fffbc401054 lr 7fffbc400adc code 1"/
*After applying this patch:*
The illegal instruction errors are no longer seen in dmesg, and hxecpu runs cleanly through HTX.
Quoted 659 lines · Chinmay Rath
Quoted 70 lines · Nikhil Kumar Singh
Convert cache management instructions to decodetree using the X-form layout and dedicated translation functions.
Legacy GEN_HANDLER-based implementations are removed.
The implementation preserves legacy semantics, including:
- MMU-visible accesses for instructions treated as loads (e.g. dcbt, dcbtst, dcbtep, dcbtstep)
- Supervisor and BookE-specific constraints
- Effective address computation viado_ea_calc()Instructions that were defined as no-ops in the legacy implementation remain no-ops here.
Testing:
- Verified TCG equivalence for all cache operationsSigned-off-by Nikhil Kumar Singh <[email protected]>Signed-off-by Chinmay Rath <[email protected]>[cr: linux user build, flag check, helper function fixes]---
target/ppc/helper.h | 8 +-
target/ppc/insn32.decode | 25 ++
target/ppc/mem_helper.c | 8 +-
target/ppc/translate.c | 495 +++++++++++++++++++++------------------4 files changed, 299 insertions(+), 237 deletions(-)target/ppc/helper.h +4
-4@@ -48,12 +48,12 @@ DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) DEF_HELPER_4(lsw, void, env, tl, i32, i32) DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) -DEF_HELPER_FLAGS_3(dcbz, TCG_CALL_NO_WG, void, env, tl, int) +DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int) #ifdef TARGET_PPC64 -DEF_HELPER_FLAGS_2(dcbzl, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(DCBZL, TCG_CALL_NO_WG, void, env, tl) #endif -DEF_HELPER_FLAGS_2(icbi, TCG_CALL_NO_WG, void, env, tl) -DEF_HELPER_FLAGS_2(icbiep, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBI, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(ICBIEP, TCG_CALL_NO_WG, void, env, tl) DEF_HELPER_5(lscbx, tl, env, tl, i32, i32, i32) #if defined(TARGET_PPC64)target/ppc/insn32.decode +0
-0@@ -1306,6 +1306,31 @@ XVF64GERPN 111011 ... -- .... 0 .....10111010 ..- @XX3_at xa=%xx_xa_pair
XVF64GERNP 111011 ... -- .... 0 ..... 01111010 ..- @XX3_at xa=%xx_xa_pair XVF64GERNN 111011 ... -- .... 0 ..... 11111010 ..- @XX3_at xa=%xx_xa_pair +## Cache Management Instructionstarget/ppc/insn32.decode +13
-0+DCBF 011111 ..... ..... ..... 0001010110 - @X +DCBFEP 011111 ..... ..... ..... 0001111111 - @X +DCBI 011111 ..... ..... ..... 0111010110 - @X +DCBST 011111 ..... ..... ..... 0000110110 - @X +DCBSTEP 011111 ..... ..... ..... 0000111111 - @X +DCBA 011111 ..... ..... ..... 1011110110 - @X + +DCBT 011111 ..... ..... ..... 0100010110 - @X +DCBTEP 011111 ..... ..... ..... 0100111111 - @X +DCBTST 011111 ..... ..... ..... 0011110110 - @X +DCBTSTEP 011111 ..... ..... ..... 0011111111 - @X + +DCBTLS 011111 ..... ..... ..... 0010100110 - @Xtarget/ppc/insn32.decode XVF64GERPN 111011 ... -- .... 0 ..... 10111010 ..- @XX3_at xa=%xx_xa_pair · line 1332
Quoted 10 lines
target/ppc/insn32.decode +10
-0+DCBLC 011111 ..... ..... ..... 0110000110 - @X + +DCBZ 011111 ..... ..... ..... 1111110110 - @X +DCBZEP 011111 ..... ..... ..... 1111111111 - @X +ICBI 011111 ..... ..... ..... 1111010110 - @X +ICBIEP 011111 ..... ..... ..... 1111011111 - @X + +DST 011111 ..... ..... ..... 0101010110 - @X +DSTST 011111 ..... ..... ..... 0101110110 - @X +DSS 011111 ..... ..... ..... 1100110110 - @XJust noticed that many of the instructions above do not accurately represent the reserved bits, and take them as part of the rt field in the
arg_Xstruct.
Eg, as per ISA 3.1C :
For DCBF : Bits 6-7 are reserved and bits 8-10 are L field. In your patch, you are including the reserved bits as part of the L field, which is misleading IMO and could be a recipe for wrong emulation if the reserved bits are given meaning at some point. For DCBZ: Bits 6-10 are reserved which is not represented here.I have not checked individually for all the 20 odd instructions but I guess one would expect the instructions to be represented correctly in the spec.
-Chinmay
Quoted 568 lines
+
##Extend Sign Word and Shift Left Immediate XS-form EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS diff --gita/target/ppc/mem_helper.cb/target/ppc/mem_helper.cindex119dc1df23..5d3d377261100644target/ppc/mem_helper.c +2
-1@@ -319,13 +319,13 @@ static void dcbz_common(CPUPPCState *env,target_ulong addr, clear_helper_retaddr(); } -void helper_dcbz(CPUPPCState *env, target_ulong addr, int mmu_idx) +void helper_DCBZ (CPUPPCState *env,target_ulong addr,int mmu_idx) { dcbz_common(env, addr, mmu_idx, env->dcache_line_size, GETPC()); } #ifdef TARGET_PPC64 -void helper_dcbzl (CPUPPCState *env,target_ulong addr) +void helper_DCBZL (CPUPPCState *env,target_ulong addr) { int dcbz_size = env->dcache_line_size; @@ -341,7 +341,7 @@ void helper_dcbzl(CPUPPCState *env, target_ulong addr)}
#endif
-voidhelper_icbi(CPUPPCState *env, target_ulong addr)+voidhelper_ICBI(CPUPPCState *env, target_ulong addr){
unsignedmmu_idx=cpu_mmu_index(env_cpu(env), false); MemOpIdx oi =make_memop_idx(MO_UL | MO_UNALN, mmu_idx);target/ppc/mem_helper.c +1
-0@@ -357,7 +357,7 @@ void helper_icbi(CPUPPCState *env, target_ulong addr) cpu_ldl_mmu(env, addr, oi, GETPC()); } -void helper_icbiep(CPUPPCState *env, target_ulong addr) +void helper_ICBIEP (CPUPPCState *env,target_ulong addr) { #if !defined(CONFIG_USER_ONLY)MemOpIdx oi =
make_memop_idx(MO_UL | MO_UNALN, PPC_TLB_EPID_LOAD);target/ppc/translate.c +0
-0@@ -4296,216 +4296,6 @@ static void gen_setb(DisasContext *ctx) } #endif-/*** Cache management ***/
target/ppc/translate.c +0
-38- -/* dcbf */ -static void gen_dcbf (DisasContext *ctx) -{ - /* XXX: specification says this is treated as a load by the MMU */ - TCGv t0; - gen_set_access_type(ctx, ACCESS_CACHE); - t0 = tcg_temp_new(); - gen_addr_reg_index(ctx, t0); - gen_qemu_ld8u(ctx, t0, t0); -} - -/* dcbfep (external PID dcbf) */ -static void gen_dcbfep (DisasContext *ctx) -{ - /* XXX: specification says this is treated as a load by the MMU */ - TCGv t0; - CHK_SV(ctx); - gen_set_access_type(ctx, ACCESS_CACHE); - t0 = tcg_temp_new(); - gen_addr_reg_index(ctx, t0); - tcg_gen_qemu_ld_tl(t0, t0, PPC_TLB_EPID_LOAD, DEF_MEMOP(MO_UB)); -} - -/* dcbi (Supervisor only) */ -static void gen_dcbi (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) - GEN_PRIV(ctx); -#else - TCGv EA, val; - - CHK_SV(ctx); - EA = tcg_temp_new(); - gen_set_access_type(ctx, ACCESS_CACHE); - gen_addr_reg_index(ctx, EA); - val = tcg_temp_new(); - /* XXX: specification says this should be treated as a store bythe MMU */
-gen_qemu_ld8u(ctx, val, EA);
-gen_qemu_st8(ctx, val, EA);target/ppc/translate.c +0
-93-#endif /* defined(CONFIG_USER_ONLY) */ -} - -/* dcdst */ -static void gen_dcbst (DisasContext *ctx) -{ - /* XXX: specification say this is treated as a load by the MMU */ - TCGv t0; - gen_set_access_type(ctx, ACCESS_CACHE); - t0 = tcg_temp_new(); - gen_addr_reg_index(ctx, t0); - gen_qemu_ld8u(ctx, t0, t0); -} - -/* dcbstep (dcbstep External PID version) */ -static void gen_dcbstep (DisasContext *ctx) -{ - /* XXX: specification say this is treated as a load by the MMU */ - TCGv t0; - gen_set_access_type(ctx, ACCESS_CACHE); - t0 = tcg_temp_new(); - gen_addr_reg_index(ctx, t0); - tcg_gen_qemu_ld_tl(t0, t0, PPC_TLB_EPID_LOAD, DEF_MEMOP(MO_UB)); -} - -/* dcbt */ -static void gen_dcbt (DisasContext *ctx) -{ - /* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtep */ -static void gen_dcbtep (DisasContext *ctx) -{ - /* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtst */ -static void gen_dcbtst (DisasContext *ctx) -{ - /* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtstep */ -static void gen_dcbtstep (DisasContext *ctx) -{ - /* -* interpreted as no-op -* XXX: specification say this is treated as a load by the MMU but -* does not generate any exception -*/ -} - -/* dcbtls */ -static void gen_dcbtls (DisasContext *ctx) -{ - /* Always fails locking the cache */ - TCGv t0 = tcg_temp_new(); - gen_load_spr(t0, SPR_Exxx_L1CSR0); - tcg_gen_ori_tl(t0, t0, L1CSR0_CUL); - gen_store_spr(SPR_Exxx_L1CSR0, t0); -} - -/* dcblc */ -static void gen_dcblc (DisasContext *ctx) -{ - /* -* interpreted as no-op -*/ -} - -/* dcbz */ -static void gen_dcbz (DisasContext *ctx) -{ - TCGv tcgv_addr = tcg_temp_new(); - - gen_set_access_type(ctx, ACCESS_CACHE); - gen_addr_reg_index(ctx, tcgv_addr); - -#ifdef TARGET_PPC64 - if (ctx->excp_model == POWERPC_EXCP_970 && !(ctx->opcode &
0x00200000)) {
-gen_helper_dcbzl(tcg_env, tcgv_addr);
- return;
- }target/ppc/translate.c +0
-3-#endif - - gen_helper_dcbz(tcg_env, tcgv_addr,
tcg_constant_i32(ctx->mem_idx));target/ppc/translate.c +0
-10-} - -/* dcbzep */ -static void gen_dcbzep (DisasContext *ctx) -{ - TCGv tcgv_addr = tcg_temp_new(); - - gen_set_access_type(ctx, ACCESS_CACHE); - gen_addr_reg_index(ctx, tcgv_addr); - gen_helper_dcbz(tcg_env, tcgv_addr,
tcg_constant_i32(PPC_TLB_EPID_STORE));target/ppc/translate.c +0
-60-} - -/* dst / dstt */ -static void gen_dst (DisasContext *ctx) -{ - if (rA(ctx->opcode) == 0) { - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); - } else { - /* interpreted as no-op */ - } -} - -/* dstst /dststt */ -static void gen_dstst (DisasContext *ctx) -{ - if (rA(ctx->opcode) == 0) { - gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); - } else { - /* interpreted as no-op */ - } - -} - -/* dss / dssall */ -static void gen_dss (DisasContext *ctx) -{ - /* interpreted as no-op */ -} - -/* icbi */ -static void gen_icbi (DisasContext *ctx) -{ - TCGv t0; - gen_set_access_type(ctx, ACCESS_CACHE); - t0 = tcg_temp_new(); - gen_addr_reg_index(ctx, t0); - gen_helper_icbi(tcg_env, t0); -} - -/* icbiep */ -static void gen_icbiep (DisasContext *ctx) -{ - TCGv t0; - gen_set_access_type(ctx, ACCESS_CACHE); - t0 = tcg_temp_new(); - gen_addr_reg_index(ctx, t0); - gen_helper_icbiep(tcg_env, t0); -} - -/* Optional: */ -/* dcba */ -static void gen_dcba (DisasContext *ctx) -{ - /* -* interpreted as no-op -* XXX: specification say this is treated as a store by the MMU -* but does not generate any exception -*/ -} -/*** Segment register manipulation ***/ /* Supervisor only: */
@@ -5764,6 +5554,272 @@ static booltrans_LQARX(DisasContext *ctx, arg_LQARX *a)return true;
}
+/*
+ * Cache Management Instructions (decodetree)
+ */target/ppc/translate.c +95
-0+ +static bool trans_DCBA (DisasContext *ctx,arg_X *a) +{ + REQUIRE_INSNS_FLAGS(ctx, CACHE_DCBA); + return true; +} + +static bool trans_DCBT (DisasContext *ctx,arg_X *a) +{ + REQUIRE_INSNS_FLAGS(ctx, CACHE); + return true; +} + +static bool trans_DCBTEP (DisasContext *ctx,arg_X *a) +{ + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); + return true; +} + +static bool trans_DCBTST (DisasContext *ctx,arg_X *a) +{ + REQUIRE_INSNS_FLAGS(ctx, CACHE); + return true; +} + +static bool trans_DCBTSTEP (DisasContext *ctx,arg_X *a) +{ + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); + return true; +} + +static bool trans_DCBLC (DisasContext *ctx,arg_X *a) +{ + /* Requires either PPC_BOOKE or PPC2_BOOKE206 */ + if (!(ctx->insns_flags & PPC_BOOKE) && + !(ctx->insns_flags2 & PPC2_BOOKE206)) { + return false; + } + return true; +} + +static bool trans_DSS (DisasContext *ctx,arg_X *a) +{ + REQUIRE_INSNS_FLAGS(ctx, ALTIVEC); + return true; +} + +static bool trans_DCBTLS (DisasContext *ctx,arg_X *a) +{ + TCGv t0 = tcg_temp_new(); + + /* Requires either PPC_BOOKE or PPC2_BOOKE206 */ + if (!(ctx->insns_flags & PPC_BOOKE) && + !(ctx->insns_flags2 & PPC2_BOOKE206)) { + return false; + } + + gen_load_spr(t0, SPR_Exxx_L1CSR0); + tcg_gen_ori_tl(t0, t0, L1CSR0_CUL); + gen_store_spr(SPR_Exxx_L1CSR0, t0); + + return true; +} + +static bool trans_DST (DisasContext *ctx,arg_X *a) +{ + REQUIRE_INSNS_FLAGS(ctx, ALTIVEC); + + if (a->ra == 0) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + } + + return true; +} + +static bool trans_DSTST (DisasContext *ctx,arg_X *a) +{ + REQUIRE_INSNS_FLAGS(ctx, ALTIVEC); + + if (a->ra == 0) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + } + + return true; +} + +static bool trans_DCBF (DisasContext *ctx,arg_X *a) +{ + TCGv EA; + + REQUIRE_INSNS_FLAGS(ctx, CACHE); + + /* +* As per PowerISA v3.1, the L field (mapped to a->rt in X-form) +* can have values 0, 1, 3, 4, or 6. Other values are Undefined Behavior (UB).
+ */
+ switch (a->rt) {
+ case 0: /* dcbf */
+ case 1: /* dcbfl */
+ case 3: /* dcbflp */
+ case 4: /* dcbfps */
+ case 6: /* dcbstps */
+ break;
+ default:
+gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true;
+ }target/ppc/translate.c +156
-0+ + gen_set_access_type(ctx, ACCESS_CACHE); + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + gen_qemu_ld8u(ctx, EA, EA); + + return true; +} + +static bool trans_DCBST (DisasContext *ctx,arg_X *a) +{ + + if (a->rt != 0) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true; + } + + /* Flags check overlaps with trans_DCBF */ + return trans_DCBF(ctx, a); +} + +static bool trans_DCBFEP (DisasContext *ctx,arg_X *a) +{ + TCGv EA; + + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); + + /* Per ISA: RT must be zero for cache management instructions */ + if (a->rt != 0) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true; + } + + REQUIRE_SV(ctx); + + gen_set_access_type(ctx, ACCESS_CACHE); + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + + tcg_gen_qemu_ld_tl(EA, EA, PPC_TLB_EPID_LOAD, DEF_MEMOP(MO_UB)); + + return true; +} + +static bool trans_DCBSTEP (DisasContext *ctx,arg_X *a) +{ + /* Flags check overlaps with trans_DCBFEP */ + return trans_DCBFEP(ctx, a); +} + +static bool trans_DCBI (DisasContext *ctx,arg_X *a) +{ +#if defined(CONFIG_USER_ONLY ) + gen_priv_opc(ctx); + return true; +#else + TCGv EA, val; + REQUIRE_INSNS_FLAGS(ctx, CACHE); + + if (a->rt != 0) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true; + } + + REQUIRE_SV(ctx); + gen_set_access_type(ctx, ACCESS_CACHE); + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + val = tcg_temp_new(); + + gen_qemu_ld8u(ctx, val, EA); + gen_qemu_st8(ctx, val, EA); + + return true; +#endif +} + +static bool trans_ICBI (DisasContext *ctx,arg_X *a) +{ + TCGv EA; + + REQUIRE_INSNS_FLAGS(ctx, CACHE_ICBI); + + if (a->rt != 0) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true; + } + + + gen_set_access_type(ctx, ACCESS_CACHE); + + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + gen_helper_ICBI(tcg_env, EA); + + return true; +} + +static bool trans_ICBIEP (DisasContext *ctx,arg_X *a) +{ + TCGv EA; + + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); + REQUIRE_SV(ctx); + + gen_set_access_type(ctx, ACCESS_CACHE); + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + + gen_helper_ICBIEP(tcg_env, EA); + return true; +} + +static bool trans_DCBZ (DisasContext *ctx,arg_X *a) +{ + TCGv EA; + + REQUIRE_INSNS_FLAGS(ctx, CACHE_DCBZ); + + if (a->rt != 0) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true; + } + + + gen_set_access_type(ctx, ACCESS_CACHE); + + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + +#if defined(TARGET_PPC64 ) + if (ctx->excp_model == POWERPC_EXCP_970 && + !(ctx->opcode & 0x00200000)) { + gen_helper_DCBZL(tcg_env, EA); + return true; + } +#endif + + gen_helper_DCBZ(tcg_env, EA, tcg_constant_i32(ctx->mem_idx)); + return true; +} + +static bool trans_DCBZEP (DisasContext *ctx,arg_X *a) +{ + TCGv EA; + + REQUIRE_INSNS_FLAGS2(ctx, BOOKE206); + + if (a->rt != 0) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true; + } + + REQUIRE_SV(ctx); + + gen_set_access_type(ctx, ACCESS_CACHE); + EA = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + + gen_helper_DCBZ(tcg_env, EA, tcg_constant_i32(PPC_TLB_EPID_STORE)); + return true; +} +#include "translate/fixedpoint-impl.c.inc"
#include "translate/fp-impl.c.inc"target/ppc/translate.c +0
-7@@ -5928,25 +5984,6 @@ GEN_HANDLER_E(mcrxrx, 0x1F, 0x00, 0x12, 0x007FF801, PPC_NONE, PPC2_ISA300), #endif GEN_HANDLER(mtmsr, 0x1F, 0x12, 0x04, 0x001EF801, PPC_MISC), GEN_HANDLER(mtspr, 0x1F, 0x13, 0x0E, 0x00000000, PPC_MISC), -GEN_HANDLER (dcbf,0x1F ,0x16 ,0x02 ,0x03C00001 ,PPC_CACHE ), -GEN_HANDLER_E (dcbfep,0x1F ,0x1F ,0x03 ,0x03C00001 ,PPC_NONE , PPC2_BOOKE206), -GEN_HANDLER (dcbi,0x1F ,0x16 ,0x0E ,0x03E00001 ,PPC_CACHE ), -GEN_HANDLER (dcbst,0x1F ,0x16 ,0x01 ,0x03E00001 ,PPC_CACHE ), -GEN_HANDLER_E (dcbstep,0x1F ,0x1F ,0x01 ,0x03E00001 ,PPC_NONE , PPC2_BOOKE206), -GEN_HANDLER (dcbt,0x1F ,0x16 ,0x08 ,0x00000001 ,PPC_CACHE ), -GEN_HANDLER_E(dcbtep, 0x1F, 0x1F, 0x09, 0x00000001, PPC_NONE,
PPC2_BOOKE206),target/ppc/translate.c +0
-2-GEN_HANDLER (dcbtst,0x1F ,0x16 ,0x07 ,0x00000001 ,PPC_CACHE ), -GEN_HANDLER_E(dcbtstep, 0x1F, 0x1F, 0x07, 0x00000001, PPC_NONE,
PPC2_BOOKE206),
-GEN_HANDLER_E(dcbtls,0x1F,0x06,0x05,0x02000001,PPC_BOOKE,PPC2_BOOKE206),
-GEN_HANDLER_E(dcblc,0x1F,0x06,0x0c,0x02000001,PPC_BOOKE,PPC2_BOOKE206),target/ppc/translate.c +0
-2-GEN_HANDLER (dcbz,0x1F ,0x16 ,0x1F ,0x03C00001 ,PPC_CACHE_DCBZ ), -GEN_HANDLER_E(dcbzep, 0x1F, 0x1F, 0x1F, 0x03C00001, PPC_NONE,
PPC2_BOOKE206),target/ppc/translate.c +0
-5-GEN_HANDLER (dst,0x1F ,0x16 ,0x0A ,0x01800001 ,PPC_ALTIVEC ), -GEN_HANDLER (dstst,0x1F ,0x16 ,0x0B ,0x01800001 ,PPC_ALTIVEC ), -GEN_HANDLER (dss,0x1F ,0x16 ,0x19 ,0x019FF801 ,PPC_ALTIVEC ), -GEN_HANDLER (icbi,0x1F ,0x16 ,0x1E ,0x03E00001 ,PPC_CACHE_ICBI ), -GEN_HANDLER_E(icbiep, 0x1F, 0x1F, 0x1E, 0x03E00001, PPC_NONE,
PPC2_BOOKE206),
-GEN_HANDLER(dcba,0x1F,0x16,0x17,0x03E00001,PPC_CACHE_DCBA),GEN_HANDLER(mfsr, 0x1F, 0x13, 0x12, 0x0010F801, PPC_SEGMENT),GEN_HANDLER(mfsrin, 0x1F, 0x13, 0x14, 0x001F0001, PPC_SEGMENT),GEN_HANDLER(mtsr, 0x1F, 0x12, 0x06, 0x0010F801, PPC_SEGMENT),
RFC PATCH 4/28 target/ppc: Move vector merge instructions to decodetree
In reply to Chinmay RathFrom: Aboorva Devarajan <[email protected]>
Move below instructions to decodetree specification:
vmrg{hb, hh, hw, lb, lh, lw} : VX-form
The individual gen_vmrg* functions generated by GEN_VXFORM are replaced by a shared do_vmrg() helper dispatching to the existing gen_helper_VMRG* TCG helpers via the TRANS_FLAGS() macro, which also handles the ALTIVEC facility check.
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
--- target/ppc/helper.h | 12 ++++++------ target/ppc/insn32.decode | 9 +++++++++ target/ppc/int_helper.c | 12 ++++++------ target/ppc/translate/vmx-impl.c.inc | 25 +++++++++++++++++++------ target/ppc/translate/vmx-ops.c.inc | 6 ------ 5 files changed, 40 insertions(+), 24 deletions(-)
target/ppc/helper.h +6 -6
@@ -174,12 +174,12 @@ DEF_HELPER_4(vcmpeqfp_dot, void, env, avr, avr, avr) DEF_HELPER_4(vcmpgefp_dot, void, env, avr, avr, avr) DEF_HELPER_4(vcmpgtfp_dot, void, env, avr, avr, avr) DEF_HELPER_4(vcmpbfp_dot, void, env, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrglb, TCG_CALL_NO_RWG, void, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrglh, TCG_CALL_NO_RWG, void, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrglw, TCG_CALL_NO_RWG, void, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrghb, TCG_CALL_NO_RWG, void, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrghh, TCG_CALL_NO_RWG, void, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrghw, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGLB, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGLH, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGLW, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGHB, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGHH, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGHW, TCG_CALL_NO_RWG, void, avr, avr, avr) DEF_HELPER_FLAGS_3(VMULESB, TCG_CALL_NO_RWG, void, avr, avr, avr) DEF_HELPER_FLAGS_3(VMULESH, TCG_CALL_NO_RWG, void, avr, avr, avr)DEF_HELPER_FLAGS_3 (VMULESW ,TCG_CALL_NO_RWG , void, avr, avr, avr)
target/ppc/insn32.decode +9 -0
@@ -795,6 +795,15 @@ VNOR 000100 ..... ..... ..... 10100000100 @VX VXOR 000100 ..... ..... ..... 10011000100 @VX VEQV 000100 ..... ..... ..... 11010000100 @VX +## Vector Merge Instructions + +VMRGHB 000100 ..... ..... ..... 00000001100 @VX +VMRGHH 000100 ..... ..... ..... 00001001100 @VX +VMRGHW 000100 ..... ..... ..... 00010001100 @VX +VMRGLB 000100 ..... ..... ..... 00100001100 @VX +VMRGLH 000100 ..... ..... ..... 00101001100 @VX +VMRGLW 000100 ..... ..... ..... 00110001100 @VX + ## Vector Integer Average Instructions VAVGSB 000100 ..... ..... ..... 10100000010 @VX
target/ppc/int_helper.c +6 -6
@@ -950,7 +950,7 @@ void helper_VMLADDUHM(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t *c, }#define VMRG_DO (name, element, access, ofs) \ - void helper_v##name(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ + void helper_V##name(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ { \ ppc_avr_t result; \ int i, half = ARRAY_SIZE(r->element) / 2; \
@@ -963,11 +963,11 @@ void helper_VMLADDUHM(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t *c, }#define VMRG (suffix, element, access) \ - VMRG_DO(mrgl##suffix, element, access, half) \ - VMRG_DO(mrgh##suffix, element, access, 0) -VMRG(b, u8, VsrB) -VMRG(h, u16, VsrH) -VMRG(w, u32, VsrW) + VMRG_DO(MRGL##suffix, element, access, half) \ + VMRG_DO(MRGH##suffix, element, access, 0) +VMRG(B, u8, VsrB) +VMRG(H, u16, VsrH) +VMRG(W, u32, VsrW)#undef VMRG_DO#undef VMRG
target/ppc/translate/vmx-impl.c.inc +19 -6
@@ -350,12 +350,25 @@ GEN_VXFORM_V(vsububm, MO_8, tcg_gen_gvec_sub, 0, 16); GEN_VXFORM_V(vsubuhm, MO_16, tcg_gen_gvec_sub, 0, 17); GEN_VXFORM_V(vsubuwm, MO_32, tcg_gen_gvec_sub, 0, 18); GEN_VXFORM_V(vsubudm, MO_64, tcg_gen_gvec_sub, 0, 19); -GEN_VXFORM(vmrghb, 6, 0); -GEN_VXFORM(vmrghh, 6, 1); -GEN_VXFORM(vmrghw, 6, 2); -GEN_VXFORM(vmrglb, 6, 4); -GEN_VXFORM(vmrglh, 6, 5); -GEN_VXFORM(vmrglw, 6, 6); + +static bool do_vmrg(DisasContext *ctx, arg_VX *a, + void (*helper)(TCGv_ptr, TCGv_ptr, TCGv_ptr)) +{ + TCGv_ptr ra, rb, rd; + REQUIRE_VECTOR(ctx); + ra = gen_avr_ptr(a->vra); + rb = gen_avr_ptr(a->vrb); + rd = gen_avr_ptr(a->vrt); + helper(rd, ra, rb); + return true; +} + +TRANS_FLAGS(ALTIVEC, VMRGHB, do_vmrg, gen_helper_VMRGHB); +TRANS_FLAGS(ALTIVEC, VMRGHH, do_vmrg, gen_helper_VMRGHH); +TRANS_FLAGS(ALTIVEC, VMRGHW, do_vmrg, gen_helper_VMRGHW); +TRANS_FLAGS(ALTIVEC, VMRGLB, do_vmrg, gen_helper_VMRGLB); +TRANS_FLAGS(ALTIVEC, VMRGLH, do_vmrg, gen_helper_VMRGLH); +TRANS_FLAGS(ALTIVEC, VMRGLW, do_vmrg, gen_helper_VMRGLW); static void trans_vmrgew(DisasContext *ctx) {
target/ppc/translate/vmx-ops.c.inc +0 -6
@@ -33,12 +33,6 @@ GEN_VXFORM_DUAL(vsubuhm, bcdsub, 0, 17, PPC_ALTIVEC, PPC_NONE), GEN_VXFORM_DUAL(vsubuwm, bcdus, 0, 18, PPC_ALTIVEC, PPC2_ISA300), GEN_VXFORM_DUAL(vsubudm, bcds, 0, 19, PPC2_ALTIVEC_207, PPC2_ISA300), GEN_VXFORM_300(bcds, 0, 27), -GEN_VXFORM(vmrghb, 6, 0), -GEN_VXFORM(vmrghh, 6, 1), -GEN_VXFORM(vmrghw, 6, 2), -GEN_VXFORM(vmrglb, 6, 4), -GEN_VXFORM(vmrglh, 6, 5), -GEN_VXFORM(vmrglw, 6, 6), GEN_VXFORM_300(vextublx, 6, 24), GEN_VXFORM_300(vextuhlx, 6, 25), GEN_VXFORM_DUAL(vmrgow, vextuwlx, 6, 26, PPC_NONE, PPC2_ALTIVEC_207),
Signature · 1 line
2.53.0
Re: [RFC PATCH 04/28] target/ppc: Move vector merge instructions to decodetree
Thanks,
~ Nikhil
Quoted 151 lines · Chinmay Rath
From: Aboorva Devarajan <[email protected]>
Move below instructions to decodetree specification:
vmrg{hb, hh, hw, lb, lh, lw} : VX-form
The individual gen_vmrg* functions generated by
GEN_VXFORMare replaced by a shareddo_vmrg()helper dispatching to the existing gen_helper_VMRG* TCG helpers via theTRANS_FLAGS()macro, which also handles the ALTIVEC facility check.The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
Signed-off-by Aboorva Devarajan <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/helper.h | 12 ++++++------ target/ppc/insn32.decode | 9 +++++++++ target/ppc/int_helper.c | 12 ++++++------ target/ppc/translate/vmx-impl.c.inc | 25 +++++++++++++++++++------ target/ppc/translate/vmx-ops.c.inc | 6 ------ 5 files changed, 40 insertions(+), 24 deletions(-)target/ppc/helper.h +6
-6@@ -174,12 +174,12 @@ DEF_HELPER_4(vcmpeqfp_dot, void, env, avr, avr, avr) DEF_HELPER_4(vcmpgefp_dot, void, env, avr, avr, avr) DEF_HELPER_4(vcmpgtfp_dot, void, env, avr, avr, avr) DEF_HELPER_4(vcmpbfp_dot, void, env, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrglb, TCG_CALL_NO_RWG, void, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrglh, TCG_CALL_NO_RWG, void, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrglw, TCG_CALL_NO_RWG, void, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrghb, TCG_CALL_NO_RWG, void, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrghh, TCG_CALL_NO_RWG, void, avr, avr, avr) -DEF_HELPER_FLAGS_3(vmrghw, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGLB, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGLH, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGLW, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGHB, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGHH, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_FLAGS_3(VMRGHW, TCG_CALL_NO_RWG, void, avr, avr, avr) DEF_HELPER_FLAGS_3(VMULESB, TCG_CALL_NO_RWG, void, avr, avr, avr) DEF_HELPER_FLAGS_3(VMULESH, TCG_CALL_NO_RWG, void, avr, avr, avr)DEF_HELPER_FLAGS_3 (VMULESW ,TCG_CALL_NO_RWG , void, avr, avr, avr)target/ppc/insn32.decode +9
-0@@ -795,6 +795,15 @@ VNOR 000100 ..... ..... ..... 10100000100 @VX VXOR 000100 ..... ..... ..... 10011000100 @VX VEQV 000100 ..... ..... ..... 11010000100 @VX +## Vector Merge Instructions + +VMRGHB 000100 ..... ..... ..... 00000001100 @VX +VMRGHH 000100 ..... ..... ..... 00001001100 @VX +VMRGHW 000100 ..... ..... ..... 00010001100 @VX +VMRGLB 000100 ..... ..... ..... 00100001100 @VX +VMRGLH 000100 ..... ..... ..... 00101001100 @VX +VMRGLW 000100 ..... ..... ..... 00110001100 @VX + ## Vector Integer Average Instructions VAVGSB 000100 ..... ..... ..... 10100000010 @VXtarget/ppc/int_helper.c +6
-6@@ -950,7 +950,7 @@ void helper_VMLADDUHM(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t *c, }#define VMRG_DO (name, element, access, ofs) \ - void helper_v##name(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ + void helper_V##name(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ { \ ppc_avr_t result; \ int i, half = ARRAY_SIZE(r->element) / 2; \@@ -963,11 +963,11 @@ void helper_VMLADDUHM(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t *c, }#define VMRG (suffix, element, access) \ - VMRG_DO(mrgl##suffix, element, access, half) \ - VMRG_DO(mrgh##suffix, element, access, 0) -VMRG(b, u8, VsrB) -VMRG(h, u16, VsrH) -VMRG(w, u32, VsrW) + VMRG_DO(MRGL##suffix, element, access, half) \ + VMRG_DO(MRGH##suffix, element, access, 0) +VMRG(B, u8, VsrB) +VMRG(H, u16, VsrH) +VMRG(W, u32, VsrW)#undef VMRG_DO#undef VMRGtarget/ppc/translate/vmx-impl.c.inc +19
-6@@ -350,12 +350,25 @@ GEN_VXFORM_V(vsububm, MO_8, tcg_gen_gvec_sub, 0, 16); GEN_VXFORM_V(vsubuhm, MO_16, tcg_gen_gvec_sub, 0, 17); GEN_VXFORM_V(vsubuwm, MO_32, tcg_gen_gvec_sub, 0, 18); GEN_VXFORM_V(vsubudm, MO_64, tcg_gen_gvec_sub, 0, 19); -GEN_VXFORM(vmrghb, 6, 0); -GEN_VXFORM(vmrghh, 6, 1); -GEN_VXFORM(vmrghw, 6, 2); -GEN_VXFORM(vmrglb, 6, 4); -GEN_VXFORM(vmrglh, 6, 5); -GEN_VXFORM(vmrglw, 6, 6); + +static bool do_vmrg(DisasContext *ctx, arg_VX *a, + void (*helper)(TCGv_ptr, TCGv_ptr, TCGv_ptr)) +{ + TCGv_ptr ra, rb, rd; + REQUIRE_VECTOR(ctx); + ra = gen_avr_ptr(a->vra); + rb = gen_avr_ptr(a->vrb); + rd = gen_avr_ptr(a->vrt); + helper(rd, ra, rb); + return true; +} + +TRANS_FLAGS(ALTIVEC, VMRGHB, do_vmrg, gen_helper_VMRGHB); +TRANS_FLAGS(ALTIVEC, VMRGHH, do_vmrg, gen_helper_VMRGHH); +TRANS_FLAGS(ALTIVEC, VMRGHW, do_vmrg, gen_helper_VMRGHW); +TRANS_FLAGS(ALTIVEC, VMRGLB, do_vmrg, gen_helper_VMRGLB); +TRANS_FLAGS(ALTIVEC, VMRGLH, do_vmrg, gen_helper_VMRGLH); +TRANS_FLAGS(ALTIVEC, VMRGLW, do_vmrg, gen_helper_VMRGLW); static void trans_vmrgew(DisasContext *ctx) {target/ppc/translate/vmx-ops.c.inc +0
-6@@ -33,12 +33,6 @@ GEN_VXFORM_DUAL(vsubuhm, bcdsub, 0, 17, PPC_ALTIVEC, PPC_NONE), GEN_VXFORM_DUAL(vsubuwm, bcdus, 0, 18, PPC_ALTIVEC, PPC2_ISA300), GEN_VXFORM_DUAL(vsubudm, bcds, 0, 19, PPC2_ALTIVEC_207, PPC2_ISA300), GEN_VXFORM_300(bcds, 0, 27), -GEN_VXFORM(vmrghb, 6, 0), -GEN_VXFORM(vmrghh, 6, 1), -GEN_VXFORM(vmrghw, 6, 2), -GEN_VXFORM(vmrglb, 6, 4), -GEN_VXFORM(vmrglh, 6, 5), -GEN_VXFORM(vmrglw, 6, 6), GEN_VXFORM_300(vextublx, 6, 24), GEN_VXFORM_300(vextuhlx, 6, 25), GEN_VXFORM_DUAL(vmrgow, vextuwlx, 6, 26, PPC_NONE, PPC2_ALTIVEC_207),
RFC PATCH 5/28 target/ppc: Move vector pack instructions to decodetree
In reply to Chinmay RathFrom: Aboorva Devarajan <[email protected]>
Move below instructions to decodetree specification:
vpkuhum, vpkuwum, vpkuhus, vpkuwus : VX-form (PPC_ALTIVEC) vpkshus, vpkswus, vpkshss, vpkswss : VX-form (PPC_ALTIVEC)
vpkpx : VX-form (PPC_ALTIVEC)
vpkudum, vpkudus, vpksdus, vpksdss : VX-form (PPC2_ALTIVEC_207)
The legacy GEN_VXFORM_ENV/GEN_VXFORM macros that generated gen_vpk*() functions reading register fields from ctx->opcode are replaced by new do_vpk_env()/do_vpk() helpers in vmx-impl.c.inc that use the pre-extracted decodetree argument fields (a->vrt, a->vra, a->vrb) directly. The existing gen_helper_vpk*() implementations in int_helper.c are reused without changes.
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' option before and after the patch.
--- target/ppc/helper.h | 26 +++++++-------- target/ppc/insn32.decode | 16 +++++++++ target/ppc/int_helper.c | 28 ++++++++-------- target/ppc/translate/vmx-impl.c.inc | 51 +++++++++++++++++++++-------- target/ppc/translate/vmx-ops.c.inc | 13 -------- 5 files changed, 81 insertions(+), 53 deletions(-)
target/ppc/helper.h +13 -13
@@ -250,19 +250,19 @@ DEF_HELPER_FLAGS_4(VMSUMUBM, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) DEF_HELPER_FLAGS_4(VMSUMMBM, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) DEF_HELPER_FLAGS_4(VPERM, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) DEF_HELPER_FLAGS_4(VPERMR, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) -DEF_HELPER_4(vpkshss, void, env, avr, avr, avr) -DEF_HELPER_4(vpkshus, void, env, avr, avr, avr) -DEF_HELPER_4(vpkswss, void, env, avr, avr, avr) -DEF_HELPER_4(vpkswus, void, env, avr, avr, avr) -DEF_HELPER_4(vpksdss, void, env, avr, avr, avr) -DEF_HELPER_4(vpksdus, void, env, avr, avr, avr) -DEF_HELPER_4(vpkuhus, void, env, avr, avr, avr) -DEF_HELPER_4(vpkuwus, void, env, avr, avr, avr) -DEF_HELPER_4(vpkudus, void, env, avr, avr, avr) -DEF_HELPER_4(vpkuhum, void, env, avr, avr, avr) -DEF_HELPER_4(vpkuwum, void, env, avr, avr, avr) -DEF_HELPER_4(vpkudum, void, env, avr, avr, avr) -DEF_HELPER_FLAGS_3(vpkpx, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_4(VPKSHSS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKSHUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKSWSS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKSWUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKSDSS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKSDUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUHUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUWUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUDUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUHUM, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUWUM, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUDUM, void, env, avr, avr, avr) +DEF_HELPER_FLAGS_3(VPKPX, TCG_CALL_NO_RWG, void, avr, avr, avr) DEF_HELPER_5(VMHADDSHS, void, env, avr, avr, avr, avr) DEF_HELPER_5(VMHRADDSHS, void, env, avr, avr, avr, avr)DEF_HELPER_FLAGS_4 (VMSUMUHM ,TCG_CALL_NO_RWG , void, avr, avr, avr, avr)
target/ppc/insn32.decode +16 -0
@@ -1054,6 +1054,22 @@ VSTRIHR 000100 ..... 00011 ..... . 0000001101 @VX_tb_rc VCLRLB 000100 ..... ..... ..... 00110001101 @VX VCLRRB 000100 ..... ..... ..... 00111001101 @VX +## Vector Pack Instructions + +VPKUHUM 000100 ..... ..... ..... 0000000111 0 @VX +VPKUWUM 000100 ..... ..... ..... 0000100111 0 @VX +VPKUDUM 000100 ..... ..... ..... 1000100111 0 @VX +VPKUHUS 000100 ..... ..... ..... 0001000111 0 @VX +VPKUWUS 000100 ..... ..... ..... 0001100111 0 @VX +VPKUDUS 000100 ..... ..... ..... 1001100111 0 @VX +VPKSHUS 000100 ..... ..... ..... 0010000111 0 @VX +VPKSWUS 000100 ..... ..... ..... 0010100111 0 @VX +VPKSDUS 000100 ..... ..... ..... 1010100111 0 @VX +VPKSHSS 000100 ..... ..... ..... 0011000111 0 @VX +VPKSWSS 000100 ..... ..... ..... 0011100111 0 @VX +VPKSDSS 000100 ..... ..... ..... 1011100111 0 @VX +VPKPX 000100 ..... ..... ..... 0110000111 0 @VX + # VSX Load/Store Instructions LXSD 111001 ..... ..... .............. 10 @DS
target/ppc/int_helper.c +14 -14
@@ -1465,7 +1465,7 @@ void helper_VPMSUMD(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)#else #define PKBIG 0#endif -void helper_vpkpx (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b) +void helper_VPKPX (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b) {int i, j;ppc_avr_t result;
@@ -1488,7 +1488,7 @@ void helper_vpkpx(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) }#define VPK (suffix, from, to, cvt, dosat) \ - void helper_vpk##suffix(CPUPPCState *env, ppc_avr_t *r, \ + void helper_VPK##suffix(CPUPPCState *env, ppc_avr_t *r, \ ppc_avr_t *a, ppc_avr_t *b) \ { \ int i; \
@@ -1507,18 +1507,18 @@ void helper_vpkpx(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) } \ }#define I (x, y) (x) -VPK(shss, s16, s8, cvtshsb, 1) -VPK(shus, s16, u8, cvtshub, 1) -VPK(swss, s32, s16, cvtswsh, 1) -VPK(swus, s32, u16, cvtswuh, 1) -VPK(sdss, s64, s32, cvtsdsw, 1) -VPK(sdus, s64, u32, cvtsduw, 1) -VPK(uhus, u16, u8, cvtuhub, 1) -VPK(uwus, u32, u16, cvtuwuh, 1) -VPK(udus, u64, u32, cvtuduw, 1) -VPK(uhum, u16, u8, I, 0) -VPK(uwum, u32, u16, I, 0) -VPK(udum, u64, u32, I, 0) +VPK(SHSS, s16, s8, cvtshsb, 1) +VPK(SHUS, s16, u8, cvtshub, 1) +VPK(SWSS, s32, s16, cvtswsh, 1) +VPK(SWUS, s32, u16, cvtswuh, 1) +VPK(SDSS, s64, s32, cvtsdsw, 1) +VPK(SDUS, s64, u32, cvtsduw, 1) +VPK(UHUS, u16, u8, cvtuhub, 1) +VPK(UWUS, u32, u16, cvtuwuh, 1) +VPK(UDUS, u64, u32, cvtuduw, 1) +VPK(UHUM, u16, u8, I, 0) +VPK(UWUM, u32, u16, I, 0) +VPK(UDUM, u64, u32, I, 0)#undef I#undef VPK#undef PKBIG
target/ppc/translate/vmx-impl.c.inc +38 -13
57 lines not on this page · raw message
target/ppc/translate/vmx-ops.c.inc +0 -13
@@ -59,19 +59,6 @@ GEN_VXFORM_300(bcdtrunc, 0, 20), GEN_VXFORM_300(bcdutrunc, 0, 21), GEN_VXFORM(vsl, 2, 7), GEN_VXFORM(vsr, 2, 11), -GEN_VXFORM(vpkuhum, 7, 0), -GEN_VXFORM(vpkuwum, 7, 1), -GEN_VXFORM_207(vpkudum, 7, 17), -GEN_VXFORM(vpkuhus, 7, 2), -GEN_VXFORM(vpkuwus, 7, 3), -GEN_VXFORM_207(vpkudus, 7, 19), -GEN_VXFORM(vpkshus, 7, 4), -GEN_VXFORM(vpkswus, 7, 5), -GEN_VXFORM_207(vpksdus, 7, 21), -GEN_VXFORM(vpkshss, 7, 6), -GEN_VXFORM(vpkswss, 7, 7), -GEN_VXFORM_207(vpksdss, 7, 23), -GEN_VXFORM(vpkpx, 7, 12), GEN_VXFORM(vsum4ubs, 4, 24), GEN_VXFORM(vsum4sbs, 4, 28), GEN_VXFORM(vsum4shs, 4, 25),
Signature · 1 line
2.53.0
Re: [RFC PATCH 05/28] target/ppc: Move vector pack instructions to decodetree
Thanks,
~ Nikhil
Quoted 233 lines · Chinmay Rath
From: Aboorva Devarajan <[email protected]>
Move below instructions to decodetree specification:
vpkuhum, vpkuwum, vpkuhus, vpkuwus : VX-form (
PPC_ALTIVEC) vpkshus, vpkswus, vpkshss, vpkswss : VX-form (PPC_ALTIVEC)
vpkpx : VX-form (PPC_ALTIVEC)
vpkudum, vpkudus, vpksdus, vpksdss : VX-form (PPC2_ALTIVEC_207)The legacy GEN_VXFORM_ENV/GEN_VXFORM macros that generated gen_vpk*() functions reading register fields from
ctx->opcodeare replaced by new do_vpk_env()/do_vpk() helpers in vmx-impl.c.inc that use the pre-extracted decodetree argument fields (a->vrt,a->vra,a->vrb) directly. The existing gen_helper_vpk*() implementations inint_helper.care reused without changes.The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' option before and after the patch.
Signed-off-by Aboorva Devarajan <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/helper.h | 26 +++++++-------- target/ppc/insn32.decode | 16 +++++++++ target/ppc/int_helper.c | 28 ++++++++-------- target/ppc/translate/vmx-impl.c.inc | 51 +++++++++++++++++++++-------- target/ppc/translate/vmx-ops.c.inc | 13 -------- 5 files changed, 81 insertions(+), 53 deletions(-)target/ppc/helper.h +13
-13@@ -250,19 +250,19 @@ DEF_HELPER_FLAGS_4(VMSUMUBM, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) DEF_HELPER_FLAGS_4(VMSUMMBM, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) DEF_HELPER_FLAGS_4(VPERM, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) DEF_HELPER_FLAGS_4(VPERMR, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) -DEF_HELPER_4(vpkshss, void, env, avr, avr, avr) -DEF_HELPER_4(vpkshus, void, env, avr, avr, avr) -DEF_HELPER_4(vpkswss, void, env, avr, avr, avr) -DEF_HELPER_4(vpkswus, void, env, avr, avr, avr) -DEF_HELPER_4(vpksdss, void, env, avr, avr, avr) -DEF_HELPER_4(vpksdus, void, env, avr, avr, avr) -DEF_HELPER_4(vpkuhus, void, env, avr, avr, avr) -DEF_HELPER_4(vpkuwus, void, env, avr, avr, avr) -DEF_HELPER_4(vpkudus, void, env, avr, avr, avr) -DEF_HELPER_4(vpkuhum, void, env, avr, avr, avr) -DEF_HELPER_4(vpkuwum, void, env, avr, avr, avr) -DEF_HELPER_4(vpkudum, void, env, avr, avr, avr) -DEF_HELPER_FLAGS_3(vpkpx, TCG_CALL_NO_RWG, void, avr, avr, avr) +DEF_HELPER_4(VPKSHSS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKSHUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKSWSS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKSWUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKSDSS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKSDUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUHUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUWUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUDUS, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUHUM, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUWUM, void, env, avr, avr, avr) +DEF_HELPER_4(VPKUDUM, void, env, avr, avr, avr) +DEF_HELPER_FLAGS_3(VPKPX, TCG_CALL_NO_RWG, void, avr, avr, avr) DEF_HELPER_5(VMHADDSHS, void, env, avr, avr, avr, avr) DEF_HELPER_5(VMHRADDSHS, void, env, avr, avr, avr, avr)DEF_HELPER_FLAGS_4 (VMSUMUHM ,TCG_CALL_NO_RWG , void, avr, avr, avr, avr)target/ppc/insn32.decode +16
-0@@ -1054,6 +1054,22 @@ VSTRIHR 000100 ..... 00011 ..... . 0000001101 @VX_tb_rc VCLRLB 000100 ..... ..... ..... 00110001101 @VX VCLRRB 000100 ..... ..... ..... 00111001101 @VX +## Vector Pack Instructions + +VPKUHUM 000100 ..... ..... ..... 0000000111 0 @VX +VPKUWUM 000100 ..... ..... ..... 0000100111 0 @VX +VPKUDUM 000100 ..... ..... ..... 1000100111 0 @VX +VPKUHUS 000100 ..... ..... ..... 0001000111 0 @VX +VPKUWUS 000100 ..... ..... ..... 0001100111 0 @VX +VPKUDUS 000100 ..... ..... ..... 1001100111 0 @VX +VPKSHUS 000100 ..... ..... ..... 0010000111 0 @VX +VPKSWUS 000100 ..... ..... ..... 0010100111 0 @VX +VPKSDUS 000100 ..... ..... ..... 1010100111 0 @VX +VPKSHSS 000100 ..... ..... ..... 0011000111 0 @VX +VPKSWSS 000100 ..... ..... ..... 0011100111 0 @VX +VPKSDSS 000100 ..... ..... ..... 1011100111 0 @VX +VPKPX 000100 ..... ..... ..... 0110000111 0 @VX + # VSX Load/Store Instructions LXSD 111001 ..... ..... .............. 10 @DStarget/ppc/int_helper.c +14
-14@@ -1465,7 +1465,7 @@ void helper_VPMSUMD(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)#else #define PKBIG 0#endif -void helper_vpkpx (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b) +void helper_VPKPX (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b) {int i, j;ppc_avr_t result;@@ -1488,7 +1488,7 @@ void helper_vpkpx(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) }#define VPK (suffix, from, to, cvt, dosat) \ - void helper_vpk##suffix(CPUPPCState *env, ppc_avr_t *r, \ + void helper_VPK##suffix(CPUPPCState *env, ppc_avr_t *r, \ ppc_avr_t *a, ppc_avr_t *b) \ { \ int i; \@@ -1507,18 +1507,18 @@ void helper_vpkpx(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) } \ }#define I (x, y) (x) -VPK(shss, s16, s8, cvtshsb, 1) -VPK(shus, s16, u8, cvtshub, 1) -VPK(swss, s32, s16, cvtswsh, 1) -VPK(swus, s32, u16, cvtswuh, 1) -VPK(sdss, s64, s32, cvtsdsw, 1) -VPK(sdus, s64, u32, cvtsduw, 1) -VPK(uhus, u16, u8, cvtuhub, 1) -VPK(uwus, u32, u16, cvtuwuh, 1) -VPK(udus, u64, u32, cvtuduw, 1) -VPK(uhum, u16, u8, I, 0) -VPK(uwum, u32, u16, I, 0) -VPK(udum, u64, u32, I, 0) +VPK(SHSS, s16, s8, cvtshsb, 1) +VPK(SHUS, s16, u8, cvtshub, 1) +VPK(SWSS, s32, s16, cvtswsh, 1) +VPK(SWUS, s32, u16, cvtswuh, 1) +VPK(SDSS, s64, s32, cvtsdsw, 1) +VPK(SDUS, s64, u32, cvtsduw, 1) +VPK(UHUS, u16, u8, cvtuhub, 1) +VPK(UWUS, u32, u16, cvtuwuh, 1) +VPK(UDUS, u64, u32, cvtuduw, 1) +VPK(UHUM, u16, u8, I, 0) +VPK(UWUM, u32, u16, I, 0) +VPK(UDUM, u64, u32, I, 0)#undef I#undef VPK#undef PKBIGtarget/ppc/translate/vmx-impl.c.inc +38
-13@@ -1070,19 +1070,44 @@ TRANS(VRLQMI, do_vector_rotl_quad, false, true) GEN_VXFORM_TRANS(vsl, 2, 7); GEN_VXFORM_TRANS(vsr, 2, 11); -GEN_VXFORM_ENV(vpkuhum, 7, 0); -GEN_VXFORM_ENV(vpkuwum, 7, 1); -GEN_VXFORM_ENV(vpkudum, 7, 17); -GEN_VXFORM_ENV(vpkuhus, 7, 2); -GEN_VXFORM_ENV(vpkuwus, 7, 3); -GEN_VXFORM_ENV(vpkudus, 7, 19); -GEN_VXFORM_ENV(vpkshus, 7, 4); -GEN_VXFORM_ENV(vpkswus, 7, 5); -GEN_VXFORM_ENV(vpksdus, 7, 21); -GEN_VXFORM_ENV(vpkshss, 7, 6); -GEN_VXFORM_ENV(vpkswss, 7, 7); -GEN_VXFORM_ENV(vpksdss, 7, 23); -GEN_VXFORM(vpkpx, 7, 12); +static bool do_vpk_env(DisasContext *ctx, arg_VX *a, + void (*gen_helper)(TCGv_ptr, TCGv_ptr, + TCGv_ptr, TCGv_ptr)) +{ + TCGv_ptr ra, rb, rd; + REQUIRE_VECTOR(ctx); + ra = gen_avr_ptr(a->vra); + rb = gen_avr_ptr(a->vrb); + rd = gen_avr_ptr(a->vrt); + gen_helper(tcg_env, rd, ra, rb); + return true; +} + +static bool do_vpk(DisasContext *ctx, arg_VX *a, + void (*gen_helper)(TCGv_ptr, TCGv_ptr, TCGv_ptr)) +{ + TCGv_ptr ra, rb, rd; + REQUIRE_VECTOR(ctx); + ra = gen_avr_ptr(a->vra); + rb = gen_avr_ptr(a->vrb); + rd = gen_avr_ptr(a->vrt); + gen_helper(rd, ra, rb); + return true; +} + +TRANS_FLAGS(ALTIVEC, VPKUHUM, do_vpk_env, gen_helper_VPKUHUM) +TRANS_FLAGS(ALTIVEC, VPKUWUM, do_vpk_env, gen_helper_VPKUWUM) +TRANS_FLAGS2(ALTIVEC_207, VPKUDUM, do_vpk_env, gen_helper_VPKUDUM) +TRANS_FLAGS(ALTIVEC, VPKUHUS, do_vpk_env, gen_helper_VPKUHUS) +TRANS_FLAGS(ALTIVEC, VPKUWUS, do_vpk_env, gen_helper_VPKUWUS) +TRANS_FLAGS2(ALTIVEC_207, VPKUDUS, do_vpk_env, gen_helper_VPKUDUS) +TRANS_FLAGS(ALTIVEC, VPKSHUS, do_vpk_env, gen_helper_VPKSHUS) +TRANS_FLAGS(ALTIVEC, VPKSWUS, do_vpk_env, gen_helper_VPKSWUS) +TRANS_FLAGS2(ALTIVEC_207, VPKSDUS, do_vpk_env, gen_helper_VPKSDUS) +TRANS_FLAGS(ALTIVEC, VPKSHSS, do_vpk_env, gen_helper_VPKSHSS) +TRANS_FLAGS(ALTIVEC, VPKSWSS, do_vpk_env, gen_helper_VPKSWSS) +TRANS_FLAGS2(ALTIVEC_207, VPKSDSS, do_vpk_env, gen_helper_VPKSDSS) +TRANS_FLAGS(ALTIVEC, VPKPX, do_vpk, gen_helper_VPKPX) GEN_VXFORM_ENV(vsum4ubs, 4, 24); GEN_VXFORM_ENV(vsum4sbs, 4, 28); GEN_VXFORM_ENV(vsum4shs, 4, 25);target/ppc/translate/vmx-ops.c.inc +0
-13@@ -59,19 +59,6 @@ GEN_VXFORM_300(bcdtrunc, 0, 20), GEN_VXFORM_300(bcdutrunc, 0, 21), GEN_VXFORM(vsl, 2, 7), GEN_VXFORM(vsr, 2, 11), -GEN_VXFORM(vpkuhum, 7, 0), -GEN_VXFORM(vpkuwum, 7, 1), -GEN_VXFORM_207(vpkudum, 7, 17), -GEN_VXFORM(vpkuhus, 7, 2), -GEN_VXFORM(vpkuwus, 7, 3), -GEN_VXFORM_207(vpkudus, 7, 19), -GEN_VXFORM(vpkshus, 7, 4), -GEN_VXFORM(vpkswus, 7, 5), -GEN_VXFORM_207(vpksdus, 7, 21), -GEN_VXFORM(vpkshss, 7, 6), -GEN_VXFORM(vpkswss, 7, 7), -GEN_VXFORM_207(vpksdss, 7, 23), -GEN_VXFORM(vpkpx, 7, 12), GEN_VXFORM(vsum4ubs, 4, 24), GEN_VXFORM(vsum4sbs, 4, 28), GEN_VXFORM(vsum4shs, 4, 25),
RFC PATCH 6/28 target/ppc: Move st{b, h, w, d, q}cx instructions to decodetree
In reply to Chinmay RathFrom: Utkarsh Verma <[email protected]>
Move the following store conditional instructions to decodetree specification:
stbcx. : X-form
sthcx. : X-form
stwcx. : X-form
stdcx. : X-form
stqcx. : X-form
The changes were verified by checking that the generated TCG ops remain semantically identical to the legacy translation, using logs captured with the -d in_asm,op flag.
--- target/ppc/insn32.decode | 8 ++ target/ppc/translate.c | 103 --------------------- target/ppc/translate/fixedpoint-impl.c.inc | 84 +++++++++++++++++ 3 files changed, 92 insertions(+), 103 deletions(-)
target/ppc/insn32.decode +8 -0
@@ -732,6 +732,14 @@ DSCLIQ 111111 ..... ..... ...... 001000010 . @Z22_tap_sh_rc DSCRI 111011 ..... ..... ...... 001100010 . @Z22_ta_sh_rc DSCRIQ 111111 ..... ..... ...... 001100010 . @Z22_tap_sh_rc +### Store Conditional Instructions + +STBCX 011111 ..... ..... ..... 1010110110 1 @X +STHCX 011111 ..... ..... ..... 1011010110 1 @X +STWCX 011111 ..... ..... ..... 0010010110 1 @X +STDCX 011111 ..... ..... ..... 0011010110 1 @X +STQCX 011111 ..... ..... ..... 0010110110 1 @X + ## Vector Exclusive-OR-based Instructions VPMSUMD 000100 ..... ..... ..... 10011001000 @VX
target/ppc/translate.c +0 -103
118 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +84 -0
90 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [RFC PATCH 06/28] target/ppc: Move st{b, h, w, d, q}cx instructions to decodetree
Thanks,
~ Nikhil
Quoted 261 lines · Chinmay Rath
From: Utkarsh Verma <[email protected]>
Move the following store conditional instructions to decodetree specification:
stbcx. : X-form
sthcx. : X-form
stwcx. : X-form
stdcx. : X-form
stqcx. : X-formThe changes were verified by checking that the generated TCG ops remain semantically identical to the legacy translation, using logs captured with the -d in_asm,op flag.
Signed-off-by Utkarsh Verma <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/insn32.decode | 8 ++ target/ppc/translate.c | 103 --------------------- target/ppc/translate/fixedpoint-impl.c.inc | 84 +++++++++++++++++ 3 files changed, 92 insertions(+), 103 deletions(-)target/ppc/insn32.decode +8
-0@@ -732,6 +732,14 @@ DSCLIQ 111111 ..... ..... ...... 001000010 . @Z22_tap_sh_rc DSCRI 111011 ..... ..... ...... 001100010 . @Z22_ta_sh_rc DSCRIQ 111111 ..... ..... ...... 001100010 . @Z22_tap_sh_rc +### Store Conditional Instructions + +STBCX 011111 ..... ..... ..... 1010110110 1 @X +STHCX 011111 ..... ..... ..... 1011010110 1 @X +STWCX 011111 ..... ..... ..... 0010010110 1 @X +STDCX 011111 ..... ..... ..... 0011010110 1 @X +STQCX 011111 ..... ..... ..... 0010110110 1 @X + ## Vector Exclusive-OR-based Instructions VPMSUMD 000100 ..... ..... ..... 10011001000 @VXtarget/ppc/translate.c +0
-103@@ -3153,104 +3153,6 @@ static void gen_stdat(DisasContext *ctx) }#endif -static void gen_conditional_store (DisasContext *ctx,MemOp memop) -{ -TCGLabel *lfail; -TCGv EA ; -TCGv cr0; -TCGv t0; -int rs =rS (ctx->opcode); - - lfail =gen_new_label (); -EA =tcg_temp_new (); - cr0 =tcg_temp_new (); - t0 =tcg_temp_new (); - -tcg_gen_mov_tl (cr0, cpu_so); -gen_set_access_type (ctx,ACCESS_RES ); -gen_addr_reg_index (ctx,EA ); -tcg_gen_brcond_tl (TCG_COND_NE ,EA , cpu_reserve, lfail); -tcg_gen_brcondi_tl (TCG_COND_NE , cpu_reserve_length,memop_size (memop), lfail); - -tcg_gen_atomic_cmpxchg_tl (t0, cpu_reserve, cpu_reserve_val, - cpu_gpr[rs], ctx->mem_idx, -DEF_MEMOP (memop) |MO_ALIGN ); -tcg_gen_setcond_tl (TCG_COND_EQ , t0, t0, cpu_reserve_val); -tcg_gen_shli_tl (t0, t0,CRF_EQ_BIT ); -tcg_gen_or_tl (cr0, cr0, t0); - -gen_set_label (lfail); -tcg_gen_trunc_tl_i32 (cpu_crf[0 ], cr0); -tcg_gen_movi_tl (cpu_reserve,-1 ); -} - -#define STCX (name, memop) \ -static void gen_##name(DisasContext *ctx) \ -{ \ - gen_conditional_store(ctx, memop); \ -} - -STCX(stbcx_, MO_UB) -STCX(sthcx_, MO_UW) -STCX(stwcx_, MO_UL) - -#if defined(TARGET_PPC64 ) -/* stdcx. */ -STCX (stdcx_,MO_UQ ) - -/* stqcx. */ -static void gen_stqcx_ (DisasContext *ctx) -{ -TCGLabel *lfail; -TCGv EA , t0, t1; -TCGv cr0; -TCGv_i128 cmp, val; -int rs =rS (ctx->opcode); - -if (unlikely (rs &1 )) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); -return ; - } - - lfail =gen_new_label (); -EA =tcg_temp_new (); - cr0 =tcg_temp_new (); - -tcg_gen_mov_tl (cr0, cpu_so); -gen_set_access_type (ctx,ACCESS_RES ); -gen_addr_reg_index (ctx,EA ); -tcg_gen_brcond_tl (TCG_COND_NE ,EA , cpu_reserve, lfail); -tcg_gen_brcondi_tl (TCG_COND_NE , cpu_reserve_length,16 , lfail); - - cmp =tcg_temp_new_i128 (); - val =tcg_temp_new_i128 (); - -tcg_gen_concat_i64_i128 (cmp, cpu_reserve_val2, cpu_reserve_val); - -/* Note that the low part is always in RS+1, even in LE mode. */ -tcg_gen_concat_i64_i128 (val, cpu_gpr[rs +1 ], cpu_gpr[rs]); - -tcg_gen_atomic_cmpxchg_i128 (val, cpu_reserve, cmp, val, ctx->mem_idx, -DEF_MEMOP (MO_128 |MO_ALIGN )); - - t0 =tcg_temp_new (); - t1 =tcg_temp_new (); -tcg_gen_extr_i128_i64 (t1, t0, val); - -tcg_gen_xor_tl (t1, t1, cpu_reserve_val2); -tcg_gen_xor_tl (t0, t0, cpu_reserve_val); -tcg_gen_or_tl (t0, t0, t1); - -tcg_gen_setcondi_tl (TCG_COND_EQ , t0, t0,0 ); -tcg_gen_shli_tl (t0, t0,CRF_EQ_BIT ); -tcg_gen_or_tl (cr0, cr0, t0); - -gen_set_label (lfail); -tcg_gen_trunc_tl_i32 (cpu_crf[0 ], cr0); -tcg_gen_movi_tl (cpu_reserve,-1 ); -} -#endif /* defined(TARGET_PPC64) */ -/* wait */ static void gen_wait (DisasContext *ctx) {@@ -5923,14 +5825,9 @@ GEN_HANDLER(stswx, 0x1F, 0x15, 0x14, 0x00000001, PPC_STRING), GEN_HANDLER(isync, 0x13, 0x16, 0x04, 0x03FFF801, PPC_MEM), GEN_HANDLER_E(lwat, 0x1F, 0x06, 0x12, 0x00000001, PPC_NONE, PPC2_ISA300), GEN_HANDLER_E(stwat, 0x1F, 0x06, 0x16, 0x00000001, PPC_NONE, PPC2_ISA300), -GEN_HANDLER_E(stbcx_, 0x1F, 0x16, 0x15, 0, PPC_NONE, PPC2_ATOMIC_ISA206), -GEN_HANDLER_E(sthcx_, 0x1F, 0x16, 0x16, 0, PPC_NONE, PPC2_ATOMIC_ISA206), -GEN_HANDLER2(stwcx_, "stwcx.", 0x1F, 0x16, 0x04, 0x00000000, PPC_RES),#if defined(TARGET_PPC64 )GEN_HANDLER_E (ldat,0x1F ,0x06 ,0x13 ,0x00000001 ,PPC_NONE ,PPC2_ISA300 ),GEN_HANDLER_E (stdat,0x1F ,0x06 ,0x17 ,0x00000001 ,PPC_NONE ,PPC2_ISA300 ), -GEN_HANDLER2 (stdcx_,"stdcx." ,0x1F ,0x16 ,0x06 ,0x00000000 ,PPC_64B ), -GEN_HANDLER_E (stqcx_,0x1F ,0x16 ,0x05 ,0 ,PPC_NONE ,PPC2_LSQ_ISA207 ), #endif/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER(wait, 0x1F, 0x1E, 0x01, 0x039FF801, PPC_WAIT),target/ppc/translate/fixedpoint-impl.c.inc +84
-0@@ -204,6 +204,90 @@ TRANS64(PSTD, do_ldst_PLS_D, false, true, MO_UQ) TRANS64(STQ, do_ldst_quad, true, false); TRANS64(PSTQ, do_ldst_quad_PLS_D, true); +/* Store Conditional Instructions */ + +static bool do_store_cond(DisasContext *ctx, arg_X *a, MemOp mop) +{ + TCGLabel *lfail = gen_new_label(); + TCGv ea = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + TCGv cr0 = tcg_temp_new(); + TCGv t0 = tcg_temp_new(); + + tcg_gen_mov_tl(cr0, cpu_so); + gen_set_access_type(ctx, ACCESS_RES); + + tcg_gen_brcond_tl(TCG_COND_NE, ea, cpu_reserve, lfail); + tcg_gen_brcondi_tl(TCG_COND_NE, cpu_reserve_length, memop_size(mop), lfail); + + tcg_gen_atomic_cmpxchg_tl(t0, cpu_reserve, cpu_reserve_val, + cpu_gpr[a->rt], ctx->mem_idx, + DEF_MEMOP(mop) | MO_ALIGN); + tcg_gen_setcond_tl(TCG_COND_EQ, t0, t0, cpu_reserve_val); + tcg_gen_shli_tl(t0, t0, CRF_EQ_BIT); + tcg_gen_or_tl(cr0, cr0, t0); + + gen_set_label(lfail); + tcg_gen_trunc_tl_i32(cpu_crf[0], cr0); + tcg_gen_movi_tl(cpu_reserve, -1); + return true; +} + +TRANS_FLAGS2(ATOMIC_ISA206, STBCX, do_store_cond, MO_UB); +TRANS_FLAGS2(ATOMIC_ISA206, STHCX, do_store_cond, MO_UW); +TRANS(STWCX, do_store_cond, MO_UL); +TRANS64(STDCX, do_store_cond, MO_UQ); + +static bool trans_STQCX(DisasContext *ctx, arg_STQCX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS2(ctx, LSQ_ISA207); +#if defined(TARGET_PPC64) + TCGLabel *lfail = gen_new_label(); + TCGv ea = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + TCGv t0 = tcg_temp_new(); + TCGv t1 = tcg_temp_new(); + TCGv cr0 = tcg_temp_new(); + TCGv_i128 cmp = tcg_temp_new_i128(); + TCGv_i128 val = tcg_temp_new_i128(); + + if (unlikely(a->rt & 1)) { + gen_invalid(ctx); + return true; + } + + tcg_gen_mov_tl(cr0, cpu_so); + gen_set_access_type(ctx, ACCESS_RES); + + tcg_gen_brcond_tl(TCG_COND_NE, ea, cpu_reserve, lfail); + tcg_gen_brcondi_tl(TCG_COND_NE, cpu_reserve_length, 16, lfail); + + tcg_gen_concat_i64_i128(cmp, cpu_reserve_val2, cpu_reserve_val); + + /* Note that the low part is always in RS+1, even in LE mode. */ + tcg_gen_concat_i64_i128(val, cpu_gpr[a->rt + 1], cpu_gpr[a->rt]); + + tcg_gen_atomic_cmpxchg_i128(val, cpu_reserve, cmp, val, ctx->mem_idx, + DEF_MEMOP(MO_128 | MO_ALIGN)); + + tcg_gen_extr_i128_i64(t1, t0, val); + + tcg_gen_xor_tl(t1, t1, cpu_reserve_val2); + tcg_gen_xor_tl(t0, t0, cpu_reserve_val); + tcg_gen_or_tl(t0, t0, t1); + + tcg_gen_setcondi_tl(TCG_COND_EQ, t0, t0, 0); + tcg_gen_shli_tl(t0, t0, CRF_EQ_BIT); + tcg_gen_or_tl(cr0, cr0, t0); + + gen_set_label(lfail); + tcg_gen_trunc_tl_i32(cpu_crf[0], cr0); + tcg_gen_movi_tl(cpu_reserve, -1); +#else + qemu_build_not_reached(); +#endif + return true; +} + /* * Fixed-Point Compare Instructions */
RFC PATCH 7/28 target/ppc: convert slw, srw instruction via decode spec
In reply to Chinmay RathFrom: "Mukesh Kumar Chaurasiya (IBM)" <[email protected]>
Instructions converted:
- slw
- srw
--- target/ppc/insn32.decode | 6 +++ target/ppc/translate.c | 49 ---------------------- target/ppc/translate/fixedpoint-impl.c.inc | 48 +++++++++++++++++++++ 3 files changed, 54 insertions(+), 49 deletions(-)
target/ppc/insn32.decode +6 -0
@@ -505,6 +505,12 @@ HASHCHK 011111 ..... ..... ..... 1011110010 . @X_DW HASHSTP 011111 ..... ..... ..... 1010010010 . @X_DW HASHCHKP 011111 ..... ..... ..... 1010110010 . @X_DW +# Fixed-Point Shift Instructions + +SLW 011111 ..... ..... ..... 0000011000 . @X_rc +SRW 011111 ..... ..... ..... 1000011000 . @X_rc + + ## BCD Assist ADDG6S 011111 ..... ..... ..... - 001001010 - @X
target/ppc/translate.c +0 -49
69 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +48 -0
51 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH 8/28 target/ppc: convert sraw[i] instruction via decode spec
In reply to Chinmay RathFrom: "Mukesh Kumar Chaurasiya (IBM)" <[email protected]>
Instruction converted:
- sraw
- srawi
--- target/ppc/helper.h | 2 +- target/ppc/insn32.decode | 6 ++-- target/ppc/int_helper.c | 2 +- target/ppc/translate.c | 42 ---------------------- target/ppc/translate/fixedpoint-impl.c.inc | 41 +++++++++++++++++++++ 5 files changed, 47 insertions(+), 46 deletions(-)
target/ppc/helper.h +1 -1
@@ -65,7 +65,7 @@ DEF_HELPER_4(DIVWE, tl, env, tl, tl, i32) DEF_HELPER_FLAGS_1(POPCNTB, TCG_CALL_NO_RWG_SE, tl, tl) DEF_HELPER_FLAGS_2(CMPB, TCG_CALL_NO_RWG_SE, tl, tl, tl) -DEF_HELPER_3(sraw, tl, env, tl, tl) +DEF_HELPER_3(SRAW, tl, env, tl, tl) DEF_HELPER_FLAGS_2(CFUGED, TCG_CALL_NO_RWG_SE, i64, i64, i64) DEF_HELPER_FLAGS_2(PDEPD, TCG_CALL_NO_RWG_SE, i64, i64, i64)DEF_HELPER_FLAGS_2 (PEXTD ,TCG_CALL_NO_RWG_SE , i64, i64, i64)
target/ppc/insn32.decode +4 -2
@@ -507,8 +507,10 @@ HASHCHKP 011111 ..... ..... ..... 1010110010 . @X_DW # Fixed-Point Shift Instructions -SLW 011111 ..... ..... ..... 0000011000 . @X_rc -SRW 011111 ..... ..... ..... 1000011000 . @X_rc +SLW 011111 ..... ..... ..... 0000011000 . @X_rc +SRAW 011111 ..... ..... ..... 1100011000 . @X_rc +SRAWI 011111 ..... ..... ..... 1100111000 . @X_rc +SRW 011111 ..... ..... ..... 1000011000 . @X_rc ## BCD Assist
target/ppc/int_helper.c +1 -1
@@ -235,7 +235,7 @@ target_ulong helper_CMPB(target_ulong rs, target_ulong rb) }/* shift right arithmetic helper */ -target_ulong helper_sraw (CPUPPCState *env,target_ulong value, +target_ulong helper_SRAW (CPUPPCState *env,target_ulong value,target_ulong shift) {int32_t ret;
target/ppc/translate.c +0 -42
54 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +41 -0
44 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH 9/28 target/ppc : Convert mcrf to decode tree
In reply to Chinmay RathFrom: Shivani Nittor <[email protected]>
Convert mcrf to decode tree specification.The functionality was tested by comparing the qemu -D log -d op,in_asm output as well as single stepping gdb.
--- target/ppc/insn32.decode | 6 ++++++ target/ppc/translate.c | 7 ------- target/ppc/translate/misc-impl.c.inc | 6 ++++++ 3 files changed, 12 insertions(+), 7 deletions(-)
target/ppc/insn32.decode +6 -0
@@ -1445,6 +1445,12 @@ MSGSYNC 011111 ----- ----- ----- 1101110110 - SYNC 011111 -- ... --- .. ----- 1001010110 - @X_sync EIEIO 011111 ----- ----- ----- 1101010110 - +# Condition Register Field Instruction + +&XL_bfa bf bfa +@XL_bfa ...... bf:3 .. bfa:3 .. ..... ..... ..... . +MCRF 010011 ... -- ... -- ----- 00000 00000 - @XL_bfa + # Branch History Rolling Buffer (BHRB) Instructions &XFX_bhrbe rt bhrbe
target/ppc/translate.c +0 -7
@@ -3642,12 +3642,6 @@ GEN_CRLOGIC(crorc, tcg_gen_orc_i32, 0x0D);/* crxor */ GEN_CRLOGIC (crxor, tcg_gen_xor_i32,0x06 ); -/* mcrf */ -static void gen_mcrf (DisasContext *ctx) -{ -tcg_gen_mov_i32 (cpu_crf[crfD (ctx->opcode)], cpu_crf[crfS (ctx->opcode)]); -} -/*** System linkage ***/ /* rfi (supervisor only) */
@@ -5746,7 +5740,6 @@ GEN_HANDLER(bc, 0x10, 0xFF, 0xFF, 0x00000000, PPC_FLOW), GEN_HANDLER(bcctr, 0x13, 0x10, 0x10, 0x00000000, PPC_FLOW), GEN_HANDLER(bclr, 0x13, 0x10, 0x00, 0x00000000, PPC_FLOW), GEN_HANDLER_E(bctar, 0x13, 0x10, 0x11, 0x0000E000, PPC_NONE, PPC2_BCTAR_ISA207), -GEN_HANDLER(mcrf, 0x13, 0x00, 0xFF, 0x00000001, PPC_INTEGER), GEN_HANDLER(rfi, 0x13, 0x12, 0x01, 0x03FF8001, PPC_FLOW),#if defined(TARGET_PPC64 ) GEN_HANDLER(rfid, 0x13, 0x12, 0x00, 0x03FF8001, PPC_64B),
target/ppc/translate/misc-impl.c.inc +6 -0
@@ -155,3 +155,9 @@ static bool trans_ATTN(DisasContext *ctx, arg_ATTN *a) return false; #endif } + +static bool trans_MCRF(DisasContext *ctx, arg_MCRF *a) +{ + tcg_gen_mov_i32(cpu_crf[a->bf], cpu_crf[a->bfa]); + return true; +}
Signature · 1 line
2.53.0
Re: [RFC PATCH 09/28] target/ppc : Convert mcrf to decode tree
Quoted 9 lines · Chinmay Rath
From: Shivani Nittor <[email protected]>
Convert mcrf to decode tree specification.The functionality was tested by comparing the qemu -D log -d op,in_asm output as well as single stepping gdb.
Signed-off-by Shivani Nittor <[email protected]>Signed-off-by Chinmay Rath <[email protected]>
Hi Shivani,
It would be good if you can change the ':' in the commit message.
ill list down the before/after.
target/ppc : Convert mcrf to decode tree
target/ppc: Convert mcrf to decode tree
Patch LGTM.
~Shivang.
RFC PATCH 10/28 target/ppc: Move fixed-point Shift insns to decodetree
In reply to Chinmay RathFrom: Amit Machhiwal <[email protected]>
Move the below instructions to decodetree specification:
s{r,l}d, and srad[i] : X-form
The changes were verified by validating that the TCG ops generated by these instructions remain the same after these changes. The TCG micro-ops were captured with the '-d op,in_asm' QEMU flag.
Move all shift insntructions to one place in insn32.decode
--- target/ppc/helper.h | 2 +- target/ppc/insn32.decode | 11 ++- target/ppc/int_helper.c | 2 +- target/ppc/translate.c | 96 ---------------------- target/ppc/translate/fixedpoint-impl.c.inc | 72 ++++++++++++++++ 5 files changed, 81 insertions(+), 102 deletions(-)
target/ppc/helper.h +1 -1
@@ -75,7 +75,7 @@ DEF_HELPER_FLAGS_1(CBCDTD, TCG_CALL_NO_RWG_SE, tl, tl) DEF_HELPER_FLAGS_2(CMPEQB, TCG_CALL_NO_RWG_SE, i32, tl, tl) DEF_HELPER_FLAGS_1(POPCNTW, TCG_CALL_NO_RWG_SE, tl, tl) DEF_HELPER_FLAGS_2(BPERMD, TCG_CALL_NO_RWG_SE, i64, i64, i64) -DEF_HELPER_3(srad, tl, env, tl, tl) +DEF_HELPER_3(SRAD, tl, env, tl, tl) DEF_HELPER_FLAGS_0(DARN32, TCG_CALL_NO_RWG, tl) DEF_HELPER_FLAGS_0(DARN64, TCG_CALL_NO_RWG, tl)#endif
target/ppc/insn32.decode +7 -4
@@ -119,7 +119,7 @@ # XS-form with fractured shift amount %xs_sh 1:1 11:5 -&XS rs ra sh rc +&XS rs ra sh rc:bool @XS ...... rs:5 ra:5 ..... ......... . rc:1 &XS sh=%xs_sh %x_frtp 22:4 !function=times_2
@@ -512,6 +512,12 @@ SRAW 011111 ..... ..... ..... 1100011000 . @X_rc SRAWI 011111 ..... ..... ..... 1100111000 . @X_rc SRW 011111 ..... ..... ..... 1000011000 . @X_rc +SLD 011111 ..... ..... ..... 0000011011 . @X_rc +SRD 011111 ..... ..... ..... 1000011011 . @X_rc +SRAD 011111 ..... ..... ..... 1100011010 . @X_rc +SRADI 011111 ..... ..... ..... 110011101 . . @XS + +EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS ## BCD Assist
@@ -1372,9 +1378,6 @@ DST 011111 ..... ..... ..... 0101010110 - @X DSTST 011111 ..... ..... ..... 0101110110 - @X DSS 011111 ..... ..... ..... 1100110110 - @X -##Extend Sign Word and Shift Left Immediate XS-form -EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS - ## Load and Reserve Instructions LBARX 011111 ..... ..... ..... 0000110100 . @X_rc LHARX 011111 ..... ..... ..... 0001110100 . @X_rc
target/ppc/int_helper.c +1 -1
@@ -261,7 +261,7 @@ target_ulong helper_SRAW(CPUPPCState *env, target_ulong value, }#if defined(TARGET_PPC64 ) -target_ulong helper_srad (CPUPPCState *env,target_ulong value, +target_ulong helper_SRAD (CPUPPCState *env,target_ulong value,target_ulong shift) {int64_t ret;
target/ppc/translate.c +0 -96
108 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +72 -0
84 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH 11/28 target/ppc: Move fixed-point byte-reversal store insns to decodetree
In reply to Chinmay RathFrom: Amit Machhiwal <[email protected]>
Move the below PPC instructions to decodetree specification:
st{d,h,w}brx, st{d,w,h,b}cix : X-form
The changes were verified by validating that the TCG micro-ops generated by those insns remain the same. These TCG micro-ops were captured with the -d op,in_asm QEMU flag.
Additionally, remove GEN_TX and GEN_STX_E macros as they are no longer used anywhere else.
--- target/ppc/insn32.decode | 8 +++ target/ppc/translate.c | 52 +++----------- target/ppc/translate/fixedpoint-impl.c.inc | 79 ++++++++++++++++++++++ 3 files changed, 95 insertions(+), 44 deletions(-)
target/ppc/insn32.decode +8 -0
@@ -372,6 +372,14 @@ STVDX 011111 ..... ..... ..... 0010010001 - @X STSKU 111110 ..... ..... ............. 0 11 @DD STCXU 111110 ..... ..... ............. 1 11 @DD +STDBRX 011111 ..... ..... ..... 1010010100 - @X +STDCIX 011111 ..... ..... ..... 1111110101 - @X +STWCIX 011111 ..... ..... ..... 1110010101 - @X +STHCIX 011111 ..... ..... ..... 1110110101 - @X +STBCIX 011111 ..... ..... ..... 1111010101 - @X +STHBRX 011111 ..... ..... ..... 1110010110 - @X +STWBRX 011111 ..... ..... ..... 1010010110 - @X + ### Fixed-Point Compare Instructions CMP 011111 ... - . ..... ..... 0000000000 - @X_bfl
target/ppc/translate.c +8 -44
87 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +79 -0
85 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [RFC PATCH 11/28] target/ppc: Move fixed-point byte-reversal store insns to decodetree
Quoted 15 lines · Chinmay Rath
target/ppc/insn32.decode +0
-0@@ -372,6 +372,14 @@ STVDX 011111 ..... ..... .....0010010001 - @X
STSKU 111110 ..... ..... ............. 0 11 @DD STCXU 111110 ..... ..... ............. 1 11 @DDtarget/ppc/insn32.decode +8
-0+STDBRX 011111 ..... ..... ..... 1010010100 - @X +STDCIX 011111 ..... ..... ..... 1111110101 - @X +STWCIX 011111 ..... ..... ..... 1110010101 - @X +STHCIX 011111 ..... ..... ..... 1110110101 - @X +STBCIX 011111 ..... ..... ..... 1111010101 - @X +STHBRX 011111 ..... ..... ..... 1110010110 - @X +STWBRX 011111 ..... ..... ..... 1010010110 - @X +
Quoted 2 lines
### Fixed-Point Compare Instructions
Hi Amit,
It would be good to align the instruction format with the other
instructions currently it looks little odd.
Otherwise LGTM.
~Shivang.
Re: [RFC PATCH 11/28] target/ppc: Move fixed-point byte-reversal store insns to decodetree
Hi Shivang,
Thanks for taking a look. Please find my response inline.
Quoted 14 lines · Shivang Upadhyay
Quoted 13 lines · Chinmay Rath
target/ppc/insn32.decode +0
-0@@ -372,6 +372,14 @@ STVDX 011111 ..... ..... .....0010010001 - @X
STSKU 111110 ..... ..... ............. 0 11 @DD STCXU 111110 ..... ..... ............. 1 11 @DDtarget/ppc/insn32.decode +6
-0+STDBRX 011111 ..... ..... ..... 1010010100 - @X +STDCIX 011111 ..... ..... ..... 1111110101 - @X +STWCIX 011111 ..... ..... ..... 1110010101 - @X +STHCIX 011111 ..... ..... ..... 1110110101 - @X +STBCIX 011111 ..... ..... ..... 1111010101 - @X +STHBRX 011111 ..... ..... ..... 1110010110 - @X
Quoted 8 lines
Quoted 4 lines
target/ppc/insn32.decode +2
-0+STWBRX 011111 ..... ..... ..... 1010010110 - @X +### Fixed-Point Compare Instructions
Hi Amit,
It would be good to align the instruction format with the other
instructions currently it looks little odd.
Looks like the patch got re-formatted while applying somehow. Will check with Chinmay on this and get this fixed.
~Amit
Quoted 4 lines
Otherwise LGTM.
~Shivang.
Re: [RFC PATCH 11/28] target/ppc: Move fixed-point byte-reversal store insns to decodetree
In reply to Chinmay RathThe commit message mentions removing the |GEN_TX| macro, but it's likely a typo for |GEN_STX|. Rest the patch looks fine to me.
|
|Thanks,
~ Nikhil
Quoted 227 lines · Chinmay Rath
From: Amit Machhiwal<[email protected]>
Move the below PPC instructions to decodetree specification:
st{d,h,w}brx, st{d,w,h,b}cix : X-formThe changes were verified by validating that the TCG micro-ops generated by those insns remain the same. These TCG micro-ops were captured with the
-d op,in_asmQEMU flag.Additionally, remove
GEN_TXandGEN_STX_Emacros as they are no longer used anywhere else.Signed-off-by Amit Machhiwal<[email protected]>Signed-off-by Chinmay Rath<[email protected]>[cr: ppc32 build fix, EA calc fix]--- target/ppc/insn32.decode | 8 +++ target/ppc/translate.c | 52 +++----------- target/ppc/translate/fixedpoint-impl.c.inc | 79 ++++++++++++++++++++++ 3 files changed, 95 insertions(+), 44 deletions(-)target/ppc/insn32.decode +8
-0@@ -372,6 +372,14 @@ STVDX 011111 ..... ..... ..... 0010010001 - @X STSKU 111110 ..... ..... ............. 0 11 @DD STCXU 111110 ..... ..... ............. 1 11 @DD +STDBRX 011111 ..... ..... ..... 1010010100 - @X +STDCIX 011111 ..... ..... ..... 1111110101 - @X +STWCIX 011111 ..... ..... ..... 1110010101 - @X +STHCIX 011111 ..... ..... ..... 1110110101 - @X +STBCIX 011111 ..... ..... ..... 1111010101 - @X +STHBRX 011111 ..... ..... ..... 1110010110 - @X +STWBRX 011111 ..... ..... ..... 1010010110 - @X + ### Fixed-Point Compare Instructions CMP 011111 ... - . ..... ..... 0000000000 - @X_bfltarget/ppc/translate.c +8
-44@@ -2529,23 +2529,6 @@ GEN_LDX_HVRM(lhzcix, ld16u, 0x15, 0x19, PPC_CILDST) GEN_LDX_HVRM(lbzcix, ld8u, 0x15, 0x1a, PPC_CILDST)#endif -/*** Integer store ***/ -#define GEN_STX_E (name, stop, opc2, opc3, type, type2, chk) \ -static void glue(gen_, name##x)(DisasContext *ctx) \ -{ \ - TCGv EA; \ - chk(ctx); \ - gen_set_access_type(ctx, ACCESS_INT); \ - EA = tcg_temp_new(); \ - gen_addr_reg_index(ctx, EA); \ - gen_qemu_##stop(ctx, cpu_gpr[rS(ctx->opcode)], EA); \ -} -#define GEN_STX (name, stop, opc2, opc3, type) \ - GEN_STX_E(name, stop, opc2, opc3, type, PPC_NONE, CHK_NONE) - -#define GEN_STX_HVRM (name, stop, opc2, opc3, type) \ - GEN_STX_E(name, stop, opc2, opc3, type, PPC_NONE, CHK_HVRM) -#define GEN_STEPX (name, stop, opc2, opc3) \ static void glue(gen_, name##epx)(DisasContext *ctx) \ { \@@ -2565,12 +2548,6 @@ GEN_STEPX(stw, DEF_MEMOP(MO_UL), 0x1F, 0x04) GEN_STEPX(std, DEF_MEMOP(MO_UQ), 0x1d, 0x04)#endif -#if defined(TARGET_PPC64 ) -GEN_STX_HVRM(stdcix, st64_i64, 0x15, 0x1f, PPC_CILDST) -GEN_STX_HVRM(stwcix, st32, 0x15, 0x1c, PPC_CILDST) -GEN_STX_HVRM(sthcix, st16, 0x15, 0x1d, PPC_CILDST) -GEN_STX_HVRM(stbcix, st8, 0x15, 0x1e, PPC_CILDST) -#endif /*** Integer load and store with byte reverse ***/ /* lhbrx */ @@ -2582,15 +2559,8 @@ GEN_LDX(lwbr, ld32ur, 0x16, 0x10, PPC_INTEGER);#if defined(TARGET_PPC64 )/* ldbrx */ GEN_LDX_E (ldbr, ld64ur_i64,0x14 ,0x10 ,PPC_NONE ,PPC2_DBRX ,CHK_NONE ); -/* stdbrx */ -GEN_STX_E (stdbr, st64r_i64,0x14 ,0x14 ,PPC_NONE ,PPC2_DBRX ,CHK_NONE );#endif /* TARGET_PPC64 */ -/* sthbrx */ -GEN_STX (sthbr, st16r,0x16 ,0x1C ,PPC_INTEGER ); -/* stwbrx */ -GEN_STX (stwbr, st32r,0x16 ,0x14 ,PPC_INTEGER ); -/*** Integer load and store multiple ***/ /* lmw */ @@ -5117,9 +5087,17 @@ static int64_t dw_compose_ea(DisasContext *ctx, int x) return true; \ } \ } while (0) +#define REQUIRE_HVRM (CTX ) \ + do { \ + if (unlikely(ctx->pr || !ctx->hv || ctx->dr)) { \ + gen_priv_opc(CTX); \ + return true; \ + } \ + } while (0)#else #define REQUIRE_SV (CTX ) do { gen_priv_opc(CTX); return true; } while (0)#define REQUIRE_HV (CTX ) do { gen_priv_opc(CTX); return true; } while (0) +#define REQUIRE_HVRM (CTX ) do { gen_priv_opc(CTX); return true; } while (0)#endif /* @@ -5791,20 +5769,6 @@ GEN_LDEPX(lw, DEF_MEMOP(MO_UL), 0x1F, 0x00) GEN_LDEPX(ld, DEF_MEMOP(MO_UQ), 0x1D, 0x00)#endif -#undef GEN_STX_E -#define GEN_STX_E (name, stop, opc2, opc3, type, type2, chk) \ -GEN_HANDLER_E(name##x, 0x1F, opc2, opc3, 0x00000000, type, type2), - -#if defined(TARGET_PPC64 ) -GEN_STX_E(stdbr, st64r_i64, 0x14, 0x14, PPC_NONE, PPC2_DBRX, CHK_NONE) -GEN_STX_HVRM(stdcix, st64_i64, 0x15, 0x1f, PPC_CILDST) -GEN_STX_HVRM(stwcix, st32, 0x15, 0x1c, PPC_CILDST) -GEN_STX_HVRM(sthcix, st16, 0x15, 0x1d, PPC_CILDST) -GEN_STX_HVRM(stbcix, st8, 0x15, 0x1e, PPC_CILDST) -#endif -GEN_STX(sthbr, st16r, 0x16, 0x1C, PPC_INTEGER) -GEN_STX(stwbr, st32r, 0x16, 0x14, PPC_INTEGER) -#undef GEN_STEPX#define GEN_STEPX (name, ldop, opc2, opc3) \ GEN_HANDLER_E(name##epx, 0x1F, opc2, opc3, \target/ppc/translate/fixedpoint-impl.c.inc +79
-0@@ -566,6 +566,85 @@ TRANS(ADDIC_, do_add_D, false, true, false, true); TRANS(SLD, do_shift_X_rc, tcg_gen_shl_tl); TRANS(SRD, do_shift_X_rc, tcg_gen_shr_tl); +static bool do_stxx(DisasContext *ctx, arg_X *a, + void(*op)(DisasContext *, TCGv, TCGv), bool is_hvrm) +{ + TCGv ea; + + if (is_hvrm) { + REQUIRE_HVRM(ctx); + } + + gen_set_access_type(ctx, ACCESS_INT); + ea = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + op(ctx, cpu_gpr[a->rt], ea); + + return true; +} + +TRANS(STHBRX, do_stxx, gen_qemu_st16r, 0); +TRANS(STWBRX, do_stxx, gen_qemu_st32r, 0); + +static bool trans_STDBRX(DisasContext *ctx, arg_STDBRX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS2(ctx, DBRX); +#if defined(TARGET_PPC64) + return do_stxx(ctx, a, gen_qemu_st64r_i64, false); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_STDCIX(DisasContext *ctx, arg_STDCIX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS(ctx, CILDST); +#if defined(TARGET_PPC64) + return do_stxx(ctx, a, gen_qemu_st64_i64, true); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_STWCIX(DisasContext *ctx, arg_STWCIX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS(ctx, CILDST); +#if defined(TARGET_PPC64) + return do_stxx(ctx, a, gen_qemu_st32, true); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_STHCIX(DisasContext *ctx, arg_STHCIX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS(ctx, CILDST); +#if defined(TARGET_PPC64) + return do_stxx(ctx, a, gen_qemu_st16, true); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_STBCIX(DisasContext *ctx, arg_STBCIX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS(ctx, CILDST); +#if defined(TARGET_PPC64) + return do_stxx(ctx, a, gen_qemu_st8, true); +#else + qemu_build_not_reached(); +#endif + return true; +} + static bool trans_SUBFIC(DisasContext *ctx, arg_D *a) { gen_op_arith_subf(ctx, cpu_gpr[a->rt], cpu_gpr[a->ra],
Re: [RFC PATCH 11/28] target/ppc: Move fixed-point byte-reversal store insns to decodetree
Quoted 2 lines · Nikhil Kumar Singh
The commit message mentions removing the |GEN_TX| macro, but it's likely a typo for |GEN_STX|.
Yes, thats a typo. Will fix this.
~Amit
Quoted 223 lines
Rest the patch looks fine to me.
|
|Thanks,
~ NikhilQuoted 217 lines · Chinmay Rath
From: Amit Machhiwal<[email protected]>
Move the below PPC instructions to decodetree specification:
st{d,h,w}brx, st{d,w,h,b}cix : X-formThe changes were verified by validating that the TCG micro-ops generated by those insns remain the same. These TCG micro-ops were captured with the
-d op,in_asmQEMU flag.Additionally, remove
GEN_TXandGEN_STX_Emacros as they are no longer used anywhere else.Signed-off-by Amit Machhiwal<[email protected]>Signed-off-by Chinmay Rath<[email protected]>[cr: ppc32 build fix, EA calc fix]--- target/ppc/insn32.decode | 8 +++ target/ppc/translate.c | 52 +++----------- target/ppc/translate/fixedpoint-impl.c.inc | 79 ++++++++++++++++++++++ 3 files changed, 95 insertions(+), 44 deletions(-)target/ppc/insn32.decode +8
-0@@ -372,6 +372,14 @@ STVDX 011111 ..... ..... ..... 0010010001 - @X STSKU 111110 ..... ..... ............. 0 11 @DD STCXU 111110 ..... ..... ............. 1 11 @DD +STDBRX 011111 ..... ..... ..... 1010010100 - @X +STDCIX 011111 ..... ..... ..... 1111110101 - @X +STWCIX 011111 ..... ..... ..... 1110010101 - @X +STHCIX 011111 ..... ..... ..... 1110110101 - @X +STBCIX 011111 ..... ..... ..... 1111010101 - @X +STHBRX 011111 ..... ..... ..... 1110010110 - @X +STWBRX 011111 ..... ..... ..... 1010010110 - @X + ### Fixed-Point Compare Instructions CMP 011111 ... - . ..... ..... 0000000000 - @X_bfltarget/ppc/translate.c +8
-44@@ -2529,23 +2529,6 @@ GEN_LDX_HVRM(lhzcix, ld16u, 0x15, 0x19, PPC_CILDST) GEN_LDX_HVRM(lbzcix, ld8u, 0x15, 0x1a, PPC_CILDST)#endif -/*** Integer store ***/ -#define GEN_STX_E (name, stop, opc2, opc3, type, type2, chk) \ -static void glue(gen_, name##x)(DisasContext *ctx) \ -{ \ - TCGv EA; \ - chk(ctx); \ - gen_set_access_type(ctx, ACCESS_INT); \ - EA = tcg_temp_new(); \ - gen_addr_reg_index(ctx, EA); \ - gen_qemu_##stop(ctx, cpu_gpr[rS(ctx->opcode)], EA); \ -} -#define GEN_STX (name, stop, opc2, opc3, type) \ - GEN_STX_E(name, stop, opc2, opc3, type, PPC_NONE, CHK_NONE) - -#define GEN_STX_HVRM (name, stop, opc2, opc3, type) \ - GEN_STX_E(name, stop, opc2, opc3, type, PPC_NONE, CHK_HVRM) -#define GEN_STEPX (name, stop, opc2, opc3) \ static void glue(gen_, name##epx)(DisasContext *ctx) \ { \@@ -2565,12 +2548,6 @@ GEN_STEPX(stw, DEF_MEMOP(MO_UL), 0x1F, 0x04) GEN_STEPX(std, DEF_MEMOP(MO_UQ), 0x1d, 0x04)#endif -#if defined(TARGET_PPC64 ) -GEN_STX_HVRM(stdcix, st64_i64, 0x15, 0x1f, PPC_CILDST) -GEN_STX_HVRM(stwcix, st32, 0x15, 0x1c, PPC_CILDST) -GEN_STX_HVRM(sthcix, st16, 0x15, 0x1d, PPC_CILDST) -GEN_STX_HVRM(stbcix, st8, 0x15, 0x1e, PPC_CILDST) -#endif /*** Integer load and store with byte reverse ***/ /* lhbrx */ @@ -2582,15 +2559,8 @@ GEN_LDX(lwbr, ld32ur, 0x16, 0x10, PPC_INTEGER);#if defined(TARGET_PPC64 )/* ldbrx */ GEN_LDX_E (ldbr, ld64ur_i64,0x14 ,0x10 ,PPC_NONE ,PPC2_DBRX ,CHK_NONE ); -/* stdbrx */ -GEN_STX_E (stdbr, st64r_i64,0x14 ,0x14 ,PPC_NONE ,PPC2_DBRX ,CHK_NONE );#endif /* TARGET_PPC64 */ -/* sthbrx */ -GEN_STX (sthbr, st16r,0x16 ,0x1C ,PPC_INTEGER ); -/* stwbrx */ -GEN_STX (stwbr, st32r,0x16 ,0x14 ,PPC_INTEGER ); -/*** Integer load and store multiple ***/ /* lmw */ @@ -5117,9 +5087,17 @@ static int64_t dw_compose_ea(DisasContext *ctx, int x) return true; \ } \ } while (0) +#define REQUIRE_HVRM (CTX ) \ + do { \ + if (unlikely(ctx->pr || !ctx->hv || ctx->dr)) { \ + gen_priv_opc(CTX); \ + return true; \ + } \ + } while (0)#else #define REQUIRE_SV (CTX ) do { gen_priv_opc(CTX); return true; } while (0)#define REQUIRE_HV (CTX ) do { gen_priv_opc(CTX); return true; } while (0) +#define REQUIRE_HVRM (CTX ) do { gen_priv_opc(CTX); return true; } while (0)#endif /* @@ -5791,20 +5769,6 @@ GEN_LDEPX(lw, DEF_MEMOP(MO_UL), 0x1F, 0x00) GEN_LDEPX(ld, DEF_MEMOP(MO_UQ), 0x1D, 0x00)#endif -#undef GEN_STX_E -#define GEN_STX_E (name, stop, opc2, opc3, type, type2, chk) \ -GEN_HANDLER_E(name##x, 0x1F, opc2, opc3, 0x00000000, type, type2), - -#if defined(TARGET_PPC64 ) -GEN_STX_E(stdbr, st64r_i64, 0x14, 0x14, PPC_NONE, PPC2_DBRX, CHK_NONE) -GEN_STX_HVRM(stdcix, st64_i64, 0x15, 0x1f, PPC_CILDST) -GEN_STX_HVRM(stwcix, st32, 0x15, 0x1c, PPC_CILDST) -GEN_STX_HVRM(sthcix, st16, 0x15, 0x1d, PPC_CILDST) -GEN_STX_HVRM(stbcix, st8, 0x15, 0x1e, PPC_CILDST) -#endif -GEN_STX(sthbr, st16r, 0x16, 0x1C, PPC_INTEGER) -GEN_STX(stwbr, st32r, 0x16, 0x14, PPC_INTEGER) -#undef GEN_STEPX#define GEN_STEPX (name, ldop, opc2, opc3) \ GEN_HANDLER_E(name##epx, 0x1F, opc2, opc3, \target/ppc/translate/fixedpoint-impl.c.inc +79
-0@@ -566,6 +566,85 @@ TRANS(ADDIC_, do_add_D, false, true, false, true); TRANS(SLD, do_shift_X_rc, tcg_gen_shl_tl); TRANS(SRD, do_shift_X_rc, tcg_gen_shr_tl); +static bool do_stxx(DisasContext *ctx, arg_X *a, + void(*op)(DisasContext *, TCGv, TCGv), bool is_hvrm) +{ + TCGv ea; + + if (is_hvrm) { + REQUIRE_HVRM(ctx); + } + + gen_set_access_type(ctx, ACCESS_INT); + ea = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]); + op(ctx, cpu_gpr[a->rt], ea); + + return true; +} + +TRANS(STHBRX, do_stxx, gen_qemu_st16r, 0); +TRANS(STWBRX, do_stxx, gen_qemu_st32r, 0); + +static bool trans_STDBRX(DisasContext *ctx, arg_STDBRX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS2(ctx, DBRX); +#if defined(TARGET_PPC64) + return do_stxx(ctx, a, gen_qemu_st64r_i64, false); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_STDCIX(DisasContext *ctx, arg_STDCIX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS(ctx, CILDST); +#if defined(TARGET_PPC64) + return do_stxx(ctx, a, gen_qemu_st64_i64, true); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_STWCIX(DisasContext *ctx, arg_STWCIX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS(ctx, CILDST); +#if defined(TARGET_PPC64) + return do_stxx(ctx, a, gen_qemu_st32, true); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_STHCIX(DisasContext *ctx, arg_STHCIX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS(ctx, CILDST); +#if defined(TARGET_PPC64) + return do_stxx(ctx, a, gen_qemu_st16, true); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_STBCIX(DisasContext *ctx, arg_STBCIX *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS(ctx, CILDST); +#if defined(TARGET_PPC64) + return do_stxx(ctx, a, gen_qemu_st8, true); +#else + qemu_build_not_reached(); +#endif + return true; +} + static bool trans_SUBFIC(DisasContext *ctx, arg_D *a) { gen_op_arith_subf(ctx, cpu_gpr[a->rt], cpu_gpr[a->ra],
RFC PATCH 12/28 target/ppc: Move GPR atomic load/store instructions to decodetree
In reply to Chinmay RathFrom: Aboorva Devarajan <[email protected]>
Move below instructions to decodetree specification:
lwat, stwat : X-form (word atomic, ISA 3.0)
ldat, stdat : X-form (doubleword atomic, ISA 3.0)
The legacy gen_ld_atomic()/gen_st_atomic() functions that read register fields and the function code from ctx->opcode are replaced by new do_ld_atomic()/do_st_atomic() helpers in fixedpoint-impl.c.inc that use the pre-extracted decodetree argument fields (a->rt, a->ra, a->rb) directly. The RB field carries the Function Code (FC) selecting the atomic operation.
gen_fetch_inc_conditional() is similarly moved and refactored to accept the destination register number as an explicit parameter instead of extracting it from ctx->opcode.
Checked with '-d in_asm,op'. The printed TCG ops may differ from the pre-refactor log because EA now uses do_ea_calc(ctx, ra, 0), which lowers as GPR[ra] + 0 (then narrow in 32-bit mode) instead of mov/ext32u from ra alone.
--- target/ppc/insn32.decode | 7 + target/ppc/translate.c | 212 -------------------- target/ppc/translate/fixedpoint-impl.c.inc | 215 +++++++++++++++++++++ 3 files changed, 222 insertions(+), 212 deletions(-)
target/ppc/insn32.decode +7 -0
@@ -343,6 +343,13 @@ LSKU 111010 ..... ..... ............. 0 11 @DD LCXU 111010 ..... ..... ............. 1 11 @DD +### Fixed-Point Atomic Load/Store Instructions + +LWAT 011111 ..... ..... ..... 1001000110 - @X +STWAT 011111 ..... ..... ..... 1011000110 - @X +LDAT 011111 ..... ..... ..... 1001100110 - @X +STDAT 011111 ..... ..... ..... 1011100110 - @X + ### Fixed-Point Store Instructions STB 100110 ..... ..... ................ @D
target/ppc/translate.c +0 -212
224 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +215 -0
218 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [RFC PATCH 12/28] target/ppc: Move GPR atomic load/store instructions to decodetree
Thanks,
~ Nikhil
Quoted 502 lines · Chinmay Rath
From: Aboorva Devarajan <[email protected]>
Move below instructions to decodetree specification:
lwat, stwat : X-form (word atomic, ISA 3.0)
ldat, stdat : X-form (doubleword atomic, ISA 3.0)The legacy gen_ld_atomic()/gen_st_atomic() functions that read register fields and the function code from
ctx->opcodeare replaced by new do_ld_atomic()/do_st_atomic() helpers in fixedpoint-impl.c.inc that use the pre-extracted decodetree argument fields (a->rt,a->ra,a->rb) directly. The RB field carries the Function Code (FC) selecting the atomic operation.
gen_fetch_inc_conditional()is similarly moved and refactored to accept the destination register number as an explicit parameter instead of extracting it fromctx->opcode.Checked with '-d in_asm,op'. The printed TCG ops may differ from the pre-refactor log because EA now uses
do_ea_calc(ctx, ra, 0), which lowers as GPR[ra] + 0 (then narrow in 32-bit mode) instead of mov/ext32u from ra alone.Signed-off-by Aboorva Devarajan <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/insn32.decode | 7 + target/ppc/translate.c | 212 -------------------- target/ppc/translate/fixedpoint-impl.c.inc | 215 +++++++++++++++++++++ 3 files changed, 222 insertions(+), 212 deletions(-)target/ppc/insn32.decode +7
-0@@ -343,6 +343,13 @@ LSKU 111010 ..... ..... ............. 0 11 @DD LCXU 111010 ..... ..... ............. 1 11 @DD +### Fixed-Point Atomic Load/Store Instructions + +LWAT 011111 ..... ..... ..... 1001000110 - @X +STWAT 011111 ..... ..... ..... 1011000110 - @X +LDAT 011111 ..... ..... ..... 1001100110 - @X +STDAT 011111 ..... ..... ..... 1011100110 - @X + ### Fixed-Point Store Instructions STB 100110 ..... ..... ................ @Dtarget/ppc/translate.c +0
-212@@ -2741,212 +2741,6 @@ static void gen_isync(DisasContext *ctx) ctx->base.is_jmp =DISAS_EXIT_UPDATE ; } -static void gen_fetch_inc_conditional (DisasContext *ctx,MemOp memop, -TCGv EA ,TCGCond cond,int addend) -{ -TCGv t =tcg_temp_new (); -TCGv t2 =tcg_temp_new (); -TCGv u =tcg_temp_new (); - -tcg_gen_qemu_ld_tl (t,EA , ctx->mem_idx, memop); -tcg_gen_addi_tl (t2,EA ,memop_size (memop)); -tcg_gen_qemu_ld_tl (t2, t2, ctx->mem_idx, memop); -tcg_gen_addi_tl (u, t, addend); - -/* E.g. for fetch and increment bounded... */ -/* mem(EA,s) = (t != t2 ? u = t + 1 : t) */ -tcg_gen_movcond_tl (cond, u, t, t2, u, t); -tcg_gen_qemu_st_tl (u,EA , ctx->mem_idx, memop); - -/* RT = (t != t2 ? t : u = 1<<(s*8-1)) */ -tcg_gen_movcond_tl (cond, cpu_gpr[rD (ctx->opcode)], t, t2, t, -tcg_constant_tl (1 << (memop_size (memop) *8 -1 ))); -} - -static void gen_ld_atomic (DisasContext *ctx,MemOp memop) -{ -uint32_t gpr_FC =FC (ctx->opcode); -TCGv EA =tcg_temp_new (); -int rt =rD (ctx->opcode); -bool need_serial; -TCGv src, dst; - -gen_addr_register (ctx,EA ); - dst = cpu_gpr[rt]; - src = cpu_gpr[(rt +1 ) &31 ]; - - need_serial = false; - memop |=MO_ALIGN ; -switch (gpr_FC) { -case 0 :/* Fetch and add */ -tcg_gen_atomic_fetch_add_tl (dst,EA , src, ctx->mem_idx, memop); -break ; -case 1 :/* Fetch and xor */ -tcg_gen_atomic_fetch_xor_tl (dst,EA , src, ctx->mem_idx, memop); -break ; -case 2 :/* Fetch and or */ -tcg_gen_atomic_fetch_or_tl (dst,EA , src, ctx->mem_idx, memop); -break ; -case 3 :/* Fetch and 'and' */ -tcg_gen_atomic_fetch_and_tl (dst,EA , src, ctx->mem_idx, memop); -break ; -case 4 :/* Fetch and max unsigned */ -tcg_gen_atomic_fetch_umax_tl (dst,EA , src, ctx->mem_idx, memop); -break ; -case 5 :/* Fetch and max signed */ -tcg_gen_atomic_fetch_smax_tl (dst,EA , src, ctx->mem_idx, memop); -break ; -case 6 :/* Fetch and min unsigned */ -tcg_gen_atomic_fetch_umin_tl (dst,EA , src, ctx->mem_idx, memop); -break ; -case 7 :/* Fetch and min signed */ -tcg_gen_atomic_fetch_smin_tl (dst,EA , src, ctx->mem_idx, memop); -break ; -case 8 :/* Swap */ -tcg_gen_atomic_xchg_tl (dst,EA , src, ctx->mem_idx, memop); -break ; - -case 16 :/* Compare and swap not equal */ -if (tb_cflags (ctx->base.tb) &CF_PARALLEL ) { - need_serial = true; - }else { -TCGv t0 =tcg_temp_new (); -TCGv t1 =tcg_temp_new (); - -tcg_gen_qemu_ld_tl (t0,EA , ctx->mem_idx, memop); -if ((memop &MO_SIZE ) ==MO_64 ||TARGET_LONG_BITS ==32 ) { -tcg_gen_mov_tl (t1, src); - }else { -tcg_gen_ext32u_tl (t1, src); - } -tcg_gen_movcond_tl (TCG_COND_NE , t1, t0, t1, - cpu_gpr[(rt +2 ) &31 ], t0); -tcg_gen_qemu_st_tl (t1,EA , ctx->mem_idx, memop); -tcg_gen_mov_tl (dst, t0); - } -break ; - -case 24 :/* Fetch and increment bounded */ -if (tb_cflags (ctx->base.tb) &CF_PARALLEL ) { - need_serial = true; - }else { -gen_fetch_inc_conditional (ctx, memop,EA ,TCG_COND_NE ,1 ); - } -break ; -case 25 :/* Fetch and increment equal */ -if (tb_cflags (ctx->base.tb) &CF_PARALLEL ) { - need_serial = true; - }else { -gen_fetch_inc_conditional (ctx, memop,EA ,TCG_COND_EQ ,1 ); - } -break ; -case 28 :/* Fetch and decrement bounded */ -if (tb_cflags (ctx->base.tb) &CF_PARALLEL ) { - need_serial = true; - }else { -gen_fetch_inc_conditional (ctx, memop,EA ,TCG_COND_NE ,-1 ); - } -break ; - -default : -/* invoke data storage error handler */ -gen_exception_err (ctx,POWERPC_EXCP_DSI ,POWERPC_EXCP_INVAL ); - } - -if (need_serial) { -/* Restart with exclusive lock. */ -gen_helper_exit_atomic (tcg_env); - ctx->base.is_jmp =DISAS_NORETURN ; - } -} - -static void gen_lwat (DisasContext *ctx) -{ -gen_ld_atomic (ctx,DEF_MEMOP (MO_UL )); -} - -#ifdef TARGET_PPC64 -static void gen_ldat (DisasContext *ctx) -{ -gen_ld_atomic (ctx,DEF_MEMOP (MO_UQ )); -} -#endif - -static void gen_st_atomic (DisasContext *ctx,MemOp memop) -{ -uint32_t gpr_FC =FC (ctx->opcode); -TCGv EA =tcg_temp_new (); -TCGv src, discard; - -gen_addr_register (ctx,EA ); - src = cpu_gpr[rD (ctx->opcode)]; - discard =tcg_temp_new (); - - memop |=MO_ALIGN ; -switch (gpr_FC) { -case 0 :/* add and Store */ -tcg_gen_atomic_add_fetch_tl (discard,EA , src, ctx->mem_idx, memop); -break ; -case 1 :/* xor and Store */ -tcg_gen_atomic_xor_fetch_tl (discard,EA , src, ctx->mem_idx, memop); -break ; -case 2 :/* Or and Store */ -tcg_gen_atomic_or_fetch_tl (discard,EA , src, ctx->mem_idx, memop); -break ; -case 3 :/* 'and' and Store */ -tcg_gen_atomic_and_fetch_tl (discard,EA , src, ctx->mem_idx, memop); -break ; -case 4 :/* Store max unsigned */ -tcg_gen_atomic_umax_fetch_tl (discard,EA , src, ctx->mem_idx, memop); -break ; -case 5 :/* Store max signed */ -tcg_gen_atomic_smax_fetch_tl (discard,EA , src, ctx->mem_idx, memop); -break ; -case 6 :/* Store min unsigned */ -tcg_gen_atomic_umin_fetch_tl (discard,EA , src, ctx->mem_idx, memop); -break ; -case 7 :/* Store min signed */ -tcg_gen_atomic_smin_fetch_tl (discard,EA , src, ctx->mem_idx, memop); -break ; -case 24 :/* Store twin */ -if (tb_cflags (ctx->base.tb) &CF_PARALLEL ) { -/* Restart with exclusive lock. */ -gen_helper_exit_atomic (tcg_env); - ctx->base.is_jmp =DISAS_NORETURN ; - }else { -TCGv t =tcg_temp_new (); -TCGv t2 =tcg_temp_new (); -TCGv s =tcg_temp_new (); -TCGv s2 =tcg_temp_new (); -TCGv ea_plus_s =tcg_temp_new (); - -tcg_gen_qemu_ld_tl (t,EA , ctx->mem_idx, memop); -tcg_gen_addi_tl (ea_plus_s,EA ,memop_size (memop)); -tcg_gen_qemu_ld_tl (t2, ea_plus_s, ctx->mem_idx, memop); -tcg_gen_movcond_tl (TCG_COND_EQ , s, t, t2, src, t); -tcg_gen_movcond_tl (TCG_COND_EQ , s2, t, t2, src, t2); -tcg_gen_qemu_st_tl (s,EA , ctx->mem_idx, memop); -tcg_gen_qemu_st_tl (s2, ea_plus_s, ctx->mem_idx, memop); - } -break ; -default : -/* invoke data storage error handler */ -gen_exception_err (ctx,POWERPC_EXCP_DSI ,POWERPC_EXCP_INVAL ); - } -} - -static void gen_stwat (DisasContext *ctx) -{ -gen_st_atomic (ctx,DEF_MEMOP (MO_UL )); -} - -#ifdef TARGET_PPC64 -static void gen_stdat (DisasContext *ctx) -{ -gen_st_atomic (ctx,DEF_MEMOP (MO_UQ )); -} -#endif -/* wait */ static void gen_wait (DisasContext *ctx) {@@ -5608,12 +5402,6 @@ GEN_HANDLER(lswx, 0x1F, 0x15, 0x10, 0x00000001, PPC_STRING),GEN_HANDLER (stswi,0x1F ,0x15 ,0x16 ,0x00000001 ,PPC_STRING ),GEN_HANDLER (stswx,0x1F ,0x15 ,0x14 ,0x00000001 ,PPC_STRING ),GEN_HANDLER (isync,0x13 ,0x16 ,0x04 ,0x03FFF801 ,PPC_MEM ), -GEN_HANDLER_E(lwat, 0x1F, 0x06, 0x12, 0x00000001, PPC_NONE, PPC2_ISA300), -GEN_HANDLER_E(stwat, 0x1F, 0x06, 0x16, 0x00000001, PPC_NONE, PPC2_ISA300), -#if defined(TARGET_PPC64 ) -GEN_HANDLER_E (ldat,0x1F ,0x06 ,0x13 ,0x00000001 ,PPC_NONE ,PPC2_ISA300 ), -GEN_HANDLER_E (stdat,0x1F ,0x06 ,0x17 ,0x00000001 ,PPC_NONE ,PPC2_ISA300 ), -#endif/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER (wait,0x1F ,0x1E ,0x01 ,0x039FF801 ,PPC_WAIT ), GEN_HANDLER_E(wait, 0x1F, 0x1E, 0x00, 0x039CF801, PPC_NONE, PPC2_ISA300),target/ppc/translate/fixedpoint-impl.c.inc +215
-0@@ -1646,3 +1646,218 @@ static bool trans_SRAWI(DisasContext *ctx, arg_SRAWI *a) } return true; } + +static void do_fetch_inc_conditional(DisasContext *ctx, MemOp memop, + TCGv EA, int rt, + TCGCond cond, int addend) +{ + TCGv t = tcg_temp_new(); + TCGv t2 = tcg_temp_new(); + TCGv u = tcg_temp_new(); + + tcg_gen_qemu_ld_tl(t, EA, ctx->mem_idx, memop); + tcg_gen_addi_tl(t2, EA, memop_size(memop)); + tcg_gen_qemu_ld_tl(t2, t2, ctx->mem_idx, memop); + tcg_gen_addi_tl(u, t, addend); + + /* mem(EA,s) = (t cond t2 ? u = t + addend : t) */ + tcg_gen_movcond_tl(cond, u, t, t2, u, t); + tcg_gen_qemu_st_tl(u, EA, ctx->mem_idx, memop); + + /* RT = (t cond t2 ? t : 1<<(s*8-1)) */ + tcg_gen_movcond_tl(cond, cpu_gpr[rt], t, t2, t, + tcg_constant_tl(1 << (memop_size(memop) * 8 - 1))); +} + +/* + * Fixed-Point Atomic Load/Store Instructions + * + * In the X-form encoding the RB field carries the Function Code (FC) + * that selects the atomic operation. EA is computed from RA alone. + */ +static bool do_ld_atomic(DisasContext *ctx, arg_X *a, MemOp memop) +{ + TCGv EA, dst, src; + bool need_serial; + + REQUIRE_INSNS_FLAGS2(ctx, ISA300); + + EA = do_ea_calc(ctx, a->ra, tcg_constant_tl(0)); + dst = cpu_gpr[a->rt]; + src = cpu_gpr[(a->rt + 1) & 31]; + + need_serial = false; + memop |= MO_ALIGN; + switch (a->rb) { + case 0: /* Fetch and add */ + tcg_gen_atomic_fetch_add_tl(dst, EA, src, ctx->mem_idx, memop); + break; + case 1: /* Fetch and xor */ + tcg_gen_atomic_fetch_xor_tl(dst, EA, src, ctx->mem_idx, memop); + break; + case 2: /* Fetch and or */ + tcg_gen_atomic_fetch_or_tl(dst, EA, src, ctx->mem_idx, memop); + break; + case 3: /* Fetch and 'and' */ + tcg_gen_atomic_fetch_and_tl(dst, EA, src, ctx->mem_idx, memop); + break; + case 4: /* Fetch and max unsigned */ + tcg_gen_atomic_fetch_umax_tl(dst, EA, src, ctx->mem_idx, memop); + break; + case 5: /* Fetch and max signed */ + tcg_gen_atomic_fetch_smax_tl(dst, EA, src, ctx->mem_idx, memop); + break; + case 6: /* Fetch and min unsigned */ + tcg_gen_atomic_fetch_umin_tl(dst, EA, src, ctx->mem_idx, memop); + break; + case 7: /* Fetch and min signed */ + tcg_gen_atomic_fetch_smin_tl(dst, EA, src, ctx->mem_idx, memop); + break; + case 8: /* Swap */ + tcg_gen_atomic_xchg_tl(dst, EA, src, ctx->mem_idx, memop); + break; + + case 16: /* Compare and swap not equal */ + if (tb_cflags(ctx->base.tb) & CF_PARALLEL) { + need_serial = true; + } else { + TCGv t0 = tcg_temp_new(); + TCGv t1 = tcg_temp_new(); + + tcg_gen_qemu_ld_tl(t0, EA, ctx->mem_idx, memop); + if ((memop & MO_SIZE) == MO_64 || TARGET_LONG_BITS == 32) { + tcg_gen_mov_tl(t1, src); + } else { + tcg_gen_ext32u_tl(t1, src); + } + tcg_gen_movcond_tl(TCG_COND_NE, t1, t0, t1, + cpu_gpr[(a->rt + 2) & 31], t0); + tcg_gen_qemu_st_tl(t1, EA, ctx->mem_idx, memop); + tcg_gen_mov_tl(dst, t0); + } + break; + + case 24: /* Fetch and increment bounded */ + if (tb_cflags(ctx->base.tb) & CF_PARALLEL) { + need_serial = true; + } else { + do_fetch_inc_conditional(ctx, memop, EA, a->rt, TCG_COND_NE, 1); + } + break; + case 25: /* Fetch and increment equal */ + if (tb_cflags(ctx->base.tb) & CF_PARALLEL) { + need_serial = true; + } else { + do_fetch_inc_conditional(ctx, memop, EA, a->rt, TCG_COND_EQ, 1); + } + break; + case 28: /* Fetch and decrement bounded */ + if (tb_cflags(ctx->base.tb) & CF_PARALLEL) { + need_serial = true; + } else { + do_fetch_inc_conditional(ctx, memop, EA, a->rt, TCG_COND_NE, -1); + } + break; + + default: + /* invoke data storage error handler */ + gen_exception_err(ctx, POWERPC_EXCP_DSI, POWERPC_EXCP_INVAL); + return true; + } + + if (need_serial) { + /* Restart with exclusive lock. */ + gen_helper_exit_atomic(tcg_env); + ctx->base.is_jmp = DISAS_NORETURN; + } + return true; +} + +static bool do_st_atomic(DisasContext *ctx, arg_X *a, MemOp memop) +{ + TCGv EA, src, discard; + + REQUIRE_INSNS_FLAGS2(ctx, ISA300); + + EA = do_ea_calc(ctx, a->ra, tcg_constant_tl(0)); + src = cpu_gpr[a->rt]; + discard = tcg_temp_new(); + + memop |= MO_ALIGN; + switch (a->rb) { + case 0: /* add and Store */ + tcg_gen_atomic_add_fetch_tl(discard, EA, src, ctx->mem_idx, memop); + break; + case 1: /* xor and Store */ + tcg_gen_atomic_xor_fetch_tl(discard, EA, src, ctx->mem_idx, memop); + break; + case 2: /* Or and Store */ + tcg_gen_atomic_or_fetch_tl(discard, EA, src, ctx->mem_idx, memop); + break; + case 3: /* 'and' and Store */ + tcg_gen_atomic_and_fetch_tl(discard, EA, src, ctx->mem_idx, memop); + break; + case 4: /* Store max unsigned */ + tcg_gen_atomic_umax_fetch_tl(discard, EA, src, ctx->mem_idx, memop); + break; + case 5: /* Store max signed */ + tcg_gen_atomic_smax_fetch_tl(discard, EA, src, ctx->mem_idx, memop); + break; + case 6: /* Store min unsigned */ + tcg_gen_atomic_umin_fetch_tl(discard, EA, src, ctx->mem_idx, memop); + break; + case 7: /* Store min signed */ + tcg_gen_atomic_smin_fetch_tl(discard, EA, src, ctx->mem_idx, memop); + break; + case 24: /* Store twin */ + if (tb_cflags(ctx->base.tb) & CF_PARALLEL) { + /* Restart with exclusive lock. */ + gen_helper_exit_atomic(tcg_env); + ctx->base.is_jmp = DISAS_NORETURN; + } else { + TCGv t = tcg_temp_new(); + TCGv t2 = tcg_temp_new(); + TCGv s = tcg_temp_new(); + TCGv s2 = tcg_temp_new(); + TCGv ea_plus_s = tcg_temp_new(); + + tcg_gen_qemu_ld_tl(t, EA, ctx->mem_idx, memop); + tcg_gen_addi_tl(ea_plus_s, EA, memop_size(memop)); + tcg_gen_qemu_ld_tl(t2, ea_plus_s, ctx->mem_idx, memop); + tcg_gen_movcond_tl(TCG_COND_EQ, s, t, t2, src, t); + tcg_gen_movcond_tl(TCG_COND_EQ, s2, t, t2, src, t2); + tcg_gen_qemu_st_tl(s, EA, ctx->mem_idx, memop); + tcg_gen_qemu_st_tl(s2, ea_plus_s, ctx->mem_idx, memop); + } + break; + default: + /* invoke data storage error handler */ + gen_exception_err(ctx, POWERPC_EXCP_DSI, POWERPC_EXCP_INVAL); + } + return true; +} + +TRANS(LWAT, do_ld_atomic, DEF_MEMOP(MO_UL)) +TRANS(STWAT, do_st_atomic, DEF_MEMOP(MO_UL)) + +static bool trans_LDAT(DisasContext *ctx, arg_LDAT *a) +{ + REQUIRE_64BIT(ctx); +#if defined(TARGET_PPC64) + return do_ld_atomic(ctx, a, DEF_MEMOP(MO_UQ)); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_STDAT(DisasContext *ctx, arg_STDAT *a) +{ + REQUIRE_64BIT(ctx); +#if defined(TARGET_PPC64) + return do_st_atomic(ctx, a, DEF_MEMOP(MO_UQ)); +#else + qemu_build_not_reached(); +#endif + return true; +}
RFC PATCH 13/28 target/ppc: Move isync instruction to decodetree.
In reply to Chinmay RathFrom: Ojaswin Mujoo <[email protected]>
Moving the following instructions to decodetree specification :
isync
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
--- target/ppc/insn32.decode | 1 + target/ppc/translate.c | 15 --------------- target/ppc/translate/storage-ctrl-impl.c.inc | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 15 deletions(-)
target/ppc/insn32.decode +1 -0
@@ -1462,6 +1462,7 @@ MSGSYNC 011111 ----- ----- ----- 1101110110 - @X_sync ...... .. l:3 ... sc:2 ..... .......... . &X_sync SYNC 011111 -- ... --- .. ----- 1001010110 - @X_sync EIEIO 011111 ----- ----- ----- 1101010110 - +ISYNC 010011 ----- ----- ----- 0010010110 - # Condition Register Field Instruction
target/ppc/translate.c +0 -15
@@ -2727,20 +2727,6 @@ static inline void gen_check_tlb_flush(DisasContext *ctx, bool global)static inline void gen_check_tlb_flush (DisasContext *ctx,bool global) { }#endif -/* isync */ -static void gen_isync (DisasContext *ctx) -{ -/* -* We need to check for a pending TLB flush. This can only happen in -* kernel mode however so check MSR_PR -*/ -if (!ctx->pr) { -gen_check_tlb_flush (ctx, false); - } -tcg_gen_mb (TCG_MO_ALL |TCG_BAR_SC ); - ctx->base.is_jmp =DISAS_EXIT_UPDATE ; -} -/* wait */ static void gen_wait (DisasContext *ctx) {
@@ -5401,7 +5387,6 @@ GEN_HANDLER(lswi, 0x1F, 0x15, 0x12, 0x00000001, PPC_STRING),GEN_HANDLER (lswx,0x1F ,0x15 ,0x10 ,0x00000001 ,PPC_STRING ),GEN_HANDLER (stswi,0x1F ,0x15 ,0x16 ,0x00000001 ,PPC_STRING ),GEN_HANDLER (stswx,0x1F ,0x15 ,0x14 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER (isync,0x13 ,0x16 ,0x04 ,0x03FFF801 ,PPC_MEM ),/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER (wait,0x1F ,0x1E ,0x01 ,0x039FF801 ,PPC_WAIT ), GEN_HANDLER_E(wait, 0x1F, 0x1E, 0x00, 0x039CF801, PPC_NONE, PPC2_ISA300),
target/ppc/translate/storage-ctrl-impl.c.inc +17 -0
@@ -155,6 +155,23 @@ static bool trans_SLBFEE(DisasContext *ctx, arg_SLBFEE *a) return true; } +static bool trans_ISYNC(DisasContext *ctx, arg_ISYNC *a) +{ + REQUIRE_INSNS_FLAGS(ctx, MEM); + + /* + * We need to check for a pending TLB flush. This can only happen in + * kernel mode however so check MSR_PR + */ + if (!ctx->pr) { + gen_check_tlb_flush(ctx, false); + } + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + ctx->base.is_jmp = DISAS_EXIT_UPDATE; + + return true; +} + static bool trans_SLBSYNC(DisasContext *ctx, arg_SLBSYNC *a) { REQUIRE_64BIT(ctx);
Signature · 1 line
2.53.0
Re: [RFC PATCH 13/28] target/ppc: Move isync instruction to decodetree.
Thanks,
~ Nikhil
Quoted 90 lines · Chinmay Rath
From: Ojaswin Mujoo <[email protected]>
Moving the following instructions to decodetree specification :
isyncThe changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
Signed-off-by Ojaswin Mujoo <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/insn32.decode | 1 + target/ppc/translate.c | 15 --------------- target/ppc/translate/storage-ctrl-impl.c.inc | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 15 deletions(-)target/ppc/insn32.decode +1
-0@@ -1462,6 +1462,7 @@ MSGSYNC 011111 ----- ----- ----- 1101110110 - @X_sync ...... .. l:3 ... sc:2 ..... .......... . &X_sync SYNC 011111 -- ... --- .. ----- 1001010110 - @X_sync EIEIO 011111 ----- ----- ----- 1101010110 - +ISYNC 010011 ----- ----- ----- 0010010110 - # Condition Register Field Instructiontarget/ppc/translate.c +0
-15@@ -2727,20 +2727,6 @@ static inline void gen_check_tlb_flush(DisasContext *ctx, bool global)static inline void gen_check_tlb_flush (DisasContext *ctx,bool global) { }#endif -/* isync */ -static void gen_isync (DisasContext *ctx) -{ -/* -* We need to check for a pending TLB flush. This can only happen in -* kernel mode however so check MSR_PR -*/ -if (!ctx->pr) { -gen_check_tlb_flush (ctx, false); - } -tcg_gen_mb (TCG_MO_ALL |TCG_BAR_SC ); - ctx->base.is_jmp =DISAS_EXIT_UPDATE ; -} -/* wait */ static void gen_wait (DisasContext *ctx) {@@ -5401,7 +5387,6 @@ GEN_HANDLER(lswi, 0x1F, 0x15, 0x12, 0x00000001, PPC_STRING),GEN_HANDLER (lswx,0x1F ,0x15 ,0x10 ,0x00000001 ,PPC_STRING ),GEN_HANDLER (stswi,0x1F ,0x15 ,0x16 ,0x00000001 ,PPC_STRING ),GEN_HANDLER (stswx,0x1F ,0x15 ,0x14 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER (isync,0x13 ,0x16 ,0x04 ,0x03FFF801 ,PPC_MEM ),/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER (wait,0x1F ,0x1E ,0x01 ,0x039FF801 ,PPC_WAIT ), GEN_HANDLER_E(wait, 0x1F, 0x1E, 0x00, 0x039CF801, PPC_NONE, PPC2_ISA300),target/ppc/translate/storage-ctrl-impl.c.inc +17
-0@@ -155,6 +155,23 @@ static bool trans_SLBFEE(DisasContext *ctx, arg_SLBFEE *a) return true; } +static bool trans_ISYNC(DisasContext *ctx, arg_ISYNC *a) +{ + REQUIRE_INSNS_FLAGS(ctx, MEM); + + /* + * We need to check for a pending TLB flush. This can only happen in + * kernel mode however so check MSR_PR + */ + if (!ctx->pr) { + gen_check_tlb_flush(ctx, false); + } + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + ctx->base.is_jmp = DISAS_EXIT_UPDATE; + + return true; +} + static bool trans_SLBSYNC(DisasContext *ctx, arg_SLBSYNC *a) { REQUIRE_64BIT(ctx);
RFC PATCH 14/28 target/ppc: Convert b{a, l, la} to decode tree
In reply to Chinmay RathFrom: Ojaswin Mujoo <[email protected]>
Convert b, ba, bl and bla to decode tree specification. The functionality was tested by comparing the qemu -D log -d op,in_asm output as well as single stepping gdb to confirm LR was correctly populated only when LK is set.
--- target/ppc/insn32.decode | 7 +++++++ target/ppc/internal.h | 7 ------- target/ppc/translate.c | 24 ------------------------ target/ppc/translate/branch-impl.c.inc | 24 ++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 31 deletions(-)
target/ppc/insn32.decode +7 -0
@@ -1478,6 +1478,13 @@ MCRF 010011 ... -- ... -- ----- 00000 00000 - @XL_bfa MFBHRBE 011111 ..... ..... ..... 0100101110 - @XFX_bhrbe CLRBHRB 011111 ----- ----- ----- 0110101110 - +# Branch Instructions +%li 2:24 !function=times_4 +&I_b li aa:bool lk:bool +@I_b ...... ........................ aa:1 lk:1 &I_b li=%li + +B 010010 ........................ . . @I_b + ## Misc POWER instructions ATTN 000000 00000 00000 00000 0100000000 0
target/ppc/internal.h +0 -7
@@ -198,13 +198,6 @@ EXTRACT_HELPER(L, 16, 2);EXTRACT_HELPER (WC ,21 ,2 );EXTRACT_HELPER (PL ,16 ,2 ); -/*** Jump target decoding ***/ -/* Immediate address */ -static inline target_ulong LI (uint32_t opcode) -{ -return (opcode >>0 ) &0x03FFFFFC ; -} -static inline uint32_t BD (uint32_t opcode) {return (opcode >>0 ) &0xFFFC ;
target/ppc/translate.c +0 -24
@@ -3089,29 +3089,6 @@ static inline void gen_setlr(DisasContext *ctx, target_ulong nip)tcg_gen_movi_tl (cpu_lr, nip); } -/* b ba bl bla */ -static void gen_b (DisasContext *ctx) -{ -target_ulong li, target; - -/* sign extend LI */ - li =LI (ctx->opcode); - li = (li ^0x02000000 ) -0x02000000 ; -if (likely (AA (ctx->opcode) ==0 )) { - target = ctx->cia + li; - }else { - target = li; - } -if (LK (ctx->opcode)) { -gen_setlr (ctx, ctx->base.pc_next); -gen_update_branch_history (ctx, ctx->cia,NULL ,BHRB_TYPE_CALL ); - }else { -gen_update_branch_history (ctx, ctx->cia,NULL ,BHRB_TYPE_OTHER ); - } -gen_goto_tb (ctx,0 , target); - ctx->base.is_jmp =DISAS_NORETURN ; -} -#define BCOND_IM 0#define BCOND_LR 1#define BCOND_CTR 2
@@ -5390,7 +5367,6 @@ GEN_HANDLER(stswx, 0x1F, 0x15, 0x14, 0x00000001, PPC_STRING),/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER (wait,0x1F ,0x1E ,0x01 ,0x039FF801 ,PPC_WAIT ),GEN_HANDLER_E (wait,0x1F ,0x1E ,0x00 ,0x039CF801 ,PPC_NONE ,PPC2_ISA300 ), -GEN_HANDLER (b,0x12 ,0xFF ,0xFF ,0x00000000 ,PPC_FLOW ),GEN_HANDLER (bc,0x10 ,0xFF ,0xFF ,0x00000000 ,PPC_FLOW ),GEN_HANDLER (bcctr,0x13 ,0x10 ,0x10 ,0x00000000 ,PPC_FLOW ), GEN_HANDLER(bclr, 0x13, 0x10, 0x00, 0x00000000, PPC_FLOW),
target/ppc/translate/branch-impl.c.inc +24 -0
@@ -31,3 +31,27 @@ static bool trans_RFEBB(DisasContext *ctx, arg_XL_s *arg) return true; } #endif + +static bool trans_B(DisasContext *ctx, arg_I_b *a) +{ + target_ulong target, li; + + /* sign extend LI */ + li = (a->li ^ 0x02000000) - 0x02000000; + + if (likely(a->aa == 0)) { + target = ctx->cia + li; + } else { + target = li; + } + if (a->lk) { + gen_setlr(ctx, ctx->base.pc_next); + gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_CALL); + } else { + gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_OTHER); + } + gen_goto_tb(ctx, 0, target); + ctx->base.is_jmp = DISAS_NORETURN; + + return true; +}
Signature · 1 line
2.53.0
Re: [RFC PATCH 14/28] target/ppc: Convert b{a, l, la} to decode tree
Thanks,
~ Nikhil
Quoted 126 lines · Chinmay Rath
From: Ojaswin Mujoo <[email protected]>
Convert b, ba, bl and bla to decode tree specification. The functionality was tested by comparing the qemu -D log -d op,in_asm output as well as single stepping gdb to confirm LR was correctly populated only when LK is set.
Signed-off-by Ojaswin Mujoo <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/insn32.decode | 7 +++++++ target/ppc/internal.h | 7 ------- target/ppc/translate.c | 24 ------------------------ target/ppc/translate/branch-impl.c.inc | 24 ++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 31 deletions(-)target/ppc/insn32.decode +7
-0@@ -1478,6 +1478,13 @@ MCRF 010011 ... -- ... -- ----- 00000 00000 - @XL_bfa MFBHRBE 011111 ..... ..... ..... 0100101110 - @XFX_bhrbe CLRBHRB 011111 ----- ----- ----- 0110101110 - +# Branch Instructions +%li 2:24 !function=times_4 +&I_b li aa:bool lk:bool +@I_b ...... ........................ aa:1 lk:1 &I_b li=%li + +B 010010 ........................ . . @I_b + ## Misc POWER instructions ATTN 000000 00000 00000 00000 0100000000 0target/ppc/internal.h +0
-7@@ -198,13 +198,6 @@ EXTRACT_HELPER(L, 16, 2);EXTRACT_HELPER (WC ,21 ,2 );EXTRACT_HELPER (PL ,16 ,2 ); -/*** Jump target decoding ***/ -/* Immediate address */ -static inline target_ulong LI (uint32_t opcode) -{ -return (opcode >>0 ) &0x03FFFFFC ; -} -static inline uint32_t BD (uint32_t opcode) {return (opcode >>0 ) &0xFFFC ;target/ppc/translate.c +0
-24@@ -3089,29 +3089,6 @@ static inline void gen_setlr(DisasContext *ctx, target_ulong nip)tcg_gen_movi_tl (cpu_lr, nip); } -/* b ba bl bla */ -static void gen_b (DisasContext *ctx) -{ -target_ulong li, target; - -/* sign extend LI */ - li =LI (ctx->opcode); - li = (li ^0x02000000 ) -0x02000000 ; -if (likely (AA (ctx->opcode) ==0 )) { - target = ctx->cia + li; - }else { - target = li; - } -if (LK (ctx->opcode)) { -gen_setlr (ctx, ctx->base.pc_next); -gen_update_branch_history (ctx, ctx->cia,NULL ,BHRB_TYPE_CALL ); - }else { -gen_update_branch_history (ctx, ctx->cia,NULL ,BHRB_TYPE_OTHER ); - } -gen_goto_tb (ctx,0 , target); - ctx->base.is_jmp =DISAS_NORETURN ; -} -#define BCOND_IM 0#define BCOND_LR 1#define BCOND_CTR 2@@ -5390,7 +5367,6 @@ GEN_HANDLER(stswx, 0x1F, 0x15, 0x14, 0x00000001, PPC_STRING),/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER (wait,0x1F ,0x1E ,0x01 ,0x039FF801 ,PPC_WAIT ),GEN_HANDLER_E (wait,0x1F ,0x1E ,0x00 ,0x039CF801 ,PPC_NONE ,PPC2_ISA300 ), -GEN_HANDLER (b,0x12 ,0xFF ,0xFF ,0x00000000 ,PPC_FLOW ),GEN_HANDLER (bc,0x10 ,0xFF ,0xFF ,0x00000000 ,PPC_FLOW ),GEN_HANDLER (bcctr,0x13 ,0x10 ,0x10 ,0x00000000 ,PPC_FLOW ), GEN_HANDLER(bclr, 0x13, 0x10, 0x00, 0x00000000, PPC_FLOW),target/ppc/translate/branch-impl.c.inc +24
-0@@ -31,3 +31,27 @@ static bool trans_RFEBB(DisasContext *ctx, arg_XL_s *arg) return true; } #endif + +static bool trans_B(DisasContext *ctx, arg_I_b *a) +{ + target_ulong target, li; + + /* sign extend LI */ + li = (a->li ^ 0x02000000) - 0x02000000; + + if (likely(a->aa == 0)) { + target = ctx->cia + li; + } else { + target = li; + } + if (a->lk) { + gen_setlr(ctx, ctx->base.pc_next); + gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_CALL); + } else { + gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_OTHER); + } + gen_goto_tb(ctx, 0, target); + ctx->base.is_jmp = DISAS_NORETURN; + + return true; +}
RFC PATCH 15/28 target/ppc: move various conditional branch insns to decodetree
In reply to Chinmay RathFrom: Ojaswin Mujoo <[email protected]>
Convert the following instrunctions to decodetree specification:
bc
bca
bcl
bcla
bclr
bclrl
bcctr
bcctrl
bctar
bctarl
The branch was tested by comparing the qemu -D log -d op,in_asm output for each instruction and also for the various combinations of branch option (BO) bits for the conditional branch instructions. Additionally, gdb was used to confirm the LR and other register's behavior is consistent to legacy behavior.
Further, the changes also pass a boot test into Fedora distro.
--- target/ppc/insn32.decode | 13 ++ target/ppc/translate.c | 148 ----------------------- target/ppc/translate/branch-impl.c.inc | 157 +++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 148 deletions(-)
target/ppc/insn32.decode +13 -0
@@ -1485,6 +1485,19 @@ CLRBHRB 011111 ----- ----- ----- 0110101110 - B 010010 ........................ . . @I_b +%bd 2:14 !function=times_4 +&bcond bo:uint32_t bi bd aa:bool lk:bool +@B_bcond ...... bo:5 bi:5 .............. aa:1 lk:1 &bcond bd=%bd + +BC 010000 ..... ..... .............. . . @B_bcond + +&bclr bo bi bh lk:bool +@XL_bclr ...... bo:5 bi:5 --- bh:2 .......... lk:1 &bclr + +BCLR 010011 ..... ..... ---.. 0000010000 . @XL_bclr +BCCTR 010011 ..... ..... ---.. 1000010000 . @XL_bclr +BCTAR 010011 ..... ..... ---.. 1000110000 . @XL_bclr + ## Misc POWER instructions ATTN 000000 00000 00000 00000 0100000000 0
target/ppc/translate.c +0 -148
160 lines not on this page · raw message
target/ppc/translate/branch-impl.c.inc +157 -0
160 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [RFC PATCH 15/28] target/ppc: move various conditional branch insns to decodetree
Quoted 3 lines · Chinmay Rath
From: Ojaswin Mujoo<[email protected]>
Convert the following instrunctions to decodetree specification:
The word should be spelled instructions and not instrunctions. Please fix this in the commit message.
Quoted 375 lines
bc
bca
bcl
bclabclr
bclrlbcctr
bcctrlbctar
bctarlThe branch was tested by comparing the qemu -D log -d op,in_asm output for each instruction and also for the various combinations of branch option (BO) bits for the conditional branch instructions. Additionally, gdb was used to confirm the LR and other register's behavior is consistent to legacy behavior.
Further, the changes also pass a boot test into Fedora distro.
Signed-off-by Ojaswin Mujoo<[email protected]>Signed-off-by Chinmay Rath<[email protected]>--- target/ppc/insn32.decode | 13 ++ target/ppc/translate.c | 148 ----------------------- target/ppc/translate/branch-impl.c.inc | 157 +++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 148 deletions(-)target/ppc/insn32.decode +13
-0@@ -1485,6 +1485,19 @@ CLRBHRB 011111 ----- ----- ----- 0110101110 - B 010010 ........................ . . @I_b +%bd 2:14 !function=times_4 +&bcond bo:uint32_t bi bd aa:bool lk:bool +@B_bcond ...... bo:5 bi:5 .............. aa:1 lk:1 &bcond bd=%bd + +BC 010000 ..... ..... .............. . . @B_bcond + +&bclr bo bi bh lk:bool +@XL_bclr ...... bo:5 bi:5 --- bh:2 .......... lk:1 &bclr + +BCLR 010011 ..... ..... ---.. 0000010000 . @XL_bclr +BCCTR 010011 ..... ..... ---.. 1000010000 . @XL_bclr +BCTAR 010011 ..... ..... ---.. 1000110000 . @XL_bclr + ## Misc POWER instructions ATTN 000000 00000 00000 00000 0100000000 0target/ppc/translate.c +0
-148@@ -3089,150 +3089,6 @@ static inline void gen_setlr(DisasContext *ctx, target_ulong nip)tcg_gen_movi_tl (cpu_lr, nip); } -#define BCOND_IM 0 -#define BCOND_LR 1 -#define BCOND_CTR 2 -#define BCOND_TAR 3 - -static void gen_bcond (DisasContext *ctx,int type) -{ -uint32_t bo =BO (ctx->opcode); -TCGLabel *l1; -TCGv target; -target_long bhrb_type =BHRB_TYPE_OTHER ; - -if (type ==BCOND_LR || type ==BCOND_CTR || type ==BCOND_TAR ) { - target =tcg_temp_new (); -if (type ==BCOND_CTR ) { -tcg_gen_mov_tl (target, cpu_ctr); - }else if (type ==BCOND_TAR ) { -gen_load_spr (target,SPR_TAR ); - }else { -tcg_gen_mov_tl (target, cpu_lr); - } -if (!LK (ctx->opcode)) { - bhrb_type |=BHRB_TYPE_INDIRECT ; - } - bhrb_type |=BHRB_TYPE_XL_FORM ; - }else { - target =NULL ; - } -if (LK (ctx->opcode)) { -gen_setlr (ctx, ctx->base.pc_next); - bhrb_type |=BHRB_TYPE_CALL ; - } - l1 =gen_new_label (); -if ((bo &0x4 ) ==0 ) { -/* Decrement and test CTR */ -TCGv temp =tcg_temp_new (); - -if (type ==BCOND_CTR ) { -/* -* All ISAs up to v3 describe this form of bcctr as invalid but -* some processors, ie. 64-bit server processors compliant with -* arch 2.x, do implement a "test and decrement" logic instead, -* as described in their respective UMs. This logic involves CTR -* to act as both the branch target and a counter, which makes -* it basically useless and thus never used in real code. -* -* This form was hence chosen to trigger extra micro-architectural -* side-effect on real HW needed for the Spectre v2 workaround. -* It is up to guests that implement such workaround, ie. linux, to -* use this form in a way it just triggers the side-effect without -* doing anything else harmful. -*/ -if (unlikely (!is_book3s_arch2x (ctx))) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); -return ; - } - -if (NARROW_MODE (ctx)) { -tcg_gen_ext32u_tl (temp, cpu_ctr); - }else { -tcg_gen_mov_tl (temp, cpu_ctr); - } -if (bo &0x2 ) { -tcg_gen_brcondi_tl (TCG_COND_NE , temp,0 , l1); - }else { -tcg_gen_brcondi_tl (TCG_COND_EQ , temp,0 , l1); - } -tcg_gen_subi_tl (cpu_ctr, cpu_ctr,1 ); - }else { -tcg_gen_subi_tl (cpu_ctr, cpu_ctr,1 ); -if (NARROW_MODE (ctx)) { -tcg_gen_ext32u_tl (temp, cpu_ctr); - }else { -tcg_gen_mov_tl (temp, cpu_ctr); - } -if (bo &0x2 ) { -tcg_gen_brcondi_tl (TCG_COND_NE , temp,0 , l1); - }else { -tcg_gen_brcondi_tl (TCG_COND_EQ , temp,0 , l1); - } - } - bhrb_type |=BHRB_TYPE_COND ; - } -if ((bo &0x10 ) ==0 ) { -/* Test CR */ -uint32_t bi =BI (ctx->opcode); -uint32_t mask =0x08 >> (bi &0x03 ); -TCGv_i32 temp =tcg_temp_new_i32 (); - -if (bo &0x8 ) { -tcg_gen_andi_i32 (temp, cpu_crf[bi >>2 ], mask); -tcg_gen_brcondi_i32 (TCG_COND_EQ , temp,0 , l1); - }else { -tcg_gen_andi_i32 (temp, cpu_crf[bi >>2 ], mask); -tcg_gen_brcondi_i32 (TCG_COND_NE , temp,0 , l1); - } - bhrb_type |=BHRB_TYPE_COND ; - } - -gen_update_branch_history (ctx, ctx->cia, target, bhrb_type); - -if (type ==BCOND_IM ) { -target_ulong li = (target_long)((int16_t )(BD (ctx->opcode))); -if (likely (AA (ctx->opcode) ==0 )) { -gen_goto_tb (ctx,0 , ctx->cia + li); - }else { -gen_goto_tb (ctx,0 , li); - } - }else { -if (NARROW_MODE (ctx)) { -tcg_gen_andi_tl (cpu_nip, target, (uint32_t )~3 ); - }else { -tcg_gen_andi_tl (cpu_nip, target, ~3 ); - } -gen_lookup_and_goto_ptr (ctx); - } -if ((bo &0x14 ) !=0x14 ) { -/* fallthrough case */ -gen_set_label (l1); -gen_goto_tb (ctx,1 , ctx->base.pc_next); - } - ctx->base.is_jmp =DISAS_NORETURN ; -} - -static void gen_bc (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_IM ); -} - -static void gen_bcctr (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_CTR ); -} - -static void gen_bclr (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_LR ); -} - -static void gen_bctar (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_TAR ); -} -/*** Condition register logical ***/ #define GEN_CRLOGIC (name, tcg_op, opc) \ static void glue(gen_, name)(DisasContext *ctx) \@@ -5367,10 +5223,6 @@ GEN_HANDLER(stswx, 0x1F, 0x15, 0x14, 0x00000001, PPC_STRING),/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER(wait, 0x1F, 0x1E, 0x01, 0x039FF801, PPC_WAIT), GEN_HANDLER_E(wait, 0x1F, 0x1E, 0x00, 0x039CF801, PPC_NONE, PPC2_ISA300), -GEN_HANDLER(bc, 0x10, 0xFF, 0xFF, 0x00000000, PPC_FLOW), -GEN_HANDLER(bcctr, 0x13, 0x10, 0x10, 0x00000000, PPC_FLOW), -GEN_HANDLER(bclr, 0x13, 0x10, 0x00, 0x00000000, PPC_FLOW), -GEN_HANDLER_E(bctar, 0x13, 0x10, 0x11, 0x0000E000, PPC_NONE, PPC2_BCTAR_ISA207), GEN_HANDLER(rfi, 0x13, 0x12, 0x01, 0x03FF8001, PPC_FLOW),#if defined(TARGET_PPC64 ) GEN_HANDLER(rfid, 0x13, 0x12, 0x00, 0x03FF8001, PPC_64B),target/ppc/translate/branch-impl.c.inc +147
-0@@ -55,3 +55,160 @@ static bool trans_B(DisasContext *ctx, arg_I_b *a) return true; } + +#define BCOND_IM 0 +#define BCOND_LR 1 +#define BCOND_CTR 2 +#define BCOND_TAR 3 + +static bool bcond_helper(DisasContext *ctx, int type, uint32_t bo, int bi, + int bd, int bh, bool aa, bool lk) +{ + TCGLabel *l1; + TCGv target; + target_long bhrb_type = BHRB_TYPE_OTHER; + + if (type == BCOND_IM && bh != -1) { + /* BCOND_IM should never use bh */ + return false; + } else if (type != BCOND_IM && (bd != -1 || aa != 0)) { + /* Other BCOND types should never use bd or aa */ + return false; + } + + if (type == BCOND_LR || type == BCOND_CTR || type == BCOND_TAR) { + target = tcg_temp_new(); + if (type == BCOND_CTR) { + tcg_gen_mov_tl(target, cpu_ctr); + } else if (type == BCOND_TAR) { + gen_load_spr(target, SPR_TAR); + } else { + tcg_gen_mov_tl(target, cpu_lr); + } + if (!lk) { + bhrb_type |= BHRB_TYPE_INDIRECT; + } + bhrb_type |= BHRB_TYPE_XL_FORM; + } else { + target = NULL; + } + if (lk) { + gen_setlr(ctx, ctx->base.pc_next); + bhrb_type |= BHRB_TYPE_CALL; + } + l1 = gen_new_label(); + if ((bo & 0x4) == 0) { + /* Decrement and test CTR */ + TCGv temp = tcg_temp_new(); + + if (type == BCOND_CTR) { + /* + * All ISAs up to v3 describe this form of bcctr as invalid but + * some processors, ie. 64-bit server processors compliant with + * arch 2.x, do implement a "test and decrement" logic instead, + * as described in their respective UMs. This logic involves CTR + * to act as both the branch target and a counter, which makes + * it basically useless and thus never used in real code. + * + * This form was hence chosen to trigger extra micro-architectural + * side-effect on real HW needed for the Spectre v2 workaround. + * It is up to guests that implement such workaround, ie. linux, to + * use this form in a way it just triggers the side-effect without + * doing anything else harmful. + */ + if (unlikely(!is_book3s_arch2x(ctx))) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true; + } + + if (NARROW_MODE(ctx)) { + tcg_gen_ext32u_tl(temp, cpu_ctr); + } else { + tcg_gen_mov_tl(temp, cpu_ctr); + } + if (bo & 0x2) { + tcg_gen_brcondi_tl(TCG_COND_NE, temp, 0, l1); + } else { + tcg_gen_brcondi_tl(TCG_COND_EQ, temp, 0, l1); + } + tcg_gen_subi_tl(cpu_ctr, cpu_ctr, 1); + } else { + tcg_gen_subi_tl(cpu_ctr, cpu_ctr, 1); + if (NARROW_MODE(ctx)) { + tcg_gen_ext32u_tl(temp, cpu_ctr); + } else { + tcg_gen_mov_tl(temp, cpu_ctr); + } + if (bo & 0x2) { + tcg_gen_brcondi_tl(TCG_COND_NE, temp, 0, l1); + } else { + tcg_gen_brcondi_tl(TCG_COND_EQ, temp, 0, l1); + } + } + bhrb_type |= BHRB_TYPE_COND; + } + if ((bo & 0x10) == 0) { + /* Test CR */ + uint32_t mask = 0x08 >> (bi & 0x03); + TCGv_i32 temp = tcg_temp_new_i32(); + + if (bo & 0x8) { + tcg_gen_andi_i32(temp, cpu_crf[bi >> 2], mask); + tcg_gen_brcondi_i32(TCG_COND_EQ, temp, 0, l1); + } else { + tcg_gen_andi_i32(temp, cpu_crf[bi >> 2], mask); + tcg_gen_brcondi_i32(TCG_COND_NE, temp, 0, l1); + } + bhrb_type |= BHRB_TYPE_COND; + } + + gen_update_branch_history(ctx, ctx->cia, target, bhrb_type); + + if (type == BCOND_IM) { + target_ulong li = (target_long)((int16_t)(bd)); + if (likely(aa == 0)) { + gen_goto_tb(ctx, 0, ctx->cia + li); + } else { + gen_goto_tb(ctx, 0, li); + } + } else { + if (NARROW_MODE(ctx)) { + tcg_gen_andi_tl(cpu_nip, target, (uint32_t)~3); + } else { + tcg_gen_andi_tl(cpu_nip, target, ~3); + } + gen_lookup_and_goto_ptr(ctx); + } + if ((bo & 0x14) != 0x14) { + /* fallthrough case */ + gen_set_label(l1); + gen_goto_tb(ctx, 1, ctx->base.pc_next); + } + ctx->base.is_jmp = DISAS_NORETURN; + + return true; +} + +static bool trans_BC(DisasContext *ctx, arg_bcond *a) +{ + /* + * bh is not used for bc variants hence we pass -1 + */ + return bcond_helper(ctx, BCOND_IM, a->bo, a->bi, a->bd, -1, a->aa, a->lk); +} + +/* + * This helper is shared by bclr, bcctr and bctar. + */ +static bool bclr_helper(DisasContext *ctx, arg_bclr *a, int type) +{
target/ppc/translate/branch-impl.c.inc static bool trans_B(DisasContext *ctx, arg_I_b *a) · line 214
Quoted 10 lines
target/ppc/translate/branch-impl.c.inc +10
-0+ /* + * bd and aa is not used for bc variants hence we pass -1 and 0 respectively + */ + return bcond_helper(ctx, type, a->bo, a->bi, -1, a->bh, 0, a->lk); +} + +TRANS(BCLR, bclr_helper, BCOND_LR) +TRANS(BCCTR, bclr_helper, BCOND_CTR) +TRANS(BCTAR, bclr_helper, BCOND_TAR) +
The patch looks mostly fine, but I noticed one small issue regarding the bctar instruction.
Actually, in the legacy implementation, bctar was properly guarded by the ISA 2.07 feature flag like this:GEN_HANDLER_E(bctar, 0x13, 0x10, 0x11, 0x0000E000, PPC_NONE, PPC2_BCTAR_ISA207)
But in the new decodetree implementation, it is getting mapped directly using the standard macro TRANS(BCTAR, bclr_helper, BCOND_TAR)
Since the TRANS macro doesn't apply any secondary instruction flags (and even bclr_helper / bcond_helper are not checking for it), this check is being missed out.
It could be better if you can just write a dedicated translation handler for the same to enforce the BCTAR_ISA207 check. I guess Chinmay can tell better on this.
Thanks
~ Nikhil
Re: [RFC PATCH 15/28] target/ppc: move various conditional branch insns to decodetree
Quoted 8 lines · Nikhil Kumar Singh
Quoted 3 lines · Chinmay Rath
From: Ojaswin Mujoo<[email protected]>
Convert the following instrunctions to decodetree specification:
The word should be spelled
instructionsand notinstrunctions. Please fix this in the
commit message.
Hi Nikhil, thanks for the review. I'll make the change.
Quoted 383 lines
Quoted 370 lines
bc
bca
bcl
bclabclr
bclrlbcctr
bcctrlbctar
bctarlThe branch was tested by comparing the qemu -D log -d op,in_asm output for each instruction and also for the various combinations of branch option (BO) bits for the conditional branch instructions. Additionally, gdb was used to confirm the LR and other register's behavior is consistent to legacy behavior.
Further, the changes also pass a boot test into Fedora distro.
Signed-off-by Ojaswin Mujoo<[email protected]>Signed-off-by Chinmay Rath<[email protected]>--- target/ppc/insn32.decode | 13 ++ target/ppc/translate.c | 148 ----------------------- target/ppc/translate/branch-impl.c.inc | 157 +++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 148 deletions(-)target/ppc/insn32.decode +13
-0@@ -1485,6 +1485,19 @@ CLRBHRB 011111 ----- ----- ----- 0110101110 - B 010010 ........................ . . @I_b +%bd 2:14 !function=times_4 +&bcond bo:uint32_t bi bd aa:bool lk:bool +@B_bcond ...... bo:5 bi:5 .............. aa:1 lk:1 &bcond bd=%bd + +BC 010000 ..... ..... .............. . . @B_bcond + +&bclr bo bi bh lk:bool +@XL_bclr ...... bo:5 bi:5 --- bh:2 .......... lk:1 &bclr + +BCLR 010011 ..... ..... ---.. 0000010000 . @XL_bclr +BCCTR 010011 ..... ..... ---.. 1000010000 . @XL_bclr +BCTAR 010011 ..... ..... ---.. 1000110000 . @XL_bclr + ## Misc POWER instructions ATTN 000000 00000 00000 00000 0100000000 0target/ppc/translate.c +0
-148@@ -3089,150 +3089,6 @@ static inline void gen_setlr(DisasContext *ctx, target_ulong nip)tcg_gen_movi_tl (cpu_lr, nip); } -#define BCOND_IM 0 -#define BCOND_LR 1 -#define BCOND_CTR 2 -#define BCOND_TAR 3 - -static void gen_bcond (DisasContext *ctx,int type) -{ -uint32_t bo =BO (ctx->opcode); -TCGLabel *l1; -TCGv target; -target_long bhrb_type =BHRB_TYPE_OTHER ; - -if (type ==BCOND_LR || type ==BCOND_CTR || type ==BCOND_TAR ) { - target =tcg_temp_new (); -if (type ==BCOND_CTR ) { -tcg_gen_mov_tl (target, cpu_ctr); - }else if (type ==BCOND_TAR ) { -gen_load_spr (target,SPR_TAR ); - }else { -tcg_gen_mov_tl (target, cpu_lr); - } -if (!LK (ctx->opcode)) { - bhrb_type |=BHRB_TYPE_INDIRECT ; - } - bhrb_type |=BHRB_TYPE_XL_FORM ; - }else { - target =NULL ; - } -if (LK (ctx->opcode)) { -gen_setlr (ctx, ctx->base.pc_next); - bhrb_type |=BHRB_TYPE_CALL ; - } - l1 =gen_new_label (); -if ((bo &0x4 ) ==0 ) { -/* Decrement and test CTR */ -TCGv temp =tcg_temp_new (); - -if (type ==BCOND_CTR ) { -/* -* All ISAs up to v3 describe this form of bcctr as invalid but -* some processors, ie. 64-bit server processors compliant with -* arch 2.x, do implement a "test and decrement" logic instead, -* as described in their respective UMs. This logic involves CTR -* to act as both the branch target and a counter, which makes -* it basically useless and thus never used in real code. -* -* This form was hence chosen to trigger extra micro-architectural -* side-effect on real HW needed for the Spectre v2 workaround. -* It is up to guests that implement such workaround, ie. linux, to -* use this form in a way it just triggers the side-effect without -* doing anything else harmful. -*/ -if (unlikely (!is_book3s_arch2x (ctx))) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); -return ; - } - -if (NARROW_MODE (ctx)) { -tcg_gen_ext32u_tl (temp, cpu_ctr); - }else { -tcg_gen_mov_tl (temp, cpu_ctr); - } -if (bo &0x2 ) { -tcg_gen_brcondi_tl (TCG_COND_NE , temp,0 , l1); - }else { -tcg_gen_brcondi_tl (TCG_COND_EQ , temp,0 , l1); - } -tcg_gen_subi_tl (cpu_ctr, cpu_ctr,1 ); - }else { -tcg_gen_subi_tl (cpu_ctr, cpu_ctr,1 ); -if (NARROW_MODE (ctx)) { -tcg_gen_ext32u_tl (temp, cpu_ctr); - }else { -tcg_gen_mov_tl (temp, cpu_ctr); - } -if (bo &0x2 ) { -tcg_gen_brcondi_tl (TCG_COND_NE , temp,0 , l1); - }else { -tcg_gen_brcondi_tl (TCG_COND_EQ , temp,0 , l1); - } - } - bhrb_type |=BHRB_TYPE_COND ; - } -if ((bo &0x10 ) ==0 ) { -/* Test CR */ -uint32_t bi =BI (ctx->opcode); -uint32_t mask =0x08 >> (bi &0x03 ); -TCGv_i32 temp =tcg_temp_new_i32 (); - -if (bo &0x8 ) { -tcg_gen_andi_i32 (temp, cpu_crf[bi >>2 ], mask); -tcg_gen_brcondi_i32 (TCG_COND_EQ , temp,0 , l1); - }else { -tcg_gen_andi_i32 (temp, cpu_crf[bi >>2 ], mask); -tcg_gen_brcondi_i32 (TCG_COND_NE , temp,0 , l1); - } - bhrb_type |=BHRB_TYPE_COND ; - } - -gen_update_branch_history (ctx, ctx->cia, target, bhrb_type); - -if (type ==BCOND_IM ) { -target_ulong li = (target_long)((int16_t )(BD (ctx->opcode))); -if (likely (AA (ctx->opcode) ==0 )) { -gen_goto_tb (ctx,0 , ctx->cia + li); - }else { -gen_goto_tb (ctx,0 , li); - } - }else { -if (NARROW_MODE (ctx)) { -tcg_gen_andi_tl (cpu_nip, target, (uint32_t )~3 ); - }else { -tcg_gen_andi_tl (cpu_nip, target, ~3 ); - } -gen_lookup_and_goto_ptr (ctx); - } -if ((bo &0x14 ) !=0x14 ) { -/* fallthrough case */ -gen_set_label (l1); -gen_goto_tb (ctx,1 , ctx->base.pc_next); - } - ctx->base.is_jmp =DISAS_NORETURN ; -} - -static void gen_bc (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_IM ); -} - -static void gen_bcctr (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_CTR ); -} - -static void gen_bclr (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_LR ); -} - -static void gen_bctar (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_TAR ); -} -/*** Condition register logical ***/ #define GEN_CRLOGIC (name, tcg_op, opc) \ static void glue(gen_, name)(DisasContext *ctx) \@@ -5367,10 +5223,6 @@ GEN_HANDLER(stswx, 0x1F, 0x15, 0x14, 0x00000001, PPC_STRING),/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER(wait, 0x1F, 0x1E, 0x01, 0x039FF801, PPC_WAIT), GEN_HANDLER_E(wait, 0x1F, 0x1E, 0x00, 0x039CF801, PPC_NONE, PPC2_ISA300), -GEN_HANDLER(bc, 0x10, 0xFF, 0xFF, 0x00000000, PPC_FLOW), -GEN_HANDLER(bcctr, 0x13, 0x10, 0x10, 0x00000000, PPC_FLOW), -GEN_HANDLER(bclr, 0x13, 0x10, 0x00, 0x00000000, PPC_FLOW), -GEN_HANDLER_E(bctar, 0x13, 0x10, 0x11, 0x0000E000, PPC_NONE, PPC2_BCTAR_ISA207), GEN_HANDLER(rfi, 0x13, 0x12, 0x01, 0x03FF8001, PPC_FLOW),#if defined(TARGET_PPC64 ) GEN_HANDLER(rfid, 0x13, 0x12, 0x00, 0x03FF8001, PPC_64B),target/ppc/translate/branch-impl.c.inc +147
-0@@ -55,3 +55,160 @@ static bool trans_B(DisasContext *ctx, arg_I_b *a) return true; } + +#define BCOND_IM 0 +#define BCOND_LR 1 +#define BCOND_CTR 2 +#define BCOND_TAR 3 + +static bool bcond_helper(DisasContext *ctx, int type, uint32_t bo, int bi, + int bd, int bh, bool aa, bool lk) +{ + TCGLabel *l1; + TCGv target; + target_long bhrb_type = BHRB_TYPE_OTHER; + + if (type == BCOND_IM && bh != -1) { + /* BCOND_IM should never use bh */ + return false; + } else if (type != BCOND_IM && (bd != -1 || aa != 0)) { + /* Other BCOND types should never use bd or aa */ + return false; + } + + if (type == BCOND_LR || type == BCOND_CTR || type == BCOND_TAR) { + target = tcg_temp_new(); + if (type == BCOND_CTR) { + tcg_gen_mov_tl(target, cpu_ctr); + } else if (type == BCOND_TAR) { + gen_load_spr(target, SPR_TAR); + } else { + tcg_gen_mov_tl(target, cpu_lr); + } + if (!lk) { + bhrb_type |= BHRB_TYPE_INDIRECT; + } + bhrb_type |= BHRB_TYPE_XL_FORM; + } else { + target = NULL; + } + if (lk) { + gen_setlr(ctx, ctx->base.pc_next); + bhrb_type |= BHRB_TYPE_CALL; + } + l1 = gen_new_label(); + if ((bo & 0x4) == 0) { + /* Decrement and test CTR */ + TCGv temp = tcg_temp_new(); + + if (type == BCOND_CTR) { + /* + * All ISAs up to v3 describe this form of bcctr as invalid but + * some processors, ie. 64-bit server processors compliant with + * arch 2.x, do implement a "test and decrement" logic instead, + * as described in their respective UMs. This logic involves CTR + * to act as both the branch target and a counter, which makes + * it basically useless and thus never used in real code. + * + * This form was hence chosen to trigger extra micro-architectural + * side-effect on real HW needed for the Spectre v2 workaround. + * It is up to guests that implement such workaround, ie. linux, to + * use this form in a way it just triggers the side-effect without + * doing anything else harmful. + */ + if (unlikely(!is_book3s_arch2x(ctx))) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true; + } + + if (NARROW_MODE(ctx)) { + tcg_gen_ext32u_tl(temp, cpu_ctr); + } else { + tcg_gen_mov_tl(temp, cpu_ctr); + } + if (bo & 0x2) { + tcg_gen_brcondi_tl(TCG_COND_NE, temp, 0, l1); + } else { + tcg_gen_brcondi_tl(TCG_COND_EQ, temp, 0, l1); + } + tcg_gen_subi_tl(cpu_ctr, cpu_ctr, 1); + } else { + tcg_gen_subi_tl(cpu_ctr, cpu_ctr, 1); + if (NARROW_MODE(ctx)) { + tcg_gen_ext32u_tl(temp, cpu_ctr); + } else { + tcg_gen_mov_tl(temp, cpu_ctr); + } + if (bo & 0x2) { + tcg_gen_brcondi_tl(TCG_COND_NE, temp, 0, l1); + } else { + tcg_gen_brcondi_tl(TCG_COND_EQ, temp, 0, l1); + } + } + bhrb_type |= BHRB_TYPE_COND; + } + if ((bo & 0x10) == 0) { + /* Test CR */ + uint32_t mask = 0x08 >> (bi & 0x03); + TCGv_i32 temp = tcg_temp_new_i32(); + + if (bo & 0x8) { + tcg_gen_andi_i32(temp, cpu_crf[bi >> 2], mask); + tcg_gen_brcondi_i32(TCG_COND_EQ, temp, 0, l1); + } else { + tcg_gen_andi_i32(temp, cpu_crf[bi >> 2], mask); + tcg_gen_brcondi_i32(TCG_COND_NE, temp, 0, l1); + } + bhrb_type |= BHRB_TYPE_COND; + } + + gen_update_branch_history(ctx, ctx->cia, target, bhrb_type); + + if (type == BCOND_IM) { + target_ulong li = (target_long)((int16_t)(bd)); + if (likely(aa == 0)) { + gen_goto_tb(ctx, 0, ctx->cia + li); + } else { + gen_goto_tb(ctx, 0, li); + } + } else { + if (NARROW_MODE(ctx)) { + tcg_gen_andi_tl(cpu_nip, target, (uint32_t)~3); + } else { + tcg_gen_andi_tl(cpu_nip, target, ~3); + } + gen_lookup_and_goto_ptr(ctx); + } + if ((bo & 0x14) != 0x14) { + /* fallthrough case */ + gen_set_label(l1); + gen_goto_tb(ctx, 1, ctx->base.pc_next); + } + ctx->base.is_jmp = DISAS_NORETURN; + + return true; +} + +static bool trans_BC(DisasContext *ctx, arg_bcond *a) +{ + /* + * bh is not used for bc variants hence we pass -1 + */ + return bcond_helper(ctx, BCOND_IM, a->bo, a->bi, a->bd, -1, a->aa, a->lk); +} + +/* + * This helper is shared by bclr, bcctr and bctar. + */ +static bool bclr_helper(DisasContext *ctx, arg_bclr *a, int type) +{target/ppc/translate/branch-impl.c.inc static bool trans_B(DisasContext *ctx, arg_I_b *a) · line 213
Quoted 10 lines
target/ppc/translate/branch-impl.c.inc +10
-0+ /* + * bd and aa is not used for bc variants hence we pass -1 and 0 respectively + */ + return bcond_helper(ctx, type, a->bo, a->bi, -1, a->bh, 0, a->lk); +} + +TRANS(BCLR, bclr_helper, BCOND_LR) +TRANS(BCCTR, bclr_helper, BCOND_CTR) +TRANS(BCTAR, bclr_helper, BCOND_TAR) +The patch looks mostly fine, but I noticed one small issue regarding the bctar instruction.
Quoted 8 lines
Actually, in the legacy implementation, bctar was properly guarded by the ISA 2.07 feature flag like this:
GEN_HANDLER_E(bctar, 0x13, 0x10, 0x11, 0x0000E000, PPC_NONE, PPC2_BCTAR_ISA207)But in the new decodetree implementation, it is getting mapped directly using the standard macro
TRANS(BCTAR, bclr_helper, BCOND_TAR)
Yes you are right, I missed this. Thanks for pointing it out.
Quoted 8 lines
Since the TRANS macro doesn't apply any secondary instruction flags (and even
bclr_helper/bcond_helperare not checking for it), this check is being missed out.It could be better if you can just write a dedicated translation handler for the same to enforce the
BCTAR_ISA207check.
I guess Chinmay can tell better on this.
I think we can just do the following and it should be good enough:
-TRANS(BCTAR, bclr_helper, BCOND_TAR) +TRANS_FLAGS2(BCTAR_ISA207, BCTAR, bclr_helper, BCOND_TAR)
If this looks okay, I can send a v2.
Regards,
ojaswin
Quoted 4 lines
Thanks
~ Nikhil
Re: [RFC PATCH 15/28] target/ppc: move various conditional branch insns to decodetree
Quoted 397 lines · Ojaswin Mujoo
Quoted 7 lines · Nikhil Kumar Singh
Quoted 3 lines · Chinmay Rath
From: Ojaswin Mujoo<[email protected]>
Convert the following instrunctions to decodetree specification:
The word should be spelled
instructionsand notinstrunctions. Please fix this in the
commit message.Hi Nikhil, thanks for the review. I'll make the change.
Quoted 388 lines
Quoted 370 lines
bc
bca
bcl
bclabclr
bclrlbcctr
bcctrlbctar
bctarlThe branch was tested by comparing the qemu -D log -d op,in_asm output for each instruction and also for the various combinations of branch option (BO) bits for the conditional branch instructions. Additionally, gdb was used to confirm the LR and other register's behavior is consistent to legacy behavior.
Further, the changes also pass a boot test into Fedora distro.
Signed-off-by Ojaswin Mujoo<[email protected]>Signed-off-by Chinmay Rath<[email protected]>--- target/ppc/insn32.decode | 13 ++ target/ppc/translate.c | 148 ----------------------- target/ppc/translate/branch-impl.c.inc | 157 +++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 148 deletions(-)target/ppc/insn32.decode +13
-0@@ -1485,6 +1485,19 @@ CLRBHRB 011111 ----- ----- ----- 0110101110 - B 010010 ........................ . . @I_b +%bd 2:14 !function=times_4 +&bcond bo:uint32_t bi bd aa:bool lk:bool +@B_bcond ...... bo:5 bi:5 .............. aa:1 lk:1 &bcond bd=%bd + +BC 010000 ..... ..... .............. . . @B_bcond + +&bclr bo bi bh lk:bool +@XL_bclr ...... bo:5 bi:5 --- bh:2 .......... lk:1 &bclr + +BCLR 010011 ..... ..... ---.. 0000010000 . @XL_bclr +BCCTR 010011 ..... ..... ---.. 1000010000 . @XL_bclr +BCTAR 010011 ..... ..... ---.. 1000110000 . @XL_bclr + ## Misc POWER instructions ATTN 000000 00000 00000 00000 0100000000 0target/ppc/translate.c +0
-148@@ -3089,150 +3089,6 @@ static inline void gen_setlr(DisasContext *ctx, target_ulong nip)tcg_gen_movi_tl (cpu_lr, nip); } -#define BCOND_IM 0 -#define BCOND_LR 1 -#define BCOND_CTR 2 -#define BCOND_TAR 3 - -static void gen_bcond (DisasContext *ctx,int type) -{ -uint32_t bo =BO (ctx->opcode); -TCGLabel *l1; -TCGv target; -target_long bhrb_type =BHRB_TYPE_OTHER ; - -if (type ==BCOND_LR || type ==BCOND_CTR || type ==BCOND_TAR ) { - target =tcg_temp_new (); -if (type ==BCOND_CTR ) { -tcg_gen_mov_tl (target, cpu_ctr); - }else if (type ==BCOND_TAR ) { -gen_load_spr (target,SPR_TAR ); - }else { -tcg_gen_mov_tl (target, cpu_lr); - } -if (!LK (ctx->opcode)) { - bhrb_type |=BHRB_TYPE_INDIRECT ; - } - bhrb_type |=BHRB_TYPE_XL_FORM ; - }else { - target =NULL ; - } -if (LK (ctx->opcode)) { -gen_setlr (ctx, ctx->base.pc_next); - bhrb_type |=BHRB_TYPE_CALL ; - } - l1 =gen_new_label (); -if ((bo &0x4 ) ==0 ) { -/* Decrement and test CTR */ -TCGv temp =tcg_temp_new (); - -if (type ==BCOND_CTR ) { -/* -* All ISAs up to v3 describe this form of bcctr as invalid but -* some processors, ie. 64-bit server processors compliant with -* arch 2.x, do implement a "test and decrement" logic instead, -* as described in their respective UMs. This logic involves CTR -* to act as both the branch target and a counter, which makes -* it basically useless and thus never used in real code. -* -* This form was hence chosen to trigger extra micro-architectural -* side-effect on real HW needed for the Spectre v2 workaround. -* It is up to guests that implement such workaround, ie. linux, to -* use this form in a way it just triggers the side-effect without -* doing anything else harmful. -*/ -if (unlikely (!is_book3s_arch2x (ctx))) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); -return ; - } - -if (NARROW_MODE (ctx)) { -tcg_gen_ext32u_tl (temp, cpu_ctr); - }else { -tcg_gen_mov_tl (temp, cpu_ctr); - } -if (bo &0x2 ) { -tcg_gen_brcondi_tl (TCG_COND_NE , temp,0 , l1); - }else { -tcg_gen_brcondi_tl (TCG_COND_EQ , temp,0 , l1); - } -tcg_gen_subi_tl (cpu_ctr, cpu_ctr,1 ); - }else { -tcg_gen_subi_tl (cpu_ctr, cpu_ctr,1 ); -if (NARROW_MODE (ctx)) { -tcg_gen_ext32u_tl (temp, cpu_ctr); - }else { -tcg_gen_mov_tl (temp, cpu_ctr); - } -if (bo &0x2 ) { -tcg_gen_brcondi_tl (TCG_COND_NE , temp,0 , l1); - }else { -tcg_gen_brcondi_tl (TCG_COND_EQ , temp,0 , l1); - } - } - bhrb_type |=BHRB_TYPE_COND ; - } -if ((bo &0x10 ) ==0 ) { -/* Test CR */ -uint32_t bi =BI (ctx->opcode); -uint32_t mask =0x08 >> (bi &0x03 ); -TCGv_i32 temp =tcg_temp_new_i32 (); - -if (bo &0x8 ) { -tcg_gen_andi_i32 (temp, cpu_crf[bi >>2 ], mask); -tcg_gen_brcondi_i32 (TCG_COND_EQ , temp,0 , l1); - }else { -tcg_gen_andi_i32 (temp, cpu_crf[bi >>2 ], mask); -tcg_gen_brcondi_i32 (TCG_COND_NE , temp,0 , l1); - } - bhrb_type |=BHRB_TYPE_COND ; - } - -gen_update_branch_history (ctx, ctx->cia, target, bhrb_type); - -if (type ==BCOND_IM ) { -target_ulong li = (target_long)((int16_t )(BD (ctx->opcode))); -if (likely (AA (ctx->opcode) ==0 )) { -gen_goto_tb (ctx,0 , ctx->cia + li); - }else { -gen_goto_tb (ctx,0 , li); - } - }else { -if (NARROW_MODE (ctx)) { -tcg_gen_andi_tl (cpu_nip, target, (uint32_t )~3 ); - }else { -tcg_gen_andi_tl (cpu_nip, target, ~3 ); - } -gen_lookup_and_goto_ptr (ctx); - } -if ((bo &0x14 ) !=0x14 ) { -/* fallthrough case */ -gen_set_label (l1); -gen_goto_tb (ctx,1 , ctx->base.pc_next); - } - ctx->base.is_jmp =DISAS_NORETURN ; -} - -static void gen_bc (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_IM ); -} - -static void gen_bcctr (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_CTR ); -} - -static void gen_bclr (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_LR ); -} - -static void gen_bctar (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_TAR ); -} -/*** Condition register logical ***/ #define GEN_CRLOGIC (name, tcg_op, opc) \ static void glue(gen_, name)(DisasContext *ctx) \@@ -5367,10 +5223,6 @@ GEN_HANDLER(stswx, 0x1F, 0x15, 0x14, 0x00000001, PPC_STRING),/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER(wait, 0x1F, 0x1E, 0x01, 0x039FF801, PPC_WAIT), GEN_HANDLER_E(wait, 0x1F, 0x1E, 0x00, 0x039CF801, PPC_NONE, PPC2_ISA300), -GEN_HANDLER(bc, 0x10, 0xFF, 0xFF, 0x00000000, PPC_FLOW), -GEN_HANDLER(bcctr, 0x13, 0x10, 0x10, 0x00000000, PPC_FLOW), -GEN_HANDLER(bclr, 0x13, 0x10, 0x00, 0x00000000, PPC_FLOW), -GEN_HANDLER_E(bctar, 0x13, 0x10, 0x11, 0x0000E000, PPC_NONE, PPC2_BCTAR_ISA207), GEN_HANDLER(rfi, 0x13, 0x12, 0x01, 0x03FF8001, PPC_FLOW),#if defined(TARGET_PPC64 ) GEN_HANDLER(rfid, 0x13, 0x12, 0x00, 0x03FF8001, PPC_64B),target/ppc/translate/branch-impl.c.inc +147
-0@@ -55,3 +55,160 @@ static bool trans_B(DisasContext *ctx, arg_I_b *a) return true; } + +#define BCOND_IM 0 +#define BCOND_LR 1 +#define BCOND_CTR 2 +#define BCOND_TAR 3 + +static bool bcond_helper(DisasContext *ctx, int type, uint32_t bo, int bi, + int bd, int bh, bool aa, bool lk) +{ + TCGLabel *l1; + TCGv target; + target_long bhrb_type = BHRB_TYPE_OTHER; + + if (type == BCOND_IM && bh != -1) { + /* BCOND_IM should never use bh */ + return false; + } else if (type != BCOND_IM && (bd != -1 || aa != 0)) { + /* Other BCOND types should never use bd or aa */ + return false; + } + + if (type == BCOND_LR || type == BCOND_CTR || type == BCOND_TAR) { + target = tcg_temp_new(); + if (type == BCOND_CTR) { + tcg_gen_mov_tl(target, cpu_ctr); + } else if (type == BCOND_TAR) { + gen_load_spr(target, SPR_TAR); + } else { + tcg_gen_mov_tl(target, cpu_lr); + } + if (!lk) { + bhrb_type |= BHRB_TYPE_INDIRECT; + } + bhrb_type |= BHRB_TYPE_XL_FORM; + } else { + target = NULL; + } + if (lk) { + gen_setlr(ctx, ctx->base.pc_next); + bhrb_type |= BHRB_TYPE_CALL; + } + l1 = gen_new_label(); + if ((bo & 0x4) == 0) { + /* Decrement and test CTR */ + TCGv temp = tcg_temp_new(); + + if (type == BCOND_CTR) { + /* + * All ISAs up to v3 describe this form of bcctr as invalid but + * some processors, ie. 64-bit server processors compliant with + * arch 2.x, do implement a "test and decrement" logic instead, + * as described in their respective UMs. This logic involves CTR + * to act as both the branch target and a counter, which makes + * it basically useless and thus never used in real code. + * + * This form was hence chosen to trigger extra micro-architectural + * side-effect on real HW needed for the Spectre v2 workaround. + * It is up to guests that implement such workaround, ie. linux, to + * use this form in a way it just triggers the side-effect without + * doing anything else harmful. + */ + if (unlikely(!is_book3s_arch2x(ctx))) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true; + } + + if (NARROW_MODE(ctx)) { + tcg_gen_ext32u_tl(temp, cpu_ctr); + } else { + tcg_gen_mov_tl(temp, cpu_ctr); + } + if (bo & 0x2) { + tcg_gen_brcondi_tl(TCG_COND_NE, temp, 0, l1); + } else { + tcg_gen_brcondi_tl(TCG_COND_EQ, temp, 0, l1); + } + tcg_gen_subi_tl(cpu_ctr, cpu_ctr, 1); + } else { + tcg_gen_subi_tl(cpu_ctr, cpu_ctr, 1); + if (NARROW_MODE(ctx)) { + tcg_gen_ext32u_tl(temp, cpu_ctr); + } else { + tcg_gen_mov_tl(temp, cpu_ctr); + } + if (bo & 0x2) { + tcg_gen_brcondi_tl(TCG_COND_NE, temp, 0, l1); + } else { + tcg_gen_brcondi_tl(TCG_COND_EQ, temp, 0, l1); + } + } + bhrb_type |= BHRB_TYPE_COND; + } + if ((bo & 0x10) == 0) { + /* Test CR */ + uint32_t mask = 0x08 >> (bi & 0x03); + TCGv_i32 temp = tcg_temp_new_i32(); + + if (bo & 0x8) { + tcg_gen_andi_i32(temp, cpu_crf[bi >> 2], mask); + tcg_gen_brcondi_i32(TCG_COND_EQ, temp, 0, l1); + } else { + tcg_gen_andi_i32(temp, cpu_crf[bi >> 2], mask); + tcg_gen_brcondi_i32(TCG_COND_NE, temp, 0, l1); + } + bhrb_type |= BHRB_TYPE_COND; + } + + gen_update_branch_history(ctx, ctx->cia, target, bhrb_type); + + if (type == BCOND_IM) { + target_ulong li = (target_long)((int16_t)(bd)); + if (likely(aa == 0)) { + gen_goto_tb(ctx, 0, ctx->cia + li); + } else { + gen_goto_tb(ctx, 0, li); + } + } else { + if (NARROW_MODE(ctx)) { + tcg_gen_andi_tl(cpu_nip, target, (uint32_t)~3); + } else { + tcg_gen_andi_tl(cpu_nip, target, ~3); + } + gen_lookup_and_goto_ptr(ctx); + } + if ((bo & 0x14) != 0x14) { + /* fallthrough case */ + gen_set_label(l1); + gen_goto_tb(ctx, 1, ctx->base.pc_next); + } + ctx->base.is_jmp = DISAS_NORETURN; + + return true; +} + +static bool trans_BC(DisasContext *ctx, arg_bcond *a) +{ + /* + * bh is not used for bc variants hence we pass -1 + */ + return bcond_helper(ctx, BCOND_IM, a->bo, a->bi, a->bd, -1, a->aa, a->lk); +} + +/* + * This helper is shared by bclr, bcctr and bctar. + */ +static bool bclr_helper(DisasContext *ctx, arg_bclr *a, int type) +{target/ppc/translate/branch-impl.c.inc static bool trans_B(DisasContext *ctx, arg_I_b *a) · line 213
Quoted 10 lines
target/ppc/translate/branch-impl.c.inc +10
-0+ /* + * bd and aa is not used for bc variants hence we pass -1 and 0 respectively + */ + return bcond_helper(ctx, type, a->bo, a->bi, -1, a->bh, 0, a->lk); +} + +TRANS(BCLR, bclr_helper, BCOND_LR) +TRANS(BCCTR, bclr_helper, BCOND_CTR) +TRANS(BCTAR, bclr_helper, BCOND_TAR) +The patch looks mostly fine, but I noticed one small issue regarding the bctar instruction.
Actually, in the legacy implementation, bctar was properly guarded by the ISA 2.07 feature flag like this:
GEN_HANDLER_E(bctar, 0x13, 0x10, 0x11, 0x0000E000, PPC_NONE, PPC2_BCTAR_ISA207)
Quoted 8 lines
Quoted 3 lines
But in the new decodetree implementation, it is getting mapped directly using the standard macro
TRANS(BCTAR, bclr_helper, BCOND_TAR)Yes you are right, I missed this. Thanks for pointing it out.
Quoted 3 lines
Since the TRANS macro doesn't apply any secondary instruction flags (and even
bclr_helper/bcond_helperare not checking for it), this check is being missed out.
Hi Nikhil,
Thanks for catching this !
Quoted 10 lines
Quoted 4 lines
It could be better if you can just write a dedicated translation handler for the same to enforce the
BCTAR_ISA207check.
I guess Chinmay can tell better on this.I think we can just do the following and it should be good enough:
(quoted diff) +1
-1-TRANS(BCTAR, bclr_helper, BCOND_TAR) +TRANS_FLAGS2(BCTAR_ISA207, BCTAR, bclr_helper, BCOND_TAR)If this looks okay, I can send a v2.
Hi Ojas,
Since it is just a single line change, I will take care of it while posting v2 series.
Regards,
Chinmay
Quoted 7 lines
Regards,
ojaswinQuoted 3 lines
Thanks
~ Nikhil
Re: [RFC PATCH 15/28] target/ppc: move various conditional branch insns to decodetree
Quoted 415 lines · Chinmay Rath
Quoted 397 lines · Ojaswin Mujoo
Quoted 7 lines · Nikhil Kumar Singh
Quoted 3 lines · Chinmay Rath
From: Ojaswin Mujoo<[email protected]>
Convert the following instrunctions to decodetree specification:
The word should be spelled
instructionsand notinstrunctions. Please fix this in the
commit message.Hi Nikhil, thanks for the review. I'll make the change.
Quoted 388 lines
Quoted 370 lines
bc
bca
bcl
bclabclr
bclrlbcctr
bcctrlbctar
bctarlThe branch was tested by comparing the qemu -D log -d op,in_asm output for each instruction and also for the various combinations of branch option (BO) bits for the conditional branch instructions. Additionally, gdb was used to confirm the LR and other register's behavior is consistent to legacy behavior.
Further, the changes also pass a boot test into Fedora distro.
Signed-off-by Ojaswin Mujoo<[email protected]>Signed-off-by Chinmay Rath<[email protected]>--- target/ppc/insn32.decode | 13 ++ target/ppc/translate.c | 148 ----------------------- target/ppc/translate/branch-impl.c.inc | 157 +++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 148 deletions(-)target/ppc/insn32.decode +13
-0@@ -1485,6 +1485,19 @@ CLRBHRB 011111 ----- ----- ----- 0110101110 - B 010010 ........................ . . @I_b +%bd 2:14 !function=times_4 +&bcond bo:uint32_t bi bd aa:bool lk:bool +@B_bcond ...... bo:5 bi:5 .............. aa:1 lk:1 &bcond bd=%bd + +BC 010000 ..... ..... .............. . . @B_bcond + +&bclr bo bi bh lk:bool +@XL_bclr ...... bo:5 bi:5 --- bh:2 .......... lk:1 &bclr + +BCLR 010011 ..... ..... ---.. 0000010000 . @XL_bclr +BCCTR 010011 ..... ..... ---.. 1000010000 . @XL_bclr +BCTAR 010011 ..... ..... ---.. 1000110000 . @XL_bclr + ## Misc POWER instructions ATTN 000000 00000 00000 00000 0100000000 0target/ppc/translate.c +0
-148@@ -3089,150 +3089,6 @@ static inline void gen_setlr(DisasContext *ctx, target_ulong nip)tcg_gen_movi_tl (cpu_lr, nip); } -#define BCOND_IM 0 -#define BCOND_LR 1 -#define BCOND_CTR 2 -#define BCOND_TAR 3 - -static void gen_bcond (DisasContext *ctx,int type) -{ -uint32_t bo =BO (ctx->opcode); -TCGLabel *l1; -TCGv target; -target_long bhrb_type =BHRB_TYPE_OTHER ; - -if (type ==BCOND_LR || type ==BCOND_CTR || type ==BCOND_TAR ) { - target =tcg_temp_new (); -if (type ==BCOND_CTR ) { -tcg_gen_mov_tl (target, cpu_ctr); - }else if (type ==BCOND_TAR ) { -gen_load_spr (target,SPR_TAR ); - }else { -tcg_gen_mov_tl (target, cpu_lr); - } -if (!LK (ctx->opcode)) { - bhrb_type |=BHRB_TYPE_INDIRECT ; - } - bhrb_type |=BHRB_TYPE_XL_FORM ; - }else { - target =NULL ; - } -if (LK (ctx->opcode)) { -gen_setlr (ctx, ctx->base.pc_next); - bhrb_type |=BHRB_TYPE_CALL ; - } - l1 =gen_new_label (); -if ((bo &0x4 ) ==0 ) { -/* Decrement and test CTR */ -TCGv temp =tcg_temp_new (); - -if (type ==BCOND_CTR ) { -/* -* All ISAs up to v3 describe this form of bcctr as invalid but -* some processors, ie. 64-bit server processors compliant with -* arch 2.x, do implement a "test and decrement" logic instead, -* as described in their respective UMs. This logic involves CTR -* to act as both the branch target and a counter, which makes -* it basically useless and thus never used in real code. -* -* This form was hence chosen to trigger extra micro-architectural -* side-effect on real HW needed for the Spectre v2 workaround. -* It is up to guests that implement such workaround, ie. linux, to -* use this form in a way it just triggers the side-effect without -* doing anything else harmful. -*/ -if (unlikely (!is_book3s_arch2x (ctx))) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); -return ; - } - -if (NARROW_MODE (ctx)) { -tcg_gen_ext32u_tl (temp, cpu_ctr); - }else { -tcg_gen_mov_tl (temp, cpu_ctr); - } -if (bo &0x2 ) { -tcg_gen_brcondi_tl (TCG_COND_NE , temp,0 , l1); - }else { -tcg_gen_brcondi_tl (TCG_COND_EQ , temp,0 , l1); - } -tcg_gen_subi_tl (cpu_ctr, cpu_ctr,1 ); - }else { -tcg_gen_subi_tl (cpu_ctr, cpu_ctr,1 ); -if (NARROW_MODE (ctx)) { -tcg_gen_ext32u_tl (temp, cpu_ctr); - }else { -tcg_gen_mov_tl (temp, cpu_ctr); - } -if (bo &0x2 ) { -tcg_gen_brcondi_tl (TCG_COND_NE , temp,0 , l1); - }else { -tcg_gen_brcondi_tl (TCG_COND_EQ , temp,0 , l1); - } - } - bhrb_type |=BHRB_TYPE_COND ; - } -if ((bo &0x10 ) ==0 ) { -/* Test CR */ -uint32_t bi =BI (ctx->opcode); -uint32_t mask =0x08 >> (bi &0x03 ); -TCGv_i32 temp =tcg_temp_new_i32 (); - -if (bo &0x8 ) { -tcg_gen_andi_i32 (temp, cpu_crf[bi >>2 ], mask); -tcg_gen_brcondi_i32 (TCG_COND_EQ , temp,0 , l1); - }else { -tcg_gen_andi_i32 (temp, cpu_crf[bi >>2 ], mask); -tcg_gen_brcondi_i32 (TCG_COND_NE , temp,0 , l1); - } - bhrb_type |=BHRB_TYPE_COND ; - } - -gen_update_branch_history (ctx, ctx->cia, target, bhrb_type); - -if (type ==BCOND_IM ) { -target_ulong li = (target_long)((int16_t )(BD (ctx->opcode))); -if (likely (AA (ctx->opcode) ==0 )) { -gen_goto_tb (ctx,0 , ctx->cia + li); - }else { -gen_goto_tb (ctx,0 , li); - } - }else { -if (NARROW_MODE (ctx)) { -tcg_gen_andi_tl (cpu_nip, target, (uint32_t )~3 ); - }else { -tcg_gen_andi_tl (cpu_nip, target, ~3 ); - } -gen_lookup_and_goto_ptr (ctx); - } -if ((bo &0x14 ) !=0x14 ) { -/* fallthrough case */ -gen_set_label (l1); -gen_goto_tb (ctx,1 , ctx->base.pc_next); - } - ctx->base.is_jmp =DISAS_NORETURN ; -} - -static void gen_bc (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_IM ); -} - -static void gen_bcctr (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_CTR ); -} - -static void gen_bclr (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_LR ); -} - -static void gen_bctar (DisasContext *ctx) -{ -gen_bcond (ctx,BCOND_TAR ); -} -/*** Condition register logical ***/ #define GEN_CRLOGIC (name, tcg_op, opc) \ static void glue(gen_, name)(DisasContext *ctx) \@@ -5367,10 +5223,6 @@ GEN_HANDLER(stswx, 0x1F, 0x15, 0x14, 0x00000001, PPC_STRING),/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER(wait, 0x1F, 0x1E, 0x01, 0x039FF801, PPC_WAIT), GEN_HANDLER_E(wait, 0x1F, 0x1E, 0x00, 0x039CF801, PPC_NONE, PPC2_ISA300), -GEN_HANDLER(bc, 0x10, 0xFF, 0xFF, 0x00000000, PPC_FLOW), -GEN_HANDLER(bcctr, 0x13, 0x10, 0x10, 0x00000000, PPC_FLOW), -GEN_HANDLER(bclr, 0x13, 0x10, 0x00, 0x00000000, PPC_FLOW), -GEN_HANDLER_E(bctar, 0x13, 0x10, 0x11, 0x0000E000, PPC_NONE, PPC2_BCTAR_ISA207), GEN_HANDLER(rfi, 0x13, 0x12, 0x01, 0x03FF8001, PPC_FLOW),#if defined(TARGET_PPC64 ) GEN_HANDLER(rfid, 0x13, 0x12, 0x00, 0x03FF8001, PPC_64B),target/ppc/translate/branch-impl.c.inc +147
-0@@ -55,3 +55,160 @@ static bool trans_B(DisasContext *ctx, arg_I_b *a) return true; } + +#define BCOND_IM 0 +#define BCOND_LR 1 +#define BCOND_CTR 2 +#define BCOND_TAR 3 + +static bool bcond_helper(DisasContext *ctx, int type, uint32_t bo, int bi, + int bd, int bh, bool aa, bool lk) +{ + TCGLabel *l1; + TCGv target; + target_long bhrb_type = BHRB_TYPE_OTHER; + + if (type == BCOND_IM && bh != -1) { + /* BCOND_IM should never use bh */ + return false; + } else if (type != BCOND_IM && (bd != -1 || aa != 0)) { + /* Other BCOND types should never use bd or aa */ + return false; + } + + if (type == BCOND_LR || type == BCOND_CTR || type == BCOND_TAR) { + target = tcg_temp_new(); + if (type == BCOND_CTR) { + tcg_gen_mov_tl(target, cpu_ctr); + } else if (type == BCOND_TAR) { + gen_load_spr(target, SPR_TAR); + } else { + tcg_gen_mov_tl(target, cpu_lr); + } + if (!lk) { + bhrb_type |= BHRB_TYPE_INDIRECT; + } + bhrb_type |= BHRB_TYPE_XL_FORM; + } else { + target = NULL; + } + if (lk) { + gen_setlr(ctx, ctx->base.pc_next); + bhrb_type |= BHRB_TYPE_CALL; + } + l1 = gen_new_label(); + if ((bo & 0x4) == 0) { + /* Decrement and test CTR */ + TCGv temp = tcg_temp_new(); + + if (type == BCOND_CTR) { + /* + * All ISAs up to v3 describe this form of bcctr as invalid but + * some processors, ie. 64-bit server processors compliant with + * arch 2.x, do implement a "test and decrement" logic instead, + * as described in their respective UMs. This logic involves CTR + * to act as both the branch target and a counter, which makes + * it basically useless and thus never used in real code. + * + * This form was hence chosen to trigger extra micro-architectural + * side-effect on real HW needed for the Spectre v2 workaround. + * It is up to guests that implement such workaround, ie. linux, to + * use this form in a way it just triggers the side-effect without + * doing anything else harmful. + */ + if (unlikely(!is_book3s_arch2x(ctx))) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); + return true; + } + + if (NARROW_MODE(ctx)) { + tcg_gen_ext32u_tl(temp, cpu_ctr); + } else { + tcg_gen_mov_tl(temp, cpu_ctr); + } + if (bo & 0x2) { + tcg_gen_brcondi_tl(TCG_COND_NE, temp, 0, l1); + } else { + tcg_gen_brcondi_tl(TCG_COND_EQ, temp, 0, l1); + } + tcg_gen_subi_tl(cpu_ctr, cpu_ctr, 1); + } else { + tcg_gen_subi_tl(cpu_ctr, cpu_ctr, 1); + if (NARROW_MODE(ctx)) { + tcg_gen_ext32u_tl(temp, cpu_ctr); + } else { + tcg_gen_mov_tl(temp, cpu_ctr); + } + if (bo & 0x2) { + tcg_gen_brcondi_tl(TCG_COND_NE, temp, 0, l1); + } else { + tcg_gen_brcondi_tl(TCG_COND_EQ, temp, 0, l1); + } + } + bhrb_type |= BHRB_TYPE_COND; + } + if ((bo & 0x10) == 0) { + /* Test CR */ + uint32_t mask = 0x08 >> (bi & 0x03); + TCGv_i32 temp = tcg_temp_new_i32(); + + if (bo & 0x8) { + tcg_gen_andi_i32(temp, cpu_crf[bi >> 2], mask); + tcg_gen_brcondi_i32(TCG_COND_EQ, temp, 0, l1); + } else { + tcg_gen_andi_i32(temp, cpu_crf[bi >> 2], mask); + tcg_gen_brcondi_i32(TCG_COND_NE, temp, 0, l1); + } + bhrb_type |= BHRB_TYPE_COND; + } + + gen_update_branch_history(ctx, ctx->cia, target, bhrb_type); + + if (type == BCOND_IM) { + target_ulong li = (target_long)((int16_t)(bd)); + if (likely(aa == 0)) { + gen_goto_tb(ctx, 0, ctx->cia + li); + } else { + gen_goto_tb(ctx, 0, li); + } + } else { + if (NARROW_MODE(ctx)) { + tcg_gen_andi_tl(cpu_nip, target, (uint32_t)~3); + } else { + tcg_gen_andi_tl(cpu_nip, target, ~3); + } + gen_lookup_and_goto_ptr(ctx); + } + if ((bo & 0x14) != 0x14) { + /* fallthrough case */ + gen_set_label(l1); + gen_goto_tb(ctx, 1, ctx->base.pc_next); + } + ctx->base.is_jmp = DISAS_NORETURN; + + return true; +} + +static bool trans_BC(DisasContext *ctx, arg_bcond *a) +{ + /* + * bh is not used for bc variants hence we pass -1 + */ + return bcond_helper(ctx, BCOND_IM, a->bo, a->bi, a->bd, -1, a->aa, a->lk); +} + +/* + * This helper is shared by bclr, bcctr and bctar. + */ +static bool bclr_helper(DisasContext *ctx, arg_bclr *a, int type) +{target/ppc/translate/branch-impl.c.inc static bool trans_B(DisasContext *ctx, arg_I_b *a) · line 213
Quoted 10 lines
target/ppc/translate/branch-impl.c.inc +10
-0+ /* + * bd and aa is not used for bc variants hence we pass -1 and 0 respectively + */ + return bcond_helper(ctx, type, a->bo, a->bi, -1, a->bh, 0, a->lk); +} + +TRANS(BCLR, bclr_helper, BCOND_LR) +TRANS(BCCTR, bclr_helper, BCOND_CTR) +TRANS(BCTAR, bclr_helper, BCOND_TAR) +The patch looks mostly fine, but I noticed one small issue regarding the bctar instruction.
Actually, in the legacy implementation, bctar was properly guarded by the ISA 2.07 feature flag like this:
GEN_HANDLER_E(bctar, 0x13, 0x10, 0x11, 0x0000E000, PPC_NONE, PPC2_BCTAR_ISA207)Quoted 8 lines
Quoted 3 lines
But in the new decodetree implementation, it is getting mapped directly using the standard macro
TRANS(BCTAR, bclr_helper, BCOND_TAR)Yes you are right, I missed this. Thanks for pointing it out.
Quoted 3 lines
Since the TRANS macro doesn't apply any secondary instruction flags (and even
bclr_helper/bcond_helperare not checking for it), this check is being missed out.Hi Nikhil,
Thanks for catching this !Quoted 6 lines
Quoted 4 lines
It could be better if you can just write a dedicated translation handler for the same to enforce the
BCTAR_ISA207check.
I guess Chinmay can tell better on this.I think we can just do the following and it should be good enough:
Quoted 8 lines
Quoted 4 lines
(quoted diff) +1
-1-TRANS(BCTAR, bclr_helper, BCOND_TAR) +TRANS_FLAGS2(BCTAR_ISA207, BCTAR, bclr_helper, BCOND_TAR)If this looks okay, I can send a v2.
Hi Ojas,
Since it is just a single line change, I will take care of it while posting v2 series.
Sure Chinmay, thanks!
Quoted 12 lines
Regards,
ChinmayQuoted 7 lines
Regards,
ojaswinQuoted 3 lines
Thanks
~ Nikhil
RFC PATCH 16/28 target/ppc: Fix TRANS* macro variadic arguments handling
In reply to Chinmay RathFrom: Ojaswin Mujoo <[email protected]>
Use ##__VA_ARGS__ in TRANS* macros to allow variadic arguments to be optional instead of mandatory. "##" removes the preceding comma when __VA_ARGS__ is empty, enabling macros to work with functions that don't need extra parameters.
This avoid compilation errors when using a pattern like below:
static bool do_wait(DisasContext *ctx, arg_X_wait *a) {...}
TRANS_FLAGS(WAIT, WAIT_ISA_2_X, do_wait)
Compilation Error:../target/ppc/translate.c:5526:40: error: expected expression before ‘)’ token
5526 | return FUNC(ctx, a, __VA_ARGS__); \
| ^
../target/ppc/translate/storage-ctrl-impl.c.inc:368:1: note: in expansion of macro ‘TRANS_FLAGS’
368 | TRANS_FLAGS(WAIT, WAIT_ISA_2_X, do_wait)
--- target/ppc/translate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
target/ppc/translate.c +5 -5
@@ -4719,29 +4719,29 @@ static int64_t dw_compose_ea(DisasContext *ctx, int x)*/ #define TRANS (NAME ,FUNC , ...) \ static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ - { return FUNC(ctx, a, __VA_ARGS__); } + { return FUNC(ctx, a, ##__VA_ARGS__); }#define TRANS_FLAGS (FLAGS ,NAME ,FUNC , ...) \ static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ { \ REQUIRE_INSNS_FLAGS(ctx, FLAGS); \ - return FUNC(ctx, a, __VA_ARGS__); \ + return FUNC(ctx, a, ##__VA_ARGS__); \ }#define TRANS_FLAGS2 (FLAGS2 ,NAME ,FUNC , ...) \ static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ { \ REQUIRE_INSNS_FLAGS2(ctx, FLAGS2); \ - return FUNC(ctx, a, __VA_ARGS__); \ + 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__); } + { REQUIRE_64BIT(ctx); return FUNC(ctx, a, ##__VA_ARGS__); }#define TRANS64_FLAGS2 (FLAGS2 ,NAME ,FUNC , ...) \ static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ { \ REQUIRE_64BIT(ctx); \ REQUIRE_INSNS_FLAGS2(ctx, FLAGS2); \ - return FUNC(ctx, a, __VA_ARGS__); \ + return FUNC(ctx, a, ##__VA_ARGS__); \ }/* TODO: More TRANS* helpers for extra insn_flags checks. */
Signature · 1 line
2.53.0
RFC PATCH 17/28 target/ppc: Move wait instruction to decodetree
In reply to Chinmay RathFrom: Ojaswin Mujoo <[email protected]>
Implement wait instruction using decodetree with proper handling of WC and PL fields across different ISA versions. Since the opcode changed between ISA 2.x and 3.x we have defined 2 different decodetree instructions that are handled by the same helper.
The changes have been tested by comparing the tcg generated before and after the change for wait instruction. The test was repeated for 2 types of machines:
Power10 - which should use the newer wait implementation e500mc - which should use older PPC_WAIT implementation
Both generated the same tcg ops with and without the change. Further, with the changes we were able to boot into Fedora distro as well.
--- target/ppc/insn32.decode | 15 +++ target/ppc/translate.c | 91 ----------------- target/ppc/translate/storage-ctrl-impl.c.inc | 100 +++++++++++++++++++ 3 files changed, 115 insertions(+), 91 deletions(-)
target/ppc/insn32.decode +15 -0
@@ -1470,6 +1470,21 @@ ISYNC 010011 ----- ----- ----- 0010010110 - @XL_bfa ...... bf:3 .. bfa:3 .. ..... ..... ..... . MCRF 010011 ... -- ... -- ----- 00000 00000 - @XL_bfa +# Wait Instructions + +# We can use the same X_wait argument set for both WAIT and older ISA2.x +# compliant WAIT_2_x. Depending on the version, we may or may not use the +# arguments. For more information, check do_wait() helper. + +&X_wait wc pl +@X_wait ...... ..- wc:2 --- pl:2 ----- .......... - &X_wait + +# According to ISA v3.1, bit 6 and 7 are implementation dependent and "unless +# the intention is to use the implementation-dependent field, these bits must be +# coded zero". Hence, we code them to 0. +WAIT 011111 00-.. ---.. ----- 0000011110 - @X_wait +WAIT_ISA_2_X 011111 ---.. ---.. ----- 0000111110 - @X_wait + # Branch History Rolling Buffer (BHRB) Instructions &XFX_bhrbe rt bhrbe
target/ppc/translate.c +0 -91
103 lines not on this page · raw message
target/ppc/translate/storage-ctrl-impl.c.inc +100 -0
103 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH 18/28 target/ppc: Move sleep & friends to decodetree
In reply to Chinmay RathFrom: Ojaswin Mujoo <[email protected]>
Convert the following instructions to decode tree specification:
doze
nap
sleep
rvwinkle
stop
The functionality was tested by comparing the qemu -D log -d op,in_asm output as well as single stepping gdb to confirm behavior was not changed for ISA3.x (stop) as well as ISA206 (doze, nap, sleep, rvwinkle).
--- target/ppc/insn32.decode | 8 ++ target/ppc/translate.c | 85 --------------- .../ppc/translate/processor-ctrl-impl.c.inc | 101 ++++++++++++++++++ 3 files changed, 109 insertions(+), 85 deletions(-)
target/ppc/insn32.decode +8 -0
@@ -913,6 +913,14 @@ VPERMR 000100 ..... ..... ..... ..... 111011 @VA VSEL 000100 ..... ..... ..... ..... 101010 @VA +## Power Management Instructions + +DOZE 010011 ----- ----- ----- 0110010010 - +NAP 010011 ----- ----- ----- 0110110010 - +SLEEP 010011 ----- ----- ----- 0111010010 - +RVWINKLE 010011 ----- ----- ----- 0111110010 - +STOP 010011 ----- ----- ----- 0101110010 - + ## Vector Integer Shift Instruction VSLB 000100 ..... ..... ..... 00100000100 @VX
target/ppc/translate.c +0 -85
97 lines not on this page · raw message
target/ppc/translate/processor-ctrl-impl.c.inc +101 -0
104 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [RFC PATCH 18/28] target/ppc: Move sleep & friends to decodetree
Quoted 244 lines · Chinmay Rath
From: Ojaswin Mujoo<[email protected]>
Convert the following instructions to decode tree specification:
doze
nap
sleep
rvwinkle
stopThe functionality was tested by comparing the qemu -D log -d op,in_asm output as well as single stepping gdb to confirm behavior was not changed for ISA3.x (stop) as well as ISA206 (doze, nap, sleep, rvwinkle).
Signed-off-by Ojaswin Mujoo<[email protected]>Signed-off-by Chinmay Rath<[email protected]>--- target/ppc/insn32.decode | 8 ++ target/ppc/translate.c | 85 --------------- .../ppc/translate/processor-ctrl-impl.c.inc | 101 ++++++++++++++++++ 3 files changed, 109 insertions(+), 85 deletions(-)target/ppc/insn32.decode +8
-0@@ -913,6 +913,14 @@ VPERMR 000100 ..... ..... ..... ..... 111011 @VA VSEL 000100 ..... ..... ..... ..... 101010 @VA +## Power Management Instructions + +DOZE 010011 ----- ----- ----- 0110010010 - +NAP 010011 ----- ----- ----- 0110110010 - +SLEEP 010011 ----- ----- ----- 0111010010 - +RVWINKLE 010011 ----- ----- ----- 0111110010 - +STOP 010011 ----- ----- ----- 0101110010 - + ## Vector Integer Shift Instruction VSLB 000100 ..... ..... ..... 00100000100 @VXtarget/ppc/translate.c +0
-85@@ -2728,86 +2728,6 @@ static inline void gen_check_tlb_flush(DisasContext *ctx, bool global) { }#endif #if defined(TARGET_PPC64 ) -static void gen_doze (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -TCGv_i32 t; - -CHK_HV (ctx); -translator_io_start (&ctx->base); - t =tcg_constant_i32 (PPC_PM_DOZE ); -gen_helper_pminsn (tcg_env, t); -/* Stop translation, as the CPU is supposed to sleep from now */ -gen_exception_nip (ctx,EXCP_HLT , ctx->base.pc_next); -#endif /* defined(CONFIG_USER_ONLY) */ -} - -static void gen_nap (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -TCGv_i32 t; - -CHK_HV (ctx); -translator_io_start (&ctx->base); - t =tcg_constant_i32 (PPC_PM_NAP ); -gen_helper_pminsn (tcg_env, t); -/* Stop translation, as the CPU is supposed to sleep from now */ -gen_exception_nip (ctx,EXCP_HLT , ctx->base.pc_next); -#endif /* defined(CONFIG_USER_ONLY) */ -} - -static void gen_stop (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -TCGv_i32 t; - -CHK_HV (ctx); -translator_io_start (&ctx->base); - t =tcg_constant_i32 (PPC_PM_STOP ); -gen_helper_pminsn (tcg_env, t); -/* Stop translation, as the CPU is supposed to sleep from now */ -gen_exception_nip (ctx,EXCP_HLT , ctx->base.pc_next); -#endif /* defined(CONFIG_USER_ONLY) */ -} - -static void gen_sleep (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -TCGv_i32 t; - -CHK_HV (ctx); -translator_io_start (&ctx->base); - t =tcg_constant_i32 (PPC_PM_SLEEP ); -gen_helper_pminsn (tcg_env, t); -/* Stop translation, as the CPU is supposed to sleep from now */ -gen_exception_nip (ctx,EXCP_HLT , ctx->base.pc_next); -#endif /* defined(CONFIG_USER_ONLY) */ -} - -static void gen_rvwinkle (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -TCGv_i32 t; - -CHK_HV (ctx); -translator_io_start (&ctx->base); - t =tcg_constant_i32 (PPC_PM_RVWINKLE ); -gen_helper_pminsn (tcg_env, t); -/* Stop translation, as the CPU is supposed to sleep from now */ -gen_exception_nip (ctx,EXCP_HLT , ctx->base.pc_next); -#endif /* defined(CONFIG_USER_ONLY) */ -} -static inline TCGv gen_write_bhrb (TCGv_ptr base,TCGv offset,TCGv mask,TCGv value) {TCGv_ptr tmp =tcg_temp_new_ptr ();@@ -5141,11 +5061,6 @@ GEN_HANDLER_E(scv, 0x11, 0x10, 0xFF, 0x03FFF01E, PPC_NONE, PPC2_ISA300), GEN_HANDLER_E(scv, 0x11, 0x00, 0xFF, 0x03FFF01E, PPC_NONE, PPC2_ISA300), GEN_HANDLER_E(rfscv, 0x13, 0x12, 0x02, 0x03FF8001, PPC_NONE, PPC2_ISA300), #endif -GEN_HANDLER_E(stop, 0x13, 0x12, 0x0b, 0x03FFF801, PPC_NONE, PPC2_ISA300), -GEN_HANDLER_E(doze, 0x13, 0x12, 0x0c, 0x03FFF801, PPC_NONE, PPC2_PM_ISA206), -GEN_HANDLER_E(nap, 0x13, 0x12, 0x0d, 0x03FFF801, PPC_NONE, PPC2_PM_ISA206), -GEN_HANDLER_E(sleep, 0x13, 0x12, 0x0e, 0x03FFF801, PPC_NONE, PPC2_PM_ISA206), -GEN_HANDLER_E(rvwinkle, 0x13, 0x12, 0x0f, 0x03FFF801, PPC_NONE, PPC2_PM_ISA206), GEN_HANDLER(hrfid, 0x13, 0x12, 0x08, 0x03FF8001, PPC_64H), #endif /* Top bit of opc2 corresponds with low bit of LEV, so use two handlers */target/ppc/translate/processor-ctrl-impl.c.inc +91
-0@@ -103,3 +103,104 @@ static bool trans_MSGSYNC(DisasContext *ctx, arg_MSGSYNC *a) /* interpreted as no-op */ return true; } + +static bool do_doze(DisasContext *ctx, arg_DOZE *a) +{ + REQUIRE_64BIT(ctx); + +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); +#else + TCGv_i32 t; + + REQUIRE_HV(ctx); + translator_io_start(&ctx->base); + t = tcg_constant_i32(PPC_PM_DOZE); + gen_helper_pminsn(tcg_env, t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif /* defined(CONFIG_USER_ONLY) */ + + return true; +} +TRANS_FLAGS2(PM_ISA206, DOZE, do_doze); + +static bool do_nap(DisasContext *ctx, arg_NAP *a) +{ + REQUIRE_64BIT(ctx); + +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); +#else + TCGv_i32 t; + + REQUIRE_HV(ctx); + translator_io_start(&ctx->base); + t = tcg_constant_i32(PPC_PM_NAP); + gen_helper_pminsn(tcg_env, t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif /* defined(CONFIG_USER_ONLY) */ + return true; +} +TRANS_FLAGS2(PM_ISA206, NAP, do_nap); + +static bool do_sleep(DisasContext *ctx, arg_SLEEP *a) +{ + REQUIRE_64BIT(ctx); + +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); +#else + TCGv_i32 t; + + REQUIRE_HV(ctx); + translator_io_start(&ctx->base); + t = tcg_constant_i32(PPC_PM_SLEEP); + gen_helper_pminsn(tcg_env, t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif /* defined(CONFIG_USER_ONLY) */ + return true; +} +TRANS_FLAGS2(PM_ISA206, SLEEP, do_sleep); + +static bool do_rvwinkle(DisasContext *ctx, arg_RVWINKLE *a) +{ + REQUIRE_64BIT(ctx); + +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); +#else + TCGv_i32 t; + + REQUIRE_HV(ctx); + translator_io_start(&ctx->base); + t = tcg_constant_i32(PPC_PM_RVWINKLE); + gen_helper_pminsn(tcg_env, t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif /* defined(CONFIG_USER_ONLY) */ + return true; +} +TRANS_FLAGS2(PM_ISA206, RVWINKLE, do_rvwinkle); + +static bool do_stop(DisasContext *ctx, arg_STOP *a) +{ + REQUIRE_64BIT(ctx); + +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); +#else + TCGv_i32 t; +
target/ppc/translate/processor-ctrl-impl.c.inc static bool trans_MSGSYNC(DisasContext *ctx, arg_MSGSYNC *a) · line 206
Quoted 10 lines
target/ppc/translate/processor-ctrl-impl.c.inc +10
-0+ REQUIRE_HV(ctx); + translator_io_start(&ctx->base); + t = tcg_constant_i32(PPC_PM_STOP); + gen_helper_pminsn(tcg_env, t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif + return true; +} +TRANS_FLAGS2(ISA300, STOP, do_stop);
To me all these functions do_doze, do_nap, do_sleep, do_rvwinkle and do_stop seem to be identical except for the PPC_PM_* constant passed to gen_helper_pminsn, you can eliminate over 50-60 lines of boilerplate by creating a single shared helper function.
Thanks,
~ Nikhil
Re: [RFC PATCH 18/28] target/ppc: Move sleep & friends to decodetree
I guess in patch 19 Ojaswin has already refactored sleep, doze, nap, rvwinkle and stop to use a common helper. I missed that part earlier during my review.
Thanks,
~Nikhil
Quoted 269 lines · Nikhil Kumar Singh
Quoted 249 lines · Chinmay Rath
From: Ojaswin Mujoo<[email protected]>
Convert the following instructions to decode tree specification:
doze
nap
sleep
rvwinkle
stopThe functionality was tested by comparing the qemu -D log -d op,in_asm output as well as single stepping gdb to confirm behavior was not changed for ISA3.x (stop) as well as ISA206 (doze, nap, sleep, rvwinkle).
Signed-off-by Ojaswin Mujoo<[email protected]>Signed-off-by Chinmay Rath<[email protected]>---
target/ppc/insn32.decode | 8 ++ target/ppc/translate.c | 85 --------------- .../ppc/translate/processor-ctrl-impl.c.inc | 101 ++++++++++++++++++3 files changed, 109 insertions(+), 85 deletions(-)target/ppc/insn32.decode +0
-0@@ -913,6 +913,14 @@ VPERMR 000100 ..... ..... ..... .....111011 @VA
VSEL 000100 ..... ..... ..... ..... 101010 @VA +## Power Management Instructionstarget/ppc/insn32.decode +7
-0+ +DOZE 010011 ----- ----- ----- 0110010010 - +NAP 010011 ----- ----- ----- 0110110010 - +SLEEP 010011 ----- ----- ----- 0111010010 - +RVWINKLE 010011 ----- ----- ----- 0111110010 - +STOP 010011 ----- ----- ----- 0101110010 - +## Vector Integer Shift Instruction
VSLB 000100 ..... ..... ..... 00100000100 @VXtarget/ppc/translate.c +0
-83@@ -2728,86 +2728,6 @@ static inline void gen_check_tlb_flush(DisasContext *ctx, bool global) { } #endif #if defined(TARGET_PPC64) -static void gen_doze (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) - GEN_PRIV(ctx); -#else - TCGv_i32 t; - - CHK_HV(ctx); - translator_io_start(&ctx->base); - t = tcg_constant_i32(PPC_PM_DOZE); - gen_helper_pminsn(tcg_env, t); - /* Stop translation, as the CPU is supposed to sleep from now */ - gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); -#endif /* defined(CONFIG_USER_ONLY) */ -} - -static void gen_nap (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) - GEN_PRIV(ctx); -#else - TCGv_i32 t; - - CHK_HV(ctx); - translator_io_start(&ctx->base); - t = tcg_constant_i32(PPC_PM_NAP); - gen_helper_pminsn(tcg_env, t); - /* Stop translation, as the CPU is supposed to sleep from now */ - gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); -#endif /* defined(CONFIG_USER_ONLY) */ -} - -static void gen_stop (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) - GEN_PRIV(ctx); -#else - TCGv_i32 t; - - CHK_HV(ctx); - translator_io_start(&ctx->base); - t = tcg_constant_i32(PPC_PM_STOP); - gen_helper_pminsn(tcg_env, t); - /* Stop translation, as the CPU is supposed to sleep from now */ - gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); -#endif /* defined(CONFIG_USER_ONLY) */ -} - -static void gen_sleep (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) - GEN_PRIV(ctx); -#else - TCGv_i32 t; - - CHK_HV(ctx); - translator_io_start(&ctx->base); - t = tcg_constant_i32(PPC_PM_SLEEP); - gen_helper_pminsn(tcg_env, t); - /* Stop translation, as the CPU is supposed to sleep from now */ - gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); -#endif /* defined(CONFIG_USER_ONLY) */ -} - -static void gen_rvwinkle (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) - GEN_PRIV(ctx); -#else - TCGv_i32 t; - - CHK_HV(ctx); - translator_io_start(&ctx->base); - t = tcg_constant_i32(PPC_PM_RVWINKLE); - gen_helper_pminsn(tcg_env, t); - /* Stop translation, as the CPU is supposed to sleep from now */ - gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); -#endif /* defined(CONFIG_USER_ONLY) */ -} - static inline TCGv gen_write_bhrb(TCGv_ptr base, TCGv offset, TCGv mask, TCGv value) { TCGv_ptr tmp = tcg_temp_new_ptr();@@ -5141,11 +5061,6 @@ GEN_HANDLER_E(scv, 0x11, 0x10, 0xFF, 0x03FFF01E, PPC_NONE, PPC2_ISA300), GEN_HANDLER_E(scv, 0x11, 0x00, 0xFF, 0x03FFF01E, PPC_NONE, PPC2_ISA300), GEN_HANDLER_E(rfscv, 0x13, 0x12, 0x02, 0x03FF8001, PPC_NONE, PPC2_ISA300), #endif -GEN_HANDLER_E (stop,0x13 ,0x12 ,0x0b ,0x03FFF801 ,PPC_NONE , PPC2_ISA300), -GEN_HANDLER_E (doze,0x13 ,0x12 ,0x0c ,0x03FFF801 ,PPC_NONE , PPC2_PM_ISA206), -GEN_HANDLER_E(nap, 0x13, 0x12, 0x0d, 0x03FFF801, PPC_NONE,
PPC2_PM_ISA206),
-GEN_HANDLER_E(sleep,0x13,0x12,0x0e,0x03FFF801,PPC_NONE,PPC2_PM_ISA206),
-GEN_HANDLER_E(rvwinkle,0x13,0x12,0x0f,0x03FFF801,PPC_NONE,PPC2_PM_ISA206),
GEN_HANDLER(hrfid, 0x13, 0x12, 0x08, 0x03FF8001, PPC_64H), #endif
/* Top bit of opc2 corresponds with low bit of LEV, so use two handlers */target/ppc/translate/processor-ctrl-impl.c.inc +0
-0@@ -103,3 +103,104 @@ static bool trans_MSGSYNC(DisasContext *ctx, arg_MSGSYNC *a) /* interpreted as no-op */ return true;}
target/ppc/translate/processor-ctrl-impl.c.inc +91
-0+ +static bool do_doze(DisasContext *ctx, arg_DOZE *a) +{ + REQUIRE_64BIT(ctx); + +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); +#else + TCGv_i32 t; + + REQUIRE_HV(ctx); + translator_io_start(&ctx->base); + t = tcg_constant_i32(PPC_PM_DOZE); + gen_helper_pminsn(tcg_env, t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif /* defined(CONFIG_USER_ONLY) */ + + return true; +} +TRANS_FLAGS2(PM_ISA206, DOZE, do_doze); + +static bool do_nap(DisasContext *ctx, arg_NAP *a) +{ + REQUIRE_64BIT(ctx); + +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); +#else + TCGv_i32 t; + + REQUIRE_HV(ctx); + translator_io_start(&ctx->base); + t = tcg_constant_i32(PPC_PM_NAP); + gen_helper_pminsn(tcg_env, t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif /* defined(CONFIG_USER_ONLY) */ + return true; +} +TRANS_FLAGS2(PM_ISA206, NAP, do_nap); + +static bool do_sleep(DisasContext *ctx, arg_SLEEP *a) +{ + REQUIRE_64BIT(ctx); + +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); +#else + TCGv_i32 t; + + REQUIRE_HV(ctx); + translator_io_start(&ctx->base); + t = tcg_constant_i32(PPC_PM_SLEEP); + gen_helper_pminsn(tcg_env, t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif /* defined(CONFIG_USER_ONLY) */ + return true; +} +TRANS_FLAGS2(PM_ISA206, SLEEP, do_sleep); + +static bool do_rvwinkle(DisasContext *ctx, arg_RVWINKLE *a) +{ + REQUIRE_64BIT(ctx); + +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); +#else + TCGv_i32 t; + + REQUIRE_HV(ctx); + translator_io_start(&ctx->base); + t = tcg_constant_i32(PPC_PM_RVWINKLE); + gen_helper_pminsn(tcg_env, t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif /* defined(CONFIG_USER_ONLY) */ + return true; +} +TRANS_FLAGS2(PM_ISA206, RVWINKLE, do_rvwinkle); + +static bool do_stop(DisasContext *ctx, arg_STOP *a) +{ + REQUIRE_64BIT(ctx); + +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); +#else + TCGv_i32 t; +target/ppc/translate/processor-ctrl-impl.c.inc static bool trans_MSGSYNC(DisasContext *ctx, arg_MSGSYNC *a) · line 206
Quoted 10 lines
target/ppc/translate/processor-ctrl-impl.c.inc +10
-0+ REQUIRE_HV(ctx); + translator_io_start(&ctx->base); + t = tcg_constant_i32(PPC_PM_STOP); + gen_helper_pminsn(tcg_env, t); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); +#endif + return true; +} +TRANS_FLAGS2(ISA300, STOP, do_stop);To me all these functions
do_doze,do_nap,do_sleep,do_rvwinkleanddo_stopseem to be identical except for the PPC_PM_* constant passed togen_helper_pminsn, you can eliminate over 50-60 lines of boilerplate by creating a single shared helper function.Thanks,
~ Nikhil
RFC PATCH 19/28 target/ppc: Refactor sleep and its variants to use a common helper
In reply to Chinmay RathFrom: Ojaswin Mujoo <[email protected]>
Refactor sleep, doze, nap, rvwinkle and stop to use a common helper since they share majority of the code. Also refactor gen_hlper_pminsn() to gen_helper_PMINSN()
--- target/ppc/helper.h | 2 +- target/ppc/tcg-excp_helper.c | 2 +- .../ppc/translate/processor-ctrl-impl.c.inc | 99 +++---------------- 3 files changed, 16 insertions(+), 87 deletions(-)
target/ppc/helper.h +1 -1
@@ -18,7 +18,7 @@ DEF_HELPER_1(rfdi, void, env) DEF_HELPER_1(rfmci, void, env)#if defined(TARGET_PPC64 ) DEF_HELPER_2(scv, noreturn, env, i32) -DEF_HELPER_2(pminsn, void, env, i32) +DEF_HELPER_2(PMINSN, void, env, i32) DEF_HELPER_1(rfid, void, env) DEF_HELPER_1(rfscv, void, env)DEF_HELPER_1 (hrfid, void, env)
target/ppc/tcg-excp_helper.c +1 -1
@@ -458,7 +458,7 @@ void helper_scv(CPUPPCState *env, uint32_t lev) } } -void helper_pminsn (CPUPPCState *env,uint32_t insn) +void helper_PMINSN (CPUPPCState *env,uint32_t insn) {CPUState *cs =env_cpu (env);
target/ppc/translate/processor-ctrl-impl.c.inc +14 -85
117 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH 20/28 target/ppc: Move Condition Register access instructions to decodetree.
In reply to Chinmay RathFrom: Shivang Upadhyay <[email protected]>
Move below instructions to decodetree specification :
mfcr, mfocr,
mtcrf, mtocrf : XFX-form
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
--- target/ppc/insn32.decode | 8 +++ target/ppc/translate.c | 62 ----------------- target/ppc/translate/fixedpoint-impl.c.inc | 79 ++++++++++++++++++++++ 3 files changed, 87 insertions(+), 62 deletions(-)
target/ppc/insn32.decode +8 -0
@@ -70,6 +70,9 @@ %dx_d 6:s10 16:5 0:1 @DX ...... rt:5 ..... .......... ..... . &DX d=%dx_d +&XFX rt fxm +@XFX ...... rt:5 . fxm:8 ...... ..... . &XFX + %md_sh 1:1 11:5 %md_mb 5:1 6:5 &MD rs ra sh mb rc
@@ -648,6 +651,11 @@ FSEL 111111 ..... ..... ..... ..... 10111 . @A ### Move To/From System Register Instructions +MFCR 011111 ..... 0.... ....- 0000010011 - @XFX +MFOCR 011111 ..... 1.... ....- 0000010011 - @XFX +MTCRF 011111 ..... 0.... ....- 0010010000 - @XFX +MTOCRF 011111 ..... 1.... ....- 0010010000 - @XFX + SETBC 011111 ..... ..... ----- 0110000000 - @X_bi SETBCR 011111 ..... ..... ----- 0110100000 - @X_bi SETNBC 011111 ..... ..... ----- 0111000000 - @X_bi
target/ppc/translate.c +0 -62
83 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +79 -0
85 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH 21/28 target/ppc: Move Condition Register logical instructions to decodetree.
In reply to Chinmay RathFrom: Shivang Upadhyay <[email protected]>
Move below instructions to decodetree specification :
cr{and, or, xor, nand, nor, eqv, andc, orc} : XL-form
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
--- target/ppc/insn32.decode | 11 ++++ target/ppc/translate.c | 59 ---------------------- target/ppc/translate/fixedpoint-impl.c.inc | 45 +++++++++++++++++ 3 files changed, 56 insertions(+), 59 deletions(-)
target/ppc/insn32.decode +11 -0
@@ -516,6 +516,17 @@ CFUGED 011111 ..... ..... ..... 0011011100 - @X PDEPD 011111 ..... ..... ..... 0010011100 - @X PEXTD 011111 ..... ..... ..... 0010111100 - @X +## Condition Register Instructions + +CRAND 010011 ..... ..... ..... 0100000001 - @X +CROR 010011 ..... ..... ..... 0111000001 - @X +CRNAND 010011 ..... ..... ..... 0011100001 - @X +CRXOR 010011 ..... ..... ..... 0011000001 - @X +CRNOR 010011 ..... ..... ..... 0000100001 - @X +CREQV 010011 ..... ..... ..... 0100100001 - @X +CRANDC 010011 ..... ..... ..... 0010000001 - @X +CRORC 010011 ..... ..... ..... 0110100001 - @X + # Fixed-Point Hash Instructions HASHST 011111 ..... ..... ..... 1011010010 . @X_DW
target/ppc/translate.c +0 -59
71 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +45 -0
51 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH 22/28 target/ppc: Move Fixed-Point Load/Store String instructions to decodetree.
In reply to Chinmay RathFrom: Shivang Upadhyay <[email protected]>
Move below instructions to decodetree specification :
lsw{i, x},
stsw{i, x} : X-form
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
--- target/ppc/helper.h | 6 +- target/ppc/insn32.decode | 7 ++ target/ppc/mem_helper.c | 6 +- target/ppc/translate.c | 102 -------------------- target/ppc/translate/fixedpoint-impl.c.inc | 103 +++++++++++++++++++++ 5 files changed, 116 insertions(+), 108 deletions(-)
target/ppc/helper.h +3 -3
@@ -45,9 +45,9 @@ DEF_HELPER_1(check_tlb_flush_global, void, env) DEF_HELPER_3(lmw, void, env, tl, i32) DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) -DEF_HELPER_4(lsw, void, env, tl, i32, i32) -DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) -DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) +DEF_HELPER_4(LSW, void, env, tl, i32, i32) +DEF_HELPER_5(LSWX, void, env, tl, i32, i32, i32) +DEF_HELPER_FLAGS_4(STSW, TCG_CALL_NO_WG, void, env, tl, i32, i32) DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int)#ifdef TARGET_PPC64 DEF_HELPER_FLAGS_2 (DCBZL ,TCG_CALL_NO_WG , void, env, tl)
target/ppc/insn32.decode +7 -0
@@ -527,6 +527,13 @@ CREQV 010011 ..... ..... ..... 0100100001 - @X CRANDC 010011 ..... ..... ..... 0010000001 - @X CRORC 010011 ..... ..... ..... 0110100001 - @X +# Fixed Point Move Assist Instructions + +LSWI 011111 ..... ..... ..... 1 001010101 - @X +LSWX 011111 ..... ..... ..... 1 000010101 - @X +STSWI 011111 ..... ..... ..... 1 011010101 - @X +STSWX 011111 ..... ..... ..... 1 010010101 - @X + # Fixed-Point Hash Instructions HASHST 011111 ..... ..... ..... 1011010010 . @X_DW
target/ppc/mem_helper.c +3 -3
@@ -190,7 +190,7 @@ static void do_lsw(CPUPPCState *env, target_ulong addr, uint32_t nb, env->gpr[reg] = val; } -void helper_lsw (CPUPPCState *env,target_ulong addr, +void helper_LSW (CPUPPCState *env,target_ulong addr,uint32_t nb,uint32_t reg) {do_lsw (env, addr, nb, reg,GETPC ());
@@ -202,7 +202,7 @@ void helper_lsw(CPUPPCState *env, target_ulong addr,* this is valid, but rA won't be loaded. For now, I'll follow the * spec... */ -void helper_lswx (CPUPPCState *env,target_ulong addr,uint32_t reg, +void helper_LSWX (CPUPPCState *env,target_ulong addr,uint32_t reg,uint32_t ra,uint32_t rb) {if (likely (xer_bc !=0 )) {
@@ -218,7 +218,7 @@ void helper_lswx(CPUPPCState *env, target_ulong addr, uint32_t reg, } } -void helper_stsw (CPUPPCState *env,target_ulong addr,uint32_t nb, +void helper_STSW (CPUPPCState *env,target_ulong addr,uint32_t nb,uint32_t reg) {uintptr_t raddr =GETPC ();
target/ppc/translate.c +0 -102
114 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +103 -0
109 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [RFC PATCH 22/28] target/ppc: Move Fixed-Point Load/Store String instructions to decodetree.
Quoted 197 lines · Chinmay Rath
From: Shivang Upadhyay <[email protected]>
Move below instructions to decodetree specification :
lsw{i, x},
stsw{i, x} : X-formThe changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
Signed-off-by Shivang Upadhyay <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/helper.h | 6 +- target/ppc/insn32.decode | 7 ++ target/ppc/mem_helper.c | 6 +- target/ppc/translate.c | 102 -------------------- target/ppc/translate/fixedpoint-impl.c.inc | 103 +++++++++++++++++++++ 5 files changed, 116 insertions(+), 108 deletions(-)target/ppc/helper.h +3
-3@@ -45,9 +45,9 @@ DEF_HELPER_1(check_tlb_flush_global, void, env) DEF_HELPER_3(lmw, void, env, tl, i32) DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) -DEF_HELPER_4(lsw, void, env, tl, i32, i32) -DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) -DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) +DEF_HELPER_4(LSW, void, env, tl, i32, i32) +DEF_HELPER_5(LSWX, void, env, tl, i32, i32, i32) +DEF_HELPER_FLAGS_4(STSW, TCG_CALL_NO_WG, void, env, tl, i32, i32) DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int)#ifdef TARGET_PPC64 DEF_HELPER_FLAGS_2 (DCBZL ,TCG_CALL_NO_WG , void, env, tl)target/ppc/insn32.decode +7
-0@@ -527,6 +527,13 @@ CREQV 010011 ..... ..... ..... 0100100001 - @X CRANDC 010011 ..... ..... ..... 0010000001 - @X CRORC 010011 ..... ..... ..... 0110100001 - @X +# Fixed Point Move Assist Instructions + +LSWI 011111 ..... ..... ..... 1 001010101 - @X +LSWX 011111 ..... ..... ..... 1 000010101 - @X +STSWI 011111 ..... ..... ..... 1 011010101 - @X +STSWX 011111 ..... ..... ..... 1 010010101 - @X + # Fixed-Point Hash Instructions HASHST 011111 ..... ..... ..... 1011010010 . @X_DWtarget/ppc/mem_helper.c +3
-3@@ -190,7 +190,7 @@ static void do_lsw(CPUPPCState *env, target_ulong addr, uint32_t nb, env->gpr[reg] = val; } -void helper_lsw (CPUPPCState *env,target_ulong addr, +void helper_LSW (CPUPPCState *env,target_ulong addr,uint32_t nb,uint32_t reg) {do_lsw (env, addr, nb, reg,GETPC ());@@ -202,7 +202,7 @@ void helper_lsw(CPUPPCState *env, target_ulong addr,* this is valid, but rA won't be loaded. For now, I'll follow the * spec... */ -void helper_lswx (CPUPPCState *env,target_ulong addr,uint32_t reg, +void helper_LSWX (CPUPPCState *env,target_ulong addr,uint32_t reg,uint32_t ra,uint32_t rb) {if (likely (xer_bc !=0 )) {@@ -218,7 +218,7 @@ void helper_lswx(CPUPPCState *env, target_ulong addr, uint32_t reg, } } -void helper_stsw (CPUPPCState *env,target_ulong addr,uint32_t nb, +void helper_STSW (CPUPPCState *env,target_ulong addr,uint32_t nb,uint32_t reg) {uintptr_t raddr =GETPC ();target/ppc/translate.c +0
-98@@ -2597,104 +2597,6 @@ static void gen_stmw(DisasContext *ctx)gen_helper_stmw (tcg_env, t0, t1); } -/*** Integer load and store strings ***/ - -/* lswi */ -/* -* PowerPC32 specification says we must generate an exception if rA is -* in the range of registers to be loaded. In an other hand, IBM says -* this is valid, but rA won't be loaded. For now, I'll follow the -* spec... -*/ -static void gen_lswi (DisasContext *ctx) -{ -TCGv t0; -TCGv_i32 t1, t2; -int nb =NB (ctx->opcode); -int start =rD (ctx->opcode); -int ra =rA (ctx->opcode); -int nr; - -if (ctx->le_mode) { -gen_align_no_le (ctx); -return ; - } -if (nb ==0 ) { - nb =32 ; - } - nr =DIV_ROUND_UP (nb,4 ); -if (unlikely (lsw_reg_in_range (start, nr, ra))) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_LSWX ); -return ; - } -gen_set_access_type (ctx,ACCESS_INT ); - t0 =tcg_temp_new (); -gen_addr_register (ctx, t0); - t1 =tcg_constant_i32 (nb); - t2 =tcg_constant_i32 (start); -gen_helper_lsw (tcg_env, t0, t1, t2); -} - -/* lswx */ -static void gen_lswx (DisasContext *ctx) -{ -TCGv t0; -TCGv_i32 t1, t2, t3; - -if (ctx->le_mode) { -gen_align_no_le (ctx); -return ; - } -gen_set_access_type (ctx,ACCESS_INT ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); - t1 =tcg_constant_i32 (rD (ctx->opcode)); - t2 =tcg_constant_i32 (rA (ctx->opcode)); - t3 =tcg_constant_i32 (rB (ctx->opcode)); -gen_helper_lswx (tcg_env, t0, t1, t2, t3); -} - -/* stswi */ -static void gen_stswi (DisasContext *ctx) -{ -TCGv t0; -TCGv_i32 t1, t2; -int nb =NB (ctx->opcode); - -if (ctx->le_mode) { -gen_align_no_le (ctx); -return ; - } -gen_set_access_type (ctx,ACCESS_INT ); - t0 =tcg_temp_new (); -gen_addr_register (ctx, t0); -if (nb ==0 ) { - nb =32 ; - } - t1 =tcg_constant_i32 (nb); - t2 =tcg_constant_i32 (rS (ctx->opcode)); -gen_helper_stsw (tcg_env, t0, t1, t2); -} - -/* stswx */ -static void gen_stswx (DisasContext *ctx) -{ -TCGv t0; -TCGv_i32 t1, t2; - -if (ctx->le_mode) { -gen_align_no_le (ctx); -return ; - } -gen_set_access_type (ctx,ACCESS_INT ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); - t1 =tcg_temp_new_i32 (); -tcg_gen_trunc_tl_i32 (t1, cpu_xer); -tcg_gen_andi_i32 (t1, t1,0x7F ); - t2 =tcg_constant_i32 (rS (ctx->opcode)); -gen_helper_stsw (tcg_env, t0, t1, t2); -}#if !defined(CONFIG_USER_ONLY )static inline void gen_check_tlb_flush (DisasContext *ctx,bool global)
target/ppc/translate.c GEN_HANDLER_E(dform39, 0x39, 0xFF, 0xFF, 0x00000000, PPC_NONE, PPC2_ISA205), · line 4946
Quoted 7 lines
target/ppc/translate.c +0
-4@@ -4940,10 +4842,6 @@ GEN_HANDLER_E(dform39, 0x39, 0xFF, 0xFF, 0x00000000, PPC_NONE, PPC2_ISA205),GEN_HANDLER_E (dform3D,0x3D ,0xFF ,0xFF ,0x00000000 ,PPC_NONE ,PPC2_ISA205 ),GEN_HANDLER (lmw,0x2E ,0xFF ,0xFF ,0x00000000 ,PPC_INTEGER ), GEN_HANDLER(stmw, 0x2F, 0xFF, 0xFF, 0x00000000, PPC_INTEGER), -GEN_HANDLER (lswi,0x1F ,0x15 ,0x12 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER (lswx,0x1F ,0x15 ,0x10 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER (stswi,0x1F ,0x15 ,0x16 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER(stswx, 0x1F, 0x15, 0x14, 0x00000001, PPC_STRING),
Looks like you have missed adding those ^ PPC_STRING flag checks in the new trans_XXX() handlers.
Regards,
Chinmay
Quoted 117 lines
target/ppc/translate.c +0
-0/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER(rfi, 0x13, 0x12, 0x01, 0x03FF8001, PPC_FLOW),#if defined(TARGET_PPC64 )target/ppc/translate/fixedpoint-impl.c.inc +103
-0@@ -585,6 +585,109 @@ TRANS(CRANDC, cr_logic_common, tcg_gen_andc_i32); TRANS(CREQV, cr_logic_common, tcg_gen_eqv_i32); TRANS(CRORC, cr_logic_common, tcg_gen_orc_i32); + +/*** Integer load and store strings ***/ + +/* lswi */ +static bool trans_LSWI(DisasContext *ctx, arg_LSWI *a) +{ + TCGv t0; + TCGv_i32 t1, t2; + int nb = a->rb; + int start = a->rt; + int ra = a->ra; + int nr; + + if (ctx->le_mode) { + gen_align_no_le(ctx); + return true; + } + if (nb == 0) { + nb = 32; + } + nr = DIV_ROUND_UP(nb, 4); + if (unlikely(lsw_reg_in_range(start, nr, ra))) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_LSWX); + return true; + } + gen_set_access_type(ctx, ACCESS_INT); + t0 = tcg_temp_new(); + gen_addr_register(ctx, t0); + t1 = tcg_constant_i32(nb); + t2 = tcg_constant_i32(start); + gen_helper_LSW(tcg_env, t0, t1, t2); + + return true; +} + +/* lswx */ +static bool trans_LSWX(DisasContext *ctx, arg_LSWX *a) +{ + TCGv t0; + TCGv_i32 t1, t2, t3; + + if (ctx->le_mode) { + gen_align_no_le(ctx); + return true; + } + + gen_set_access_type(ctx, ACCESS_INT); + t0 = tcg_temp_new(); + gen_addr_reg_index(ctx, t0); + t1 = tcg_constant_i32(a->rt); + t2 = tcg_constant_i32(a->ra); + t3 = tcg_constant_i32(a->rb); + gen_helper_LSWX(tcg_env, t0, t1, t2, t3); + + return true; +} + +/* stswi */ +static bool trans_STSWI(DisasContext *ctx, arg_STSWI *a) +{ + TCGv t0; + TCGv_i32 t1, t2; + int nb = a->rb; + + if (ctx->le_mode) { + gen_align_no_le(ctx); + return true; + } + gen_set_access_type(ctx, ACCESS_INT); + t0 = tcg_temp_new(); + gen_addr_register(ctx, t0); + if (nb == 0) { + nb = 32; + } + t1 = tcg_constant_i32(nb); + t2 = tcg_constant_i32(a->rt); + gen_helper_STSW(tcg_env, t0, t1, t2); + + return true; +} + +/* stswx */ +static bool trans_STSWX(DisasContext *ctx, arg_STSWX *a) +{ + TCGv t0; + TCGv_i32 t1, t2; + + if (ctx->le_mode) { + gen_align_no_le(ctx); + return true; + } + gen_set_access_type(ctx, ACCESS_INT); + t0 = tcg_temp_new(); + gen_addr_reg_index(ctx, t0); + t1 = tcg_temp_new_i32(); + tcg_gen_trunc_tl_i32(t1, cpu_xer); + tcg_gen_andi_i32(t1, t1, 0x7F); + t2 = tcg_constant_i32(a->rt); + gen_helper_STSW(tcg_env, t0, t1, t2); + + return true; +} + static bool do_add_D(DisasContext *ctx, arg_D *a, bool add_ca, bool compute_ca, bool compute_ov, bool compute_rc0) {
Re: [RFC PATCH 22/28] target/ppc: Move Fixed-Point Load/Store String instructions to decodetree.
Quoted 10 lines · Chinmay Rath
target/ppc/translate.c GEN_HANDLER_E(dform39, 0x39, 0xFF, 0xFF, 0x00000000, PPC_NONE, PPC2_ISA205), · line 4946
Quoted 6 lines
GEN_HANDLER(lmw, 0x2E, 0xFF, 0xFF, 0x00000000, PPC_INTEGER),GEN_HANDLER(stmw, 0x2F, 0xFF, 0xFF, 0x00000000, PPC_INTEGER),target/ppc/translate.c +0
-4-GEN_HANDLER (lswi,0x1F ,0x15 ,0x12 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER (lswx,0x1F ,0x15 ,0x10 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER (stswi,0x1F ,0x15 ,0x16 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER(stswx, 0x1F, 0x15, 0x14, 0x00000001, PPC_STRING),Looks like you have missed adding those ^
PPC_STRINGflag checks in the
newtrans_XXX()handlers.
Quoted 2 lines
Regards,
Chinmay
Thanks Chinmay, Great find. I'll send a fix asap.
~Shivang.
Re: [RFC PATCH 22/28] target/ppc: Move Fixed-Point Load/Store String instructions to decodetree.
In reply to Chinmay RathQuoted 308 lines · Chinmay Rath
From: Shivang Upadhyay <[email protected]>
Move below instructions to decodetree specification :
lsw{i, x},
stsw{i, x} : X-formThe changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
Signed-off-by Shivang Upadhyay <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/helper.h | 6 +- target/ppc/insn32.decode | 7 ++ target/ppc/mem_helper.c | 6 +- target/ppc/translate.c | 102 -------------------- target/ppc/translate/fixedpoint-impl.c.inc | 103 +++++++++++++++++++++ 5 files changed, 116 insertions(+), 108 deletions(-)target/ppc/helper.h +3
-3@@ -45,9 +45,9 @@ DEF_HELPER_1(check_tlb_flush_global, void, env) DEF_HELPER_3(lmw, void, env, tl, i32) DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) -DEF_HELPER_4(lsw, void, env, tl, i32, i32) -DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) -DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) +DEF_HELPER_4(LSW, void, env, tl, i32, i32) +DEF_HELPER_5(LSWX, void, env, tl, i32, i32, i32) +DEF_HELPER_FLAGS_4(STSW, TCG_CALL_NO_WG, void, env, tl, i32, i32) DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int)#ifdef TARGET_PPC64 DEF_HELPER_FLAGS_2 (DCBZL ,TCG_CALL_NO_WG , void, env, tl)target/ppc/insn32.decode +7
-0@@ -527,6 +527,13 @@ CREQV 010011 ..... ..... ..... 0100100001 - @X CRANDC 010011 ..... ..... ..... 0010000001 - @X CRORC 010011 ..... ..... ..... 0110100001 - @X +# Fixed Point Move Assist Instructions + +LSWI 011111 ..... ..... ..... 1 001010101 - @X +LSWX 011111 ..... ..... ..... 1 000010101 - @X +STSWI 011111 ..... ..... ..... 1 011010101 - @X +STSWX 011111 ..... ..... ..... 1 010010101 - @X + # Fixed-Point Hash Instructions HASHST 011111 ..... ..... ..... 1011010010 . @X_DWtarget/ppc/mem_helper.c +3
-3@@ -190,7 +190,7 @@ static void do_lsw(CPUPPCState *env, target_ulong addr, uint32_t nb, env->gpr[reg] = val; } -void helper_lsw (CPUPPCState *env,target_ulong addr, +void helper_LSW (CPUPPCState *env,target_ulong addr,uint32_t nb,uint32_t reg) {do_lsw (env, addr, nb, reg,GETPC ());@@ -202,7 +202,7 @@ void helper_lsw(CPUPPCState *env, target_ulong addr,* this is valid, but rA won't be loaded. For now, I'll follow the * spec... */ -void helper_lswx (CPUPPCState *env,target_ulong addr,uint32_t reg, +void helper_LSWX (CPUPPCState *env,target_ulong addr,uint32_t reg,uint32_t ra,uint32_t rb) {if (likely (xer_bc !=0 )) {@@ -218,7 +218,7 @@ void helper_lswx(CPUPPCState *env, target_ulong addr, uint32_t reg, } } -void helper_stsw (CPUPPCState *env,target_ulong addr,uint32_t nb, +void helper_STSW (CPUPPCState *env,target_ulong addr,uint32_t nb,uint32_t reg) {uintptr_t raddr =GETPC ();target/ppc/translate.c +0
-102@@ -2597,104 +2597,6 @@ static void gen_stmw(DisasContext *ctx)gen_helper_stmw (tcg_env, t0, t1); } -/*** Integer load and store strings ***/ - -/* lswi */ -/* -* PowerPC32 specification says we must generate an exception if rA is -* in the range of registers to be loaded. In an other hand, IBM says -* this is valid, but rA won't be loaded. For now, I'll follow the -* spec... -*/ -static void gen_lswi (DisasContext *ctx) -{ -TCGv t0; -TCGv_i32 t1, t2; -int nb =NB (ctx->opcode); -int start =rD (ctx->opcode); -int ra =rA (ctx->opcode); -int nr; - -if (ctx->le_mode) { -gen_align_no_le (ctx); -return ; - } -if (nb ==0 ) { - nb =32 ; - } - nr =DIV_ROUND_UP (nb,4 ); -if (unlikely (lsw_reg_in_range (start, nr, ra))) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_LSWX ); -return ; - } -gen_set_access_type (ctx,ACCESS_INT ); - t0 =tcg_temp_new (); -gen_addr_register (ctx, t0); - t1 =tcg_constant_i32 (nb); - t2 =tcg_constant_i32 (start); -gen_helper_lsw (tcg_env, t0, t1, t2); -} - -/* lswx */ -static void gen_lswx (DisasContext *ctx) -{ -TCGv t0; -TCGv_i32 t1, t2, t3; - -if (ctx->le_mode) { -gen_align_no_le (ctx); -return ; - } -gen_set_access_type (ctx,ACCESS_INT ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); - t1 =tcg_constant_i32 (rD (ctx->opcode)); - t2 =tcg_constant_i32 (rA (ctx->opcode)); - t3 =tcg_constant_i32 (rB (ctx->opcode)); -gen_helper_lswx (tcg_env, t0, t1, t2, t3); -} - -/* stswi */ -static void gen_stswi (DisasContext *ctx) -{ -TCGv t0; -TCGv_i32 t1, t2; -int nb =NB (ctx->opcode); - -if (ctx->le_mode) { -gen_align_no_le (ctx); -return ; - } -gen_set_access_type (ctx,ACCESS_INT ); - t0 =tcg_temp_new (); -gen_addr_register (ctx, t0); -if (nb ==0 ) { - nb =32 ; - } - t1 =tcg_constant_i32 (nb); - t2 =tcg_constant_i32 (rS (ctx->opcode)); -gen_helper_stsw (tcg_env, t0, t1, t2); -} - -/* stswx */ -static void gen_stswx (DisasContext *ctx) -{ -TCGv t0; -TCGv_i32 t1, t2; - -if (ctx->le_mode) { -gen_align_no_le (ctx); -return ; - } -gen_set_access_type (ctx,ACCESS_INT ); - t0 =tcg_temp_new (); -gen_addr_reg_index (ctx, t0); - t1 =tcg_temp_new_i32 (); -tcg_gen_trunc_tl_i32 (t1, cpu_xer); -tcg_gen_andi_i32 (t1, t1,0x7F ); - t2 =tcg_constant_i32 (rS (ctx->opcode)); -gen_helper_stsw (tcg_env, t0, t1, t2); -}#if !defined(CONFIG_USER_ONLY )static inline void gen_check_tlb_flush (DisasContext *ctx,bool global)@@ -4940,10 +4842,6 @@ GEN_HANDLER_E(dform39, 0x39, 0xFF, 0xFF, 0x00000000, PPC_NONE, PPC2_ISA205),GEN_HANDLER_E (dform3D,0x3D ,0xFF ,0xFF ,0x00000000 ,PPC_NONE ,PPC2_ISA205 ),GEN_HANDLER (lmw,0x2E ,0xFF ,0xFF ,0x00000000 ,PPC_INTEGER ),GEN_HANDLER (stmw,0x2F ,0xFF ,0xFF ,0x00000000 ,PPC_INTEGER ), -GEN_HANDLER (lswi,0x1F ,0x15 ,0x12 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER (lswx,0x1F ,0x15 ,0x10 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER (stswi,0x1F ,0x15 ,0x16 ,0x00000001 ,PPC_STRING ), -GEN_HANDLER (stswx,0x1F ,0x15 ,0x14 ,0x00000001 ,PPC_STRING ),/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER (rfi,0x13 ,0x12 ,0x01 ,0x03FF8001 ,PPC_FLOW ), #if defined(TARGET_PPC64)target/ppc/translate/fixedpoint-impl.c.inc +93
-0@@ -585,6 +585,109 @@ TRANS(CRANDC, cr_logic_common, tcg_gen_andc_i32); TRANS(CREQV, cr_logic_common, tcg_gen_eqv_i32); TRANS(CRORC, cr_logic_common, tcg_gen_orc_i32); + +/*** Integer load and store strings ***/ + +/* lswi */ +static bool trans_LSWI(DisasContext *ctx, arg_LSWI *a) +{ + TCGv t0; + TCGv_i32 t1, t2; + int nb = a->rb; + int start = a->rt; + int ra = a->ra; + int nr; + + if (ctx->le_mode) { + gen_align_no_le(ctx); + return true; + } + if (nb == 0) { + nb = 32; + } + nr = DIV_ROUND_UP(nb, 4); + if (unlikely(lsw_reg_in_range(start, nr, ra))) { + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_LSWX); + return true; + } + gen_set_access_type(ctx, ACCESS_INT); + t0 = tcg_temp_new(); + gen_addr_register(ctx, t0); + t1 = tcg_constant_i32(nb); + t2 = tcg_constant_i32(start); + gen_helper_LSW(tcg_env, t0, t1, t2); + + return true; +} + +/* lswx */ +static bool trans_LSWX(DisasContext *ctx, arg_LSWX *a) +{ + TCGv t0; + TCGv_i32 t1, t2, t3; + + if (ctx->le_mode) { + gen_align_no_le(ctx); + return true; + } + + gen_set_access_type(ctx, ACCESS_INT); + t0 = tcg_temp_new(); + gen_addr_reg_index(ctx, t0); + t1 = tcg_constant_i32(a->rt); + t2 = tcg_constant_i32(a->ra); + t3 = tcg_constant_i32(a->rb); + gen_helper_LSWX(tcg_env, t0, t1, t2, t3); + + return true; +} + +/* stswi */ +static bool trans_STSWI(DisasContext *ctx, arg_STSWI *a) +{ + TCGv t0; + TCGv_i32 t1, t2; + int nb = a->rb; + + if (ctx->le_mode) { + gen_align_no_le(ctx); + return true; + } + gen_set_access_type(ctx, ACCESS_INT); + t0 = tcg_temp_new(); + gen_addr_register(ctx, t0); + if (nb == 0) { + nb = 32; + } + t1 = tcg_constant_i32(nb); + t2 = tcg_constant_i32(a->rt); + gen_helper_STSW(tcg_env, t0, t1, t2); + + return true; +} + +/* stswx */ +static bool trans_STSWX(DisasContext *ctx, arg_STSWX *a) +{ + TCGv t0; + TCGv_i32 t1, t2; + + if (ctx->le_mode) { + gen_align_no_le(ctx); + return true; + } + gen_set_access_type(ctx, ACCESS_INT); + t0 = tcg_temp_new();
target/ppc/translate/fixedpoint-impl.c.inc TRANS(CRANDC, cr_logic_common, tcg_gen_andc_i32); · line 690
Quoted 10 lines
target/ppc/translate/fixedpoint-impl.c.inc +10
-0+ gen_addr_reg_index(ctx, t0); + t1 = tcg_temp_new_i32(); + tcg_gen_trunc_tl_i32(t1, cpu_xer); + tcg_gen_andi_i32(t1, t1, 0x7F); + t2 = tcg_constant_i32(a->rt); + gen_helper_STSW(tcg_env, t0, t1, t2); + + return true; +} +
You are using gen_addr_register and gen_addr_reg_index, do_ea_calc instead.
Thanks
~ Nikhil
Re: [RFC PATCH 22/28] target/ppc: Move Fixed-Point Load/Store String instructions to decodetree.
Quoted 8 lines · Nikhil Kumar Singh
target/ppc/translate/fixedpoint-impl.c.inc TRANS(CRANDC, cr_logic_common, tcg_gen_andc_i32); · line 619
Quoted 4 lines
target/ppc/translate/fixedpoint-impl.c.inc +4
-0+ + return true; +} +You are using
gen_addr_registerandgen_addr_reg_index,do_ea_calcinstead.
Hi,
Seems like these functions are refactor-able. I can send in another
patch to clean it across all usages.
~Shivang.
Re: [RFC PATCH 22/28] target/ppc: Move Fixed-Point Load/Store String instructions to decodetree.
Quoted 11 lines · Shivang Upadhyay
Quoted 7 lines · Nikhil Kumar Singh
target/ppc/translate/fixedpoint-impl.c.inc TRANS(CRANDC, cr_logic_common, tcg_gen_andc_i32); · line 619
Quoted 4 lines
target/ppc/translate/fixedpoint-impl.c.inc +4
-0+ + return true; +} +You are using
gen_addr_registerandgen_addr_reg_index,do_ea_calcinstead.Hi,
Seems like these functions are refactor-able. I can send in another
patch to clean it across all usages.
I agree with Nikhil. This should be done as part of the original movement patch. Thanks for catching this Nikhil.
Please take care to use the appropriate method, do_ea_calc or do_ea_calc_ra, as needed.
Regards,
Chinmay
Quoted 1 line
~Shivang.
Re: [RFC PATCH 22/28] target/ppc: Move Fixed-Point Load/Store String instructions to decodetree.
Quoted 6 lines · Chinmay Rath
Quoted 6 lines
Quoted 6 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+} +You are using
gen_addr_registerandgen_addr_reg_index,do_ea_calc
instead.
Quoted 8 lines
Quoted 4 lines
Hi,
Seems like these functions are refactor-able. I can send in another
patch to clean it across all usages.I agree with Nikhil. This should be done as part of the original movement patch.
Thanks for catching this Nikhil.
Sure. ill send a revision.
~Shivang.
PATCH v2 1/1 target/ppc: Move Fixed-Point Load/Store String instructions to decodetree.
In reply to Chinmay RathMove below instructions to decodetree specification :
lsw{i, x},
stsw{i, x} : X-form
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
---
Changes:
since v1:
- Added PPC_STRING flag requirement
- moved gen_addr_register/gen_addr_reg_index to do_ea_calc/do_ea_calc_ra
--- target/ppc/helper.h | 6 +- target/ppc/insn32.decode | 7 ++ target/ppc/mem_helper.c | 6 +- target/ppc/translate.c | 102 -------------------- target/ppc/translate/fixedpoint-impl.c.inc | 103 +++++++++++++++++++++ 5 files changed, 116 insertions(+), 108 deletions(-)
target/ppc/helper.h +3 -3
@@ -45,9 +45,9 @@ DEF_HELPER_1(check_tlb_flush_global, void, env) DEF_HELPER_3(lmw, void, env, tl, i32) DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) -DEF_HELPER_4(lsw, void, env, tl, i32, i32) -DEF_HELPER_5(lswx, void, env, tl, i32, i32, i32) -DEF_HELPER_FLAGS_4(stsw, TCG_CALL_NO_WG, void, env, tl, i32, i32) +DEF_HELPER_4(LSW, void, env, tl, i32, i32) +DEF_HELPER_5(LSWX, void, env, tl, i32, i32, i32) +DEF_HELPER_FLAGS_4(STSW, TCG_CALL_NO_WG, void, env, tl, i32, i32) DEF_HELPER_FLAGS_3(DCBZ, TCG_CALL_NO_WG, void, env, tl, int)#ifdef TARGET_PPC64 DEF_HELPER_FLAGS_2 (DCBZL ,TCG_CALL_NO_WG , void, env, tl)
target/ppc/insn32.decode +7 -0
@@ -527,6 +527,13 @@ CREQV 010011 ..... ..... ..... 0100100001 - @X CRANDC 010011 ..... ..... ..... 0010000001 - @X CRORC 010011 ..... ..... ..... 0110100001 - @X +# Fixed Point Move Assist Instructions + +LSWI 011111 ..... ..... ..... 1 001010101 - @X +LSWX 011111 ..... ..... ..... 1 000010101 - @X +STSWI 011111 ..... ..... ..... 1 011010101 - @X +STSWX 011111 ..... ..... ..... 1 010010101 - @X + # Fixed-Point Hash Instructions HASHST 011111 ..... ..... ..... 1011010010 . @X_DW
target/ppc/mem_helper.c +3 -3
@@ -190,7 +190,7 @@ static void do_lsw(CPUPPCState *env, target_ulong addr, uint32_t nb, env->gpr[reg] = val; } -void helper_lsw (CPUPPCState *env,target_ulong addr, +void helper_LSW (CPUPPCState *env,target_ulong addr,uint32_t nb,uint32_t reg) {do_lsw (env, addr, nb, reg,GETPC ());
@@ -202,7 +202,7 @@ void helper_lsw(CPUPPCState *env, target_ulong addr,* this is valid, but rA won't be loaded. For now, I'll follow the * spec... */ -void helper_lswx (CPUPPCState *env,target_ulong addr,uint32_t reg, +void helper_LSWX (CPUPPCState *env,target_ulong addr,uint32_t reg,uint32_t ra,uint32_t rb) {if (likely (xer_bc !=0 )) {
@@ -218,7 +218,7 @@ void helper_lswx(CPUPPCState *env, target_ulong addr, uint32_t reg, } } -void helper_stsw (CPUPPCState *env,target_ulong addr,uint32_t nb, +void helper_STSW (CPUPPCState *env,target_ulong addr,uint32_t nb,uint32_t reg) {uintptr_t raddr =GETPC ();
target/ppc/translate.c +0 -102
114 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +103 -0
109 lines not on this page · raw message
Signature · 1 line
2.54.0
RFC PATCH 23/28 target/ppc: Move VMX integer arithmetic and BCD instructions to decodetree.
In reply to Chinmay RathFrom: Shivang Upadhyay <[email protected]>
Move below instructions to decodetree specification :
vadd{u, s}{b, h, w, d}m[.],
vsub{u, s}{b, h, w, d}m[.],
vmuluwm[.],
vmul10{u, eu, ecu, cu}q[.] : VX-form
bcd{add, sub}[.],
bcd{s, us}[.],
bcdcpsgn[.],
bcdct{sq, n}[.],
bcdcf{sq, z, n}[.],
bcdctz[.],
bcdsetsgn[.],
bcdsr[.],
bcd{u,}trunc[.] : VX-formThe changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
--- target/ppc/helper.h | 30 +-- target/ppc/insn32.decode | 39 ++++ target/ppc/int_helper.c | 32 ++-- target/ppc/translate/vmx-impl.c.inc | 286 +++++++++++++--------------- target/ppc/translate/vmx-ops.c.inc | 22 --- 5 files changed, 200 insertions(+), 209 deletions(-)
target/ppc/helper.h +15 -15
@@ -350,21 +350,21 @@ DEF_HELPER_FLAGS_3(vshasigmaw, TCG_CALL_NO_RWG, void, avr, avr, i32) DEF_HELPER_FLAGS_3(vshasigmad, TCG_CALL_NO_RWG, void, avr, avr, i32) DEF_HELPER_FLAGS_4(vpermxor, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) -DEF_HELPER_FLAGS_4(bcdadd, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdsub, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdcfn, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdctn, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdcfz, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdctz, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdcfsq, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdctsq, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdcpsgn, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdsetsgn, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcds, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdus, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdsr, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdtrunc, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdutrunc, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDADD, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDSUB, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCFN, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCTN, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCFZ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCTZ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCFSQ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCTSQ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDCPSGN, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDSETSGN, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDS, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDUS, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDSR, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDTRUNC, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDUTRUNC, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) DEF_HELPER_4(XSADDDP, void, env, vsr, vsr, vsr)DEF_HELPER_5 (xsaddqp, void, env, i32, vsr, vsr, vsr)
target/ppc/insn32.decode +39 -0
@@ -90,6 +90,9 @@ &VX vrt vra vrb @VX ...... vrt:5 vra:5 vrb:5 .......... . &VX +&VX_ps vrt vra vrb ps +@VX_ps ...... vrt:5 vra:5 vrb:5 . ps:1 ........ . &VX_ps + &VX_bf bf vra vrb @VX_bf ...... bf:3 .. vra:5 vrb:5 ........... &VX_bf
@@ -108,6 +111,9 @@ &VX_tb vrt vrb @VX_tb ...... vrt:5 ..... vrb:5 ........... &VX_tb +&VX_tb_ps vrt vrb ps +@VX_tb_ps ...... vrt:5 ..... vrb:5 . ps:1 ......... &VX_tb_ps + &X rt ra rb @X ...... rt:5 ra:5 rb:5 .......... . &X
@@ -991,6 +997,10 @@ VADDSBS 000100 ..... ..... ..... 01100000000 @VX VADDSHS 000100 ..... ..... ..... 01101000000 @VX VADDSWS 000100 ..... ..... ..... 01110000000 @VX +VADDUBM 000100 ..... ..... ..... 00000000000 @VX +VADDUHM 000100 ..... ..... ..... 00001000000 @VX +VADDUWM 000100 ..... ..... ..... 00010000000 @VX +VADDUDM 000100 ..... ..... ..... 00011000000 @VX VADDUBS 000100 ..... ..... ..... 01000000000 @VX VADDUHS 000100 ..... ..... ..... 01001000000 @VX VADDUWS 000100 ..... ..... ..... 01010000000 @VX
@@ -1006,6 +1016,10 @@ VSUBSBS 000100 ..... ..... ..... 11100000000 @VX VSUBSHS 000100 ..... ..... ..... 11101000000 @VX VSUBSWS 000100 ..... ..... ..... 11110000000 @VX +VSUBUBM 000100 ..... ..... ..... 10000000000 @VX +VSUBUHM 000100 ..... ..... ..... 10001000000 @VX +VSUBUWM 000100 ..... ..... ..... 10010000000 @VX +VSUBUDM 000100 ..... ..... ..... 10011000000 @VX VSUBUBS 000100 ..... ..... ..... 11000000000 @VX VSUBUHS 000100 ..... ..... ..... 11001000000 @VX VSUBUWS 000100 ..... ..... ..... 11010000000 @VX
@@ -1099,6 +1113,13 @@ VMULHSD 000100 ..... ..... ..... 01111001001 @VX VMULHUD 000100 ..... ..... ..... 01011001001 @VX VMULLD 000100 ..... ..... ..... 00111001001 @VX +VMULUWM 000100 ..... ..... ..... 00010001001 @VX + +VMUL10UQ 000100 ..... ..... ..... 01000000001 @VX +VMUL10EUQ 000100 ..... ..... ..... 01001000001 @VX +VMUL10ECUQ 000100 ..... ..... ..... 00001000001 @VX +VMUL10CUQ 000100 ..... ..... ..... 00000000001 @VX + ## Vector Multiply-Sum Instructions VMSUMUBM 000100 ..... ..... ..... ..... 100100 @VA
@@ -1141,6 +1162,24 @@ VPKSWSS 000100 ..... ..... ..... 0011100111 0 @VX VPKSDSS 000100 ..... ..... ..... 1011100111 0 @VX VPKPX 000100 ..... ..... ..... 0110000111 0 @VX +## Decimal Integer Arithmetic Instructions + +BCDADD 000100 ..... ..... ..... 1.000000001 @VX_ps +BCDSUB 000100 ..... ..... ..... 1.001000001 @VX_ps +BCDUS 000100 ..... ..... ..... 10010000001 @VX +BCDS 000100 ..... ..... ..... 1.011000001 @VX_ps +BCDCTSQ 000100 ..... 00000 ..... 10110000001 @VX_tb +BCDCTN 000100 ..... 00101 ..... 10110000001 @VX_tb +BCDCFSQ 000100 ..... 00010 ..... 1.110000001 @VX_tb_ps +BCDCTZ 000100 ..... 00100 ..... 1.110000001 @VX_tb_ps +BCDCFZ 000100 ..... 00110 ..... 1.110000001 @VX_tb_ps +BCDCFN 000100 ..... 00111 ..... 1.110000001 @VX_tb_ps +BCDSETSGN 000100 ..... 11111 ..... 1.110000001 @VX_tb_ps +BCDCPSGN 000100 ..... ..... ..... 01101000001 @VX +BCDSR 000100 ..... ..... ..... 1.111000001 @VX_ps +BCDTRUNC 000100 ..... ..... ..... 1.100000001 @VX_ps +BCDUTRUNC 000100 ..... ..... ..... 10101000001 @VX + # VSX Load/Store Instructions LXSD 111001 ..... ..... .............. 10 @DS
target/ppc/int_helper.c +16 -16
@@ -2348,7 +2348,7 @@ static void bcd_sub_mag(ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, int *invalid, *overflow = carry; } -uint32_t helper_bcdadd (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDADD (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int sgna =bcd_get_sgn (a);
@@ -2395,7 +2395,7 @@ uint32_t helper_bcdadd(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdsub (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDSUB (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {ppc_avr_t bcopy = *b;int sgnb =bcd_get_sgn (b);
@@ -2406,10 +2406,10 @@ uint32_t helper_bcdsub(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps) }/* else invalid ... defer to bcdadd code for proper handling */ -return helper_bcdadd (r, a, &bcopy, ps); +return helper_BCDADD (r, a, &bcopy, ps); } -uint32_t helper_bcdcfn (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCFN (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;
@@ -2445,7 +2445,7 @@ uint32_t helper_bcdcfn(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdctn (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCTN (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;
@@ -2479,7 +2479,7 @@ uint32_t helper_bcdctn(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdcfz (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCFZ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;
@@ -2523,7 +2523,7 @@ uint32_t helper_bcdcfz(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdctz (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCTZ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;
@@ -2582,7 +2582,7 @@ static inline int ucmp128(uint64_t alo, uint64_t ahi, (ahi > bhi ?1 :-1 ); } -uint32_t helper_bcdcfsq (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCFSQ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr;
@@ -2640,7 +2640,7 @@ uint32_t helper_bcdcfsq(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdctsq (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCTSQ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {uint8_t i;int cr;
@@ -2680,7 +2680,7 @@ uint32_t helper_bcdctsq(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdcpsgn (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCPSGN (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int i;int invalid =0 ;
@@ -2703,7 +2703,7 @@ uint32_t helper_bcdcpsgn(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return bcd_cmp_zero (r); } -uint32_t helper_bcdsetsgn (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDSETSGN (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int sgnb =bcd_get_sgn (b);
@@ -2717,7 +2717,7 @@ uint32_t helper_bcdsetsgn(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return bcd_cmp_zero (r); } -uint32_t helper_bcds (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDS (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int cr;int i = a->VsrSB (7 );
@@ -2753,7 +2753,7 @@ uint32_t helper_bcds(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdus (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDUS (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int cr;int i;
@@ -2790,7 +2790,7 @@ uint32_t helper_bcdus(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdsr (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDSR (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int cr;int unused =0 ;
@@ -2836,7 +2836,7 @@ uint32_t helper_bcdsr(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdtrunc (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDTRUNC (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {uint64_t mask;uint32_t ox_flag =0 ;
@@ -2869,7 +2869,7 @@ uint32_t helper_bcdtrunc(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return bcd_cmp_zero (&ret) | ox_flag; } -uint32_t helper_bcdutrunc (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDUTRUNC (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int i;uint64_t mask;
target/ppc/translate/vmx-impl.c.inc +130 -156
350 lines not on this page · raw message
target/ppc/translate/vmx-ops.c.inc +0 -22
@@ -24,39 +24,17 @@ GEN_HANDLER_E(name0##_##name1, 0x4, opc2, opc3, 0x00000000, type0, type1) GEN_HANDLER_E(name0##_##name1, 0x4, opc2, opc3, 0x00000000, tp0, tp1), \ GEN_HANDLER_E(name0##_##name1, 0x4, opc2, (opc3 | 0x10), 0x00000000, tp0, tp1), -GEN_VXFORM_DUAL(vaddubm, vmul10cuq, 0, 0, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM_DUAL(vadduhm, vmul10ecuq, 0, 1, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM(vadduwm, 0, 2), -GEN_VXFORM_207(vaddudm, 0, 3), -GEN_VXFORM_DUAL(vsububm, bcdadd, 0, 16, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM_DUAL(vsubuhm, bcdsub, 0, 17, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM_DUAL(vsubuwm, bcdus, 0, 18, PPC_ALTIVEC, PPC2_ISA300), -GEN_VXFORM_DUAL(vsubudm, bcds, 0, 19, PPC2_ALTIVEC_207, PPC2_ISA300), -GEN_VXFORM_300(bcds, 0, 27), GEN_VXFORM_300(vextublx, 6, 24), GEN_VXFORM_300(vextuhlx, 6, 25), GEN_VXFORM_DUAL(vmrgow, vextuwlx, 6, 26, PPC_NONE, PPC2_ALTIVEC_207), GEN_VXFORM_300(vextubrx, 6, 28), GEN_VXFORM_300(vextuhrx, 6, 29), GEN_VXFORM_DUAL(vmrgew, vextuwrx, 6, 30, PPC_NONE, PPC2_ALTIVEC_207), -GEN_VXFORM_207(vmuluwm, 4, 2), GEN_VXFORM_300(vsrv, 2, 28), GEN_VXFORM_300(vslv, 2, 29), GEN_VXFORM(vslo, 6, 16), GEN_VXFORM(vsro, 6, 17), -GEN_VXFORM(xpnd04_1, 0, 22), -GEN_VXFORM_300(bcdsr, 0, 23), -GEN_VXFORM_300(bcdsr, 0, 31), -GEN_VXFORM_300_EXT(vmul10uq, 0, 8, 0x0000F800), -GEN_VXFORM_300(vmul10euq, 0, 9), -GEN_VXFORM_300(bcdcpsgn, 0, 13), -GEN_VXFORM_207(bcdadd, 0, 24), -GEN_VXFORM_207(bcdsub, 0, 25), -GEN_VXFORM_300(bcdtrunc, 0, 28), -GEN_VXFORM_300(xpnd04_2, 0, 30), -GEN_VXFORM_300(bcdtrunc, 0, 20), -GEN_VXFORM_300(bcdutrunc, 0, 21), GEN_VXFORM(vsl, 2, 7), GEN_VXFORM(vsr, 2, 11), GEN_VXFORM(vsum4ubs, 4, 24),
Signature · 1 line
2.53.0
Re: [RFC PATCH 23/28] target/ppc: Move VMX integer arithmetic and BCD instructions to decodetree.
Quoted 387 lines · Chinmay Rath
From: Shivang Upadhyay <[email protected]>
Move below instructions to decodetree specification :
vadd{u, s}{b, h, w, d}m[.], vsub{u, s}{b, h, w, d}m[.], vmuluwm[.], vmul10{u, eu, ecu, cu}q[.] : VX-form bcd{add, sub}[.], bcd{s, us}[.], bcdcpsgn[.], bcdct{sq, n}[.], bcdcf{sq, z, n}[.], bcdctz[.], bcdsetsgn[.], bcdsr[.], bcd{u,}trunc[.] : VX-formThe changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
Signed-off-by Shivang Upadhyay <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/helper.h | 30 +-- target/ppc/insn32.decode | 39 ++++ target/ppc/int_helper.c | 32 ++-- target/ppc/translate/vmx-impl.c.inc | 286 +++++++++++++--------------- target/ppc/translate/vmx-ops.c.inc | 22 --- 5 files changed, 200 insertions(+), 209 deletions(-)target/ppc/helper.h +15
-15@@ -350,21 +350,21 @@ DEF_HELPER_FLAGS_3(vshasigmaw, TCG_CALL_NO_RWG, void, avr, avr, i32) DEF_HELPER_FLAGS_3(vshasigmad, TCG_CALL_NO_RWG, void, avr, avr, i32) DEF_HELPER_FLAGS_4(vpermxor, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) -DEF_HELPER_FLAGS_4(bcdadd, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdsub, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdcfn, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdctn, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdcfz, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdctz, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdcfsq, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdctsq, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdcpsgn, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdsetsgn, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcds, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdus, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdsr, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdtrunc, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdutrunc, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDADD, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDSUB, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCFN, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCTN, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCFZ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCTZ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCFSQ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCTSQ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDCPSGN, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDSETSGN, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDS, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDUS, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDSR, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDTRUNC, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDUTRUNC, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) DEF_HELPER_4(XSADDDP, void, env, vsr, vsr, vsr)DEF_HELPER_5 (xsaddqp, void, env, i32, vsr, vsr, vsr)target/ppc/insn32.decode +39
-0@@ -90,6 +90,9 @@ &VX vrt vra vrb @VX ...... vrt:5 vra:5 vrb:5 .......... . &VX +&VX_ps vrt vra vrb ps +@VX_ps ...... vrt:5 vra:5 vrb:5 . ps:1 ........ . &VX_ps + &VX_bf bf vra vrb @VX_bf ...... bf:3 .. vra:5 vrb:5 ........... &VX_bf@@ -108,6 +111,9 @@ &VX_tb vrt vrb @VX_tb ...... vrt:5 ..... vrb:5 ........... &VX_tb +&VX_tb_ps vrt vrb ps +@VX_tb_ps ...... vrt:5 ..... vrb:5 . ps:1 ......... &VX_tb_ps + &X rt ra rb @X ...... rt:5 ra:5 rb:5 .......... . &X@@ -991,6 +997,10 @@ VADDSBS 000100 ..... ..... ..... 01100000000 @VX VADDSHS 000100 ..... ..... ..... 01101000000 @VX VADDSWS 000100 ..... ..... ..... 01110000000 @VX +VADDUBM 000100 ..... ..... ..... 00000000000 @VX +VADDUHM 000100 ..... ..... ..... 00001000000 @VX +VADDUWM 000100 ..... ..... ..... 00010000000 @VX +VADDUDM 000100 ..... ..... ..... 00011000000 @VX VADDUBS 000100 ..... ..... ..... 01000000000 @VX VADDUHS 000100 ..... ..... ..... 01001000000 @VX VADDUWS 000100 ..... ..... ..... 01010000000 @VX@@ -1006,6 +1016,10 @@ VSUBSBS 000100 ..... ..... ..... 11100000000 @VX VSUBSHS 000100 ..... ..... ..... 11101000000 @VX VSUBSWS 000100 ..... ..... ..... 11110000000 @VX +VSUBUBM 000100 ..... ..... ..... 10000000000 @VX +VSUBUHM 000100 ..... ..... ..... 10001000000 @VX +VSUBUWM 000100 ..... ..... ..... 10010000000 @VX +VSUBUDM 000100 ..... ..... ..... 10011000000 @VX VSUBUBS 000100 ..... ..... ..... 11000000000 @VX VSUBUHS 000100 ..... ..... ..... 11001000000 @VX VSUBUWS 000100 ..... ..... ..... 11010000000 @VX@@ -1099,6 +1113,13 @@ VMULHSD 000100 ..... ..... ..... 01111001001 @VX VMULHUD 000100 ..... ..... ..... 01011001001 @VX VMULLD 000100 ..... ..... ..... 00111001001 @VX +VMULUWM 000100 ..... ..... ..... 00010001001 @VX + +VMUL10UQ 000100 ..... ..... ..... 01000000001 @VX +VMUL10EUQ 000100 ..... ..... ..... 01001000001 @VX +VMUL10ECUQ 000100 ..... ..... ..... 00001000001 @VX +VMUL10CUQ 000100 ..... ..... ..... 00000000001 @VX + ## Vector Multiply-Sum Instructions VMSUMUBM 000100 ..... ..... ..... ..... 100100 @VA@@ -1141,6 +1162,24 @@ VPKSWSS 000100 ..... ..... ..... 0011100111 0 @VX VPKSDSS 000100 ..... ..... ..... 1011100111 0 @VX VPKPX 000100 ..... ..... ..... 0110000111 0 @VX +## Decimal Integer Arithmetic Instructions + +BCDADD 000100 ..... ..... ..... 1.000000001 @VX_ps +BCDSUB 000100 ..... ..... ..... 1.001000001 @VX_ps +BCDUS 000100 ..... ..... ..... 10010000001 @VX +BCDS 000100 ..... ..... ..... 1.011000001 @VX_ps +BCDCTSQ 000100 ..... 00000 ..... 10110000001 @VX_tb +BCDCTN 000100 ..... 00101 ..... 10110000001 @VX_tb +BCDCFSQ 000100 ..... 00010 ..... 1.110000001 @VX_tb_ps +BCDCTZ 000100 ..... 00100 ..... 1.110000001 @VX_tb_ps +BCDCFZ 000100 ..... 00110 ..... 1.110000001 @VX_tb_ps +BCDCFN 000100 ..... 00111 ..... 1.110000001 @VX_tb_ps +BCDSETSGN 000100 ..... 11111 ..... 1.110000001 @VX_tb_ps +BCDCPSGN 000100 ..... ..... ..... 01101000001 @VX +BCDSR 000100 ..... ..... ..... 1.111000001 @VX_ps +BCDTRUNC 000100 ..... ..... ..... 1.100000001 @VX_ps +BCDUTRUNC 000100 ..... ..... ..... 10101000001 @VX + # VSX Load/Store Instructions LXSD 111001 ..... ..... .............. 10 @DStarget/ppc/int_helper.c +16
-16@@ -2348,7 +2348,7 @@ static void bcd_sub_mag(ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, int *invalid, *overflow = carry; } -uint32_t helper_bcdadd (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDADD (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int sgna =bcd_get_sgn (a);@@ -2395,7 +2395,7 @@ uint32_t helper_bcdadd(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdsub (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDSUB (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {ppc_avr_t bcopy = *b;int sgnb =bcd_get_sgn (b);@@ -2406,10 +2406,10 @@ uint32_t helper_bcdsub(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps) }/* else invalid ... defer to bcdadd code for proper handling */ -return helper_bcdadd (r, a, &bcopy, ps); +return helper_BCDADD (r, a, &bcopy, ps); } -uint32_t helper_bcdcfn (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCFN (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;@@ -2445,7 +2445,7 @@ uint32_t helper_bcdcfn(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdctn (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCTN (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;@@ -2479,7 +2479,7 @@ uint32_t helper_bcdctn(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdcfz (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCFZ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;@@ -2523,7 +2523,7 @@ uint32_t helper_bcdcfz(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdctz (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCTZ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;@@ -2582,7 +2582,7 @@ static inline int ucmp128(uint64_t alo, uint64_t ahi, (ahi > bhi ?1 :-1 ); } -uint32_t helper_bcdcfsq (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCFSQ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr;@@ -2640,7 +2640,7 @@ uint32_t helper_bcdcfsq(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdctsq (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCTSQ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {uint8_t i;int cr;@@ -2680,7 +2680,7 @@ uint32_t helper_bcdctsq(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdcpsgn (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCPSGN (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int i;int invalid =0 ;@@ -2703,7 +2703,7 @@ uint32_t helper_bcdcpsgn(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return bcd_cmp_zero (r); } -uint32_t helper_bcdsetsgn (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDSETSGN (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int sgnb =bcd_get_sgn (b);@@ -2717,7 +2717,7 @@ uint32_t helper_bcdsetsgn(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return bcd_cmp_zero (r); } -uint32_t helper_bcds (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDS (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int cr;int i = a->VsrSB (7 );@@ -2753,7 +2753,7 @@ uint32_t helper_bcds(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdus (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDUS (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int cr;int i;@@ -2790,7 +2790,7 @@ uint32_t helper_bcdus(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdsr (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDSR (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int cr;int unused =0 ;@@ -2836,7 +2836,7 @@ uint32_t helper_bcdsr(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdtrunc (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDTRUNC (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {uint64_t mask;uint32_t ox_flag =0 ;@@ -2869,7 +2869,7 @@ uint32_t helper_bcdtrunc(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return bcd_cmp_zero (&ret) | ox_flag; } -uint32_t helper_bcdutrunc (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDUTRUNC (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int i;uint64_t mask;target/ppc/translate/vmx-impl.c.inc +15
-26@@ -142,7 +142,8 @@ static void gen_mtvscr(DisasContext *ctx) gen_helper_mtvscr(tcg_env, val); } -static void gen_vx_vmul10(DisasContext *ctx, bool add_cin, bool ret_carry) +static bool do_vx_vmul10(DisasContext *ctx, arg_VX *a, + bool add_cin, bool ret_carry) { TCGv_i64 t0; TCGv_i64 t1;@@ -150,10 +151,7 @@ static void gen_vx_vmul10(DisasContext *ctx, bool add_cin, bool ret_carry) TCGv_i64 avr; TCGv_i64 ten, z; - if (unlikely(!ctx->altivec_enabled)) { - gen_exception(ctx, POWERPC_EXCP_VPU); - return; - } + REQUIRE_VECTOR(ctx); t0 = tcg_temp_new_i64(); t1 = tcg_temp_new_i64();@@ -163,40 +161,33 @@ static void gen_vx_vmul10(DisasContext *ctx, bool add_cin, bool ret_carry) z = tcg_constant_i64(0); if (add_cin) { - get_avr64(avr, rA(ctx->opcode), false); + get_avr64(avr, a->vra, false); tcg_gen_mulu2_i64(t0, t1, avr, ten); - get_avr64(avr, rB(ctx->opcode), false); + get_avr64(avr, a->vrb, false); tcg_gen_andi_i64(t2, avr, 0xF); tcg_gen_add2_i64(avr, t2, t0, t1, t2, z); - set_avr64(rD(ctx->opcode), avr, false); + set_avr64(a->vrt, avr, false); } else { - get_avr64(avr, rA(ctx->opcode), false); + get_avr64(avr, a->vra, false); tcg_gen_mulu2_i64(avr, t2, avr, ten); - set_avr64(rD(ctx->opcode), avr, false); + set_avr64(a->vrt, avr, false); } if (ret_carry) { - get_avr64(avr, rA(ctx->opcode), true); + get_avr64(avr, a->vra, true); tcg_gen_mulu2_i64(t0, t1, avr, ten); tcg_gen_add2_i64(t0, avr, t0, t1, t2, z); - set_avr64(rD(ctx->opcode), avr, false); - set_avr64(rD(ctx->opcode), z, true); + set_avr64(a->vrt, avr, false); + set_avr64(a->vrt, z, true); } else { - get_avr64(avr, rA(ctx->opcode), true); + get_avr64(avr, a->vra, true); tcg_gen_mul_i64(t0, avr, ten); tcg_gen_add_i64(avr, t0, t2); - set_avr64(rD(ctx->opcode), avr, true); + set_avr64(a->vrt, avr, true); } -} - -#define GEN_VX_VMUL10(name, add_cin, ret_carry) \ - static void glue(gen_, name)(DisasContext *ctx) \ - { gen_vx_vmul10(ctx, add_cin, ret_carry); } -GEN_VX_VMUL10(vmul10uq, 0, 0); -GEN_VX_VMUL10(vmul10euq, 1, 0); -GEN_VX_VMUL10(vmul10cuq, 0, 1); -GEN_VX_VMUL10(vmul10ecuq, 1, 1); + return true; +} #define GEN_VXFORM_V(name, vece, tcg_op, opc2, opc3) \ static void glue(gen_, name)(DisasContext *ctx) \@@ -338,19 +329,6 @@ static void glue(gen_, name)(DisasContext *ctx) \ gen_helper_##name(cpu_gpr[rD(ctx->opcode)], cpu_gpr[rA(ctx->opcode)], rb); \ } -GEN_VXFORM_V(vaddubm, MO_8, tcg_gen_gvec_add, 0, 0); -GEN_VXFORM_DUAL_EXT(vaddubm, PPC_ALTIVEC, PPC_NONE, 0, \
target/ppc/translate/vmx-impl.c.inc static void glue(gen_, name)(DisasContext *ctx) \ · line 352
Quoted 10 lines
target/ppc/translate/vmx-impl.c.inc +0
-10- vmul10cuq, PPC_NONE, PPC2_ISA300, 0x0000F800) -GEN_VXFORM_V(vadduhm, MO_16, tcg_gen_gvec_add, 0, 1); -GEN_VXFORM_DUAL(vadduhm, PPC_ALTIVEC, PPC_NONE, \ - vmul10ecuq, PPC_NONE, PPC2_ISA300) -GEN_VXFORM_V(vadduwm, MO_32, tcg_gen_gvec_add, 0, 2); -GEN_VXFORM_V(vaddudm, MO_64, tcg_gen_gvec_add, 0, 3); -GEN_VXFORM_V(vsububm, MO_8, tcg_gen_gvec_sub, 0, 16); -GEN_VXFORM_V(vsubuhm, MO_16, tcg_gen_gvec_sub, 0, 17); -GEN_VXFORM_V(vsubuwm, MO_32, tcg_gen_gvec_sub, 0, 18); -GEN_VXFORM_V(vsubudm, MO_64, tcg_gen_gvec_sub, 0, 19);
Hey Shivang,
Please clean up any macros that end up being unused after the movement. GEN_VXFORM_V is one such.
Thanks,
Chinmay
Quoted 311 lines
target/ppc/translate/vmx-impl.c.inc +115
-120- static bool do_vmrg(DisasContext *ctx, arg_VX *a, void (*helper)(TCGv_ptr, TCGv_ptr, TCGv_ptr)) {@@ -370,6 +348,38 @@ TRANS_FLAGS(ALTIVEC, VMRGLB, do_vmrg, gen_helper_VMRGLB); TRANS_FLAGS(ALTIVEC, VMRGLH, do_vmrg, gen_helper_VMRGLH); TRANS_FLAGS(ALTIVEC, VMRGLW, do_vmrg, gen_helper_VMRGLW); +static bool do_vx_vaddsubm(DisasContext *ctx, arg_VX *a, MemOp vece, + void (*gen_op)(unsigned, uint32_t, uint32_t, + uint32_t, uint32_t, uint32_t)) +{ + REQUIRE_VECTOR(ctx); + + gen_op(vece, + avr_full_offset(a->vrt), + avr_full_offset(a->vra), + avr_full_offset(a->vrb), + 16, 16); + + return true; +} + +TRANS_FLAGS(ALTIVEC, VADDUBM, do_vx_vaddsubm, MO_8, tcg_gen_gvec_add) +TRANS_FLAGS(ALTIVEC, VADDUHM, do_vx_vaddsubm, MO_16, tcg_gen_gvec_add) +TRANS_FLAGS(ALTIVEC, VADDUWM, do_vx_vaddsubm, MO_32, tcg_gen_gvec_add) +TRANS_FLAGS2(ALTIVEC_207, VADDUDM, do_vx_vaddsubm, MO_64, tcg_gen_gvec_add) + +TRANS_FLAGS(ALTIVEC, VSUBUBM, do_vx_vaddsubm, MO_8, tcg_gen_gvec_sub) +TRANS_FLAGS(ALTIVEC, VSUBUHM, do_vx_vaddsubm, MO_16, tcg_gen_gvec_sub) +TRANS_FLAGS(ALTIVEC, VSUBUWM, do_vx_vaddsubm, MO_32, tcg_gen_gvec_sub) +TRANS_FLAGS2(ALTIVEC_207, VSUBUDM, do_vx_vaddsubm, MO_64, tcg_gen_gvec_sub) + +TRANS_FLAGS2(ALTIVEC_207, VMULUWM, do_vx_vaddsubm, MO_32, tcg_gen_gvec_mul) + +TRANS_FLAGS2(ISA300, VMUL10CUQ, do_vx_vmul10, false, true) +TRANS_FLAGS2(ISA300, VMUL10ECUQ, do_vx_vmul10, true, true) +TRANS_FLAGS2(ISA300, VMUL10UQ, do_vx_vmul10, false, false) +TRANS_FLAGS2(ISA300, VMUL10EUQ, do_vx_vmul10, true, false) + static void trans_vmrgew(DisasContext *ctx) { int VT = rD(ctx->opcode);@@ -684,7 +694,6 @@ static void trans_vclzd(DisasContext *ctx) set_avr64(VT, avr, false); } -GEN_VXFORM_V(vmuluwm, MO_32, tcg_gen_gvec_mul, 4, 2); GEN_VXFORM(vsrv, 2, 28); GEN_VXFORM(vslv, 2, 29); GEN_VXFORM(vslo, 6, 16);@@ -2523,126 +2532,93 @@ GEN_VXFORM(vpmsumb, 4, 16) GEN_VXFORM(vpmsumh, 4, 17) GEN_VXFORM(vpmsumw, 4, 18) -#define GEN_BCD(op) \ -static void gen_##op(DisasContext *ctx) \ -{ \ - TCGv_ptr ra, rb, rd; \ - TCGv_i32 ps; \ - \ - if (unlikely(!ctx->altivec_enabled)) { \ - gen_exception(ctx, POWERPC_EXCP_VPU); \ - return; \ - } \ - \ - ra = gen_avr_ptr(rA(ctx->opcode)); \ - rb = gen_avr_ptr(rB(ctx->opcode)); \ - rd = gen_avr_ptr(rD(ctx->opcode)); \ - \ - ps = tcg_constant_i32((ctx->opcode & 0x200) != 0); \ - \ - gen_helper_##op(cpu_crf[6], rd, ra, rb, ps); \ -} - -#define GEN_BCD2(op) \ -static void gen_##op(DisasContext *ctx) \ -{ \ - TCGv_ptr rd, rb; \ - TCGv_i32 ps; \ - \ - if (unlikely(!ctx->altivec_enabled)) { \ - gen_exception(ctx, POWERPC_EXCP_VPU); \ - return; \ - } \ - \ - rb = gen_avr_ptr(rB(ctx->opcode)); \ - rd = gen_avr_ptr(rD(ctx->opcode)); \ - \ - ps = tcg_constant_i32((ctx->opcode & 0x200) != 0); \ - \ - gen_helper_##op(cpu_crf[6], rd, rb, ps); \ -} - -GEN_BCD(bcdadd) -GEN_BCD(bcdsub) -GEN_BCD2(bcdcfn) -GEN_BCD2(bcdctn) -GEN_BCD2(bcdcfz) -GEN_BCD2(bcdctz) -GEN_BCD2(bcdcfsq) -GEN_BCD2(bcdctsq) -GEN_BCD2(bcdsetsgn) -GEN_BCD(bcdcpsgn); -GEN_BCD(bcds); -GEN_BCD(bcdus); -GEN_BCD(bcdsr); -GEN_BCD(bcdtrunc); -GEN_BCD(bcdutrunc); - -static void gen_xpnd04_1(DisasContext *ctx) -{ - switch (opc4(ctx->opcode)) { - case 0: - gen_bcdctsq(ctx); - break; - case 2: - gen_bcdcfsq(ctx); - break; - case 4: - gen_bcdctz(ctx); - break; - case 5: - gen_bcdctn(ctx); - break; - case 6: - gen_bcdcfz(ctx); - break; - case 7: - gen_bcdcfn(ctx); - break; - case 31: - gen_bcdsetsgn(ctx); - break; - default: - gen_invalid(ctx); - break; - } +static bool do_bcd_ps(DisasContext *ctx, arg_VX_ps *a, + void (*helper)(TCGv_i32, TCGv_ptr, TCGv_ptr, + TCGv_ptr, TCGv_i32)) +{ + TCGv_ptr ra, rb, rd; + TCGv_i32 ps; + + REQUIRE_VECTOR(ctx); + + ra = gen_avr_ptr(a->vra); + rb = gen_avr_ptr(a->vrb); + rd = gen_avr_ptr(a->vrt); + ps = tcg_constant_i32(a->ps); + + helper(cpu_crf[6], rd, ra, rb, ps); + return true; } -static void gen_xpnd04_2(DisasContext *ctx) -{ - switch (opc4(ctx->opcode)) { - case 0: - gen_bcdctsq(ctx); - break; - case 2: - gen_bcdcfsq(ctx); - break; - case 4: - gen_bcdctz(ctx); - break; - case 6: - gen_bcdcfz(ctx); - break; - case 7: - gen_bcdcfn(ctx); - break; - case 31: - gen_bcdsetsgn(ctx); - break; - default: - gen_invalid(ctx); - break; - } +static bool do_bcd(DisasContext *ctx, arg_VX *a, + void (*helper)(TCGv_i32, TCGv_ptr, TCGv_ptr, + TCGv_ptr, TCGv_i32)) +{ + TCGv_ptr ra, rb, rd; + TCGv_i32 ps; + + REQUIRE_VECTOR(ctx); + + ra = gen_avr_ptr(a->vra); + rb = gen_avr_ptr(a->vrb); + rd = gen_avr_ptr(a->vrt); + ps = tcg_constant_i32(0); + + helper(cpu_crf[6], rd, ra, rb, ps); + return true; +} + +static bool do_bcd_tb(DisasContext *ctx, arg_VX_tb *a, + void (*helper)(TCGv_i32, TCGv_ptr, TCGv_ptr, TCGv_i32)) +{ + TCGv_ptr rd, rb; + TCGv_i32 ps; + + REQUIRE_VECTOR(ctx); + + rb = gen_avr_ptr(a->vrb); + rd = gen_avr_ptr(a->vrt); + + ps = tcg_constant_i32(0); + + helper(cpu_crf[6], rd, rb, ps); + + return true; } -GEN_VXFORM_DUAL(vsububm, PPC_ALTIVEC, PPC_NONE, \ - bcdadd, PPC_NONE, PPC2_ALTIVEC_207) -GEN_VXFORM_DUAL(vsubuhm, PPC_ALTIVEC, PPC_NONE, \ - bcdsub, PPC_NONE, PPC2_ALTIVEC_207) -GEN_VXFORM_DUAL(vsubudm, PPC2_ALTIVEC_207, PPC_NONE, \ - bcds, PPC_NONE, PPC2_ISA300) -GEN_VXFORM_DUAL(vsubuwm, PPC_ALTIVEC, PPC_NONE, \ - bcdus, PPC_NONE, PPC2_ISA300) +static bool do_bcd_tb_ps(DisasContext *ctx, arg_VX_tb_ps *a, + void (*helper)(TCGv_i32, TCGv_ptr, TCGv_ptr, TCGv_i32)) +{ + TCGv_ptr rd, rb; + TCGv_i32 ps; + + REQUIRE_VECTOR(ctx); + + rb = gen_avr_ptr(a->vrb); + rd = gen_avr_ptr(a->vrt); + + ps = tcg_constant_i32(a->ps); + + helper(cpu_crf[6], rd, rb, ps); + + return true; +} + +TRANS_FLAGS2(ALTIVEC_207, BCDADD, do_bcd_ps, gen_helper_BCDADD) +TRANS_FLAGS2(ALTIVEC_207, BCDSUB, do_bcd_ps, gen_helper_BCDSUB) +TRANS_FLAGS2(ISA300, BCDUS, do_bcd, gen_helper_BCDUS) +TRANS_FLAGS2(ISA300, BCDS, do_bcd_ps, gen_helper_BCDS) +TRANS_FLAGS2(ISA300, BCDCFN, do_bcd_tb_ps, gen_helper_BCDCFN) +TRANS_FLAGS2(ISA300, BCDCTN, do_bcd_tb, gen_helper_BCDCTN) +TRANS_FLAGS2(ISA300, BCDCFZ, do_bcd_tb_ps, gen_helper_BCDCFZ) +TRANS_FLAGS2(ISA300, BCDCTZ, do_bcd_tb_ps, gen_helper_BCDCTZ) +TRANS_FLAGS2(ISA300, BCDCFSQ, do_bcd_tb_ps, gen_helper_BCDCFSQ) +TRANS_FLAGS2(ISA300, BCDCTSQ, do_bcd_tb, gen_helper_BCDCTSQ) +TRANS_FLAGS2(ISA300, BCDSETSGN, do_bcd_tb_ps, gen_helper_BCDSETSGN) +TRANS_FLAGS2(ISA300, BCDCPSGN, do_bcd, gen_helper_BCDCPSGN) +TRANS_FLAGS2(ISA300, BCDTRUNC, do_bcd_ps, gen_helper_BCDTRUNC) +TRANS_FLAGS2(ISA300, BCDUTRUNC, do_bcd, gen_helper_BCDUTRUNC) +TRANS_FLAGS2(ISA300, BCDSR, do_bcd_ps, gen_helper_BCDSR) static void gen_vsbox(DisasContext *ctx) {@@ -3502,5 +3478,3 @@ TRANS_FLAGS2(ISA310, VMODUQ, do_vx_helper, gen_helper_VMODUQ) #undef GEN_VXFORM_NOA #undef GEN_VXFORM_UIMM #undef GEN_VAFORM_PAIRED - -#undef GEN_BCD2target/ppc/translate/vmx-ops.c.inc +0
-22@@ -24,39 +24,17 @@ GEN_HANDLER_E(name0##_##name1, 0x4, opc2, opc3, 0x00000000, type0, type1) GEN_HANDLER_E(name0##_##name1, 0x4, opc2, opc3, 0x00000000, tp0, tp1), \ GEN_HANDLER_E(name0##_##name1, 0x4, opc2, (opc3 | 0x10), 0x00000000, tp0, tp1), -GEN_VXFORM_DUAL(vaddubm, vmul10cuq, 0, 0, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM_DUAL(vadduhm, vmul10ecuq, 0, 1, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM(vadduwm, 0, 2), -GEN_VXFORM_207(vaddudm, 0, 3), -GEN_VXFORM_DUAL(vsububm, bcdadd, 0, 16, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM_DUAL(vsubuhm, bcdsub, 0, 17, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM_DUAL(vsubuwm, bcdus, 0, 18, PPC_ALTIVEC, PPC2_ISA300), -GEN_VXFORM_DUAL(vsubudm, bcds, 0, 19, PPC2_ALTIVEC_207, PPC2_ISA300), -GEN_VXFORM_300(bcds, 0, 27), GEN_VXFORM_300(vextublx, 6, 24), GEN_VXFORM_300(vextuhlx, 6, 25), GEN_VXFORM_DUAL(vmrgow, vextuwlx, 6, 26, PPC_NONE, PPC2_ALTIVEC_207), GEN_VXFORM_300(vextubrx, 6, 28), GEN_VXFORM_300(vextuhrx, 6, 29), GEN_VXFORM_DUAL(vmrgew, vextuwrx, 6, 30, PPC_NONE, PPC2_ALTIVEC_207), -GEN_VXFORM_207(vmuluwm, 4, 2), GEN_VXFORM_300(vsrv, 2, 28), GEN_VXFORM_300(vslv, 2, 29), GEN_VXFORM(vslo, 6, 16), GEN_VXFORM(vsro, 6, 17), -GEN_VXFORM(xpnd04_1, 0, 22), -GEN_VXFORM_300(bcdsr, 0, 23), -GEN_VXFORM_300(bcdsr, 0, 31), -GEN_VXFORM_300_EXT(vmul10uq, 0, 8, 0x0000F800), -GEN_VXFORM_300(vmul10euq, 0, 9), -GEN_VXFORM_300(bcdcpsgn, 0, 13), -GEN_VXFORM_207(bcdadd, 0, 24), -GEN_VXFORM_207(bcdsub, 0, 25), -GEN_VXFORM_300(bcdtrunc, 0, 28), -GEN_VXFORM_300(xpnd04_2, 0, 30), -GEN_VXFORM_300(bcdtrunc, 0, 20), -GEN_VXFORM_300(bcdutrunc, 0, 21), GEN_VXFORM(vsl, 2, 7), GEN_VXFORM(vsr, 2, 11), GEN_VXFORM(vsum4ubs, 4, 24),
Re: [RFC PATCH 23/28] target/ppc: Move VMX integer arithmetic and BCD instructions to decodetree.
Quoted 3 lines · Chinmay Rath
Please clean up any macros that end up being unused after the movement.
GEN_VXFORM_Vis one such.
Nice find.
Thanks.
~Shivang.
PATCH v2 1/1 target/ppc: Move VMX integer arithmetic and BCD instructions to decodetree.
In reply to Chinmay RathMove below instructions to decodetree specification :
vadd{u, s}{b, h, w, d}m[.],
vsub{u, s}{b, h, w, d}m[.],
vmuluwm[.],
vmul10{u, eu, ecu, cu}q[.] : VX-form
bcd{add, sub}[.],
bcd{s, us}[.],
bcdcpsgn[.],
bcdct{sq, n}[.],
bcdcf{sq, z, n}[.],
bcdctz[.],
bcdsetsgn[.],
bcdsr[.],
bcd{u,}trunc[.] : VX-formThe changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
--- target/ppc/helper.h | 30 +-- target/ppc/insn32.decode | 39 ++++ target/ppc/int_helper.c | 32 +-- target/ppc/translate/vmx-impl.c.inc | 299 ++++++++++++---------------- target/ppc/translate/vmx-ops.c.inc | 22 -- 5 files changed, 199 insertions(+), 223 deletions(-)
target/ppc/helper.h +15 -15
@@ -350,21 +350,21 @@ DEF_HELPER_FLAGS_3(vshasigmaw, TCG_CALL_NO_RWG, void, avr, avr, i32) DEF_HELPER_FLAGS_3(vshasigmad, TCG_CALL_NO_RWG, void, avr, avr, i32) DEF_HELPER_FLAGS_4(vpermxor, TCG_CALL_NO_RWG, void, avr, avr, avr, avr) -DEF_HELPER_FLAGS_4(bcdadd, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdsub, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdcfn, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdctn, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdcfz, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdctz, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdcfsq, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdctsq, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdcpsgn, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_3(bcdsetsgn, TCG_CALL_NO_RWG, i32, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcds, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdus, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdsr, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdtrunc, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) -DEF_HELPER_FLAGS_4(bcdutrunc, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDADD, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDSUB, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCFN, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCTN, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCFZ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCTZ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCFSQ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDCTSQ, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDCPSGN, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_3(BCDSETSGN, TCG_CALL_NO_RWG, i32, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDS, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDUS, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDSR, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDTRUNC, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) +DEF_HELPER_FLAGS_4(BCDUTRUNC, TCG_CALL_NO_RWG, i32, avr, avr, avr, i32) DEF_HELPER_4(XSADDDP, void, env, vsr, vsr, vsr)DEF_HELPER_5 (xsaddqp, void, env, i32, vsr, vsr, vsr)
target/ppc/insn32.decode +39 -0
@@ -90,6 +90,9 @@ &VX vrt vra vrb @VX ...... vrt:5 vra:5 vrb:5 .......... . &VX +&VX_ps vrt vra vrb ps +@VX_ps ...... vrt:5 vra:5 vrb:5 . ps:1 ........ . &VX_ps + &VX_bf bf vra vrb @VX_bf ...... bf:3 .. vra:5 vrb:5 ........... &VX_bf
@@ -108,6 +111,9 @@ &VX_tb vrt vrb @VX_tb ...... vrt:5 ..... vrb:5 ........... &VX_tb +&VX_tb_ps vrt vrb ps +@VX_tb_ps ...... vrt:5 ..... vrb:5 . ps:1 ......... &VX_tb_ps + &X rt ra rb @X ...... rt:5 ra:5 rb:5 .......... . &X
@@ -991,6 +997,10 @@ VADDSBS 000100 ..... ..... ..... 01100000000 @VX VADDSHS 000100 ..... ..... ..... 01101000000 @VX VADDSWS 000100 ..... ..... ..... 01110000000 @VX +VADDUBM 000100 ..... ..... ..... 00000000000 @VX +VADDUHM 000100 ..... ..... ..... 00001000000 @VX +VADDUWM 000100 ..... ..... ..... 00010000000 @VX +VADDUDM 000100 ..... ..... ..... 00011000000 @VX VADDUBS 000100 ..... ..... ..... 01000000000 @VX VADDUHS 000100 ..... ..... ..... 01001000000 @VX VADDUWS 000100 ..... ..... ..... 01010000000 @VX
@@ -1006,6 +1016,10 @@ VSUBSBS 000100 ..... ..... ..... 11100000000 @VX VSUBSHS 000100 ..... ..... ..... 11101000000 @VX VSUBSWS 000100 ..... ..... ..... 11110000000 @VX +VSUBUBM 000100 ..... ..... ..... 10000000000 @VX +VSUBUHM 000100 ..... ..... ..... 10001000000 @VX +VSUBUWM 000100 ..... ..... ..... 10010000000 @VX +VSUBUDM 000100 ..... ..... ..... 10011000000 @VX VSUBUBS 000100 ..... ..... ..... 11000000000 @VX VSUBUHS 000100 ..... ..... ..... 11001000000 @VX VSUBUWS 000100 ..... ..... ..... 11010000000 @VX
@@ -1099,6 +1113,13 @@ VMULHSD 000100 ..... ..... ..... 01111001001 @VX VMULHUD 000100 ..... ..... ..... 01011001001 @VX VMULLD 000100 ..... ..... ..... 00111001001 @VX +VMULUWM 000100 ..... ..... ..... 00010001001 @VX + +VMUL10UQ 000100 ..... ..... ..... 01000000001 @VX +VMUL10EUQ 000100 ..... ..... ..... 01001000001 @VX +VMUL10ECUQ 000100 ..... ..... ..... 00001000001 @VX +VMUL10CUQ 000100 ..... ..... ..... 00000000001 @VX + ## Vector Multiply-Sum Instructions VMSUMUBM 000100 ..... ..... ..... ..... 100100 @VA
@@ -1141,6 +1162,24 @@ VPKSWSS 000100 ..... ..... ..... 0011100111 0 @VX VPKSDSS 000100 ..... ..... ..... 1011100111 0 @VX VPKPX 000100 ..... ..... ..... 0110000111 0 @VX +## Decimal Integer Arithmetic Instructions + +BCDADD 000100 ..... ..... ..... 1.000000001 @VX_ps +BCDSUB 000100 ..... ..... ..... 1.001000001 @VX_ps +BCDUS 000100 ..... ..... ..... 10010000001 @VX +BCDS 000100 ..... ..... ..... 1.011000001 @VX_ps +BCDCTSQ 000100 ..... 00000 ..... 10110000001 @VX_tb +BCDCTN 000100 ..... 00101 ..... 10110000001 @VX_tb +BCDCFSQ 000100 ..... 00010 ..... 1.110000001 @VX_tb_ps +BCDCTZ 000100 ..... 00100 ..... 1.110000001 @VX_tb_ps +BCDCFZ 000100 ..... 00110 ..... 1.110000001 @VX_tb_ps +BCDCFN 000100 ..... 00111 ..... 1.110000001 @VX_tb_ps +BCDSETSGN 000100 ..... 11111 ..... 1.110000001 @VX_tb_ps +BCDCPSGN 000100 ..... ..... ..... 01101000001 @VX +BCDSR 000100 ..... ..... ..... 1.111000001 @VX_ps +BCDTRUNC 000100 ..... ..... ..... 1.100000001 @VX_ps +BCDUTRUNC 000100 ..... ..... ..... 10101000001 @VX + # VSX Load/Store Instructions LXSD 111001 ..... ..... .............. 10 @DS
target/ppc/int_helper.c +16 -16
@@ -2348,7 +2348,7 @@ static void bcd_sub_mag(ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, int *invalid, *overflow = carry; } -uint32_t helper_bcdadd (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDADD (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int sgna =bcd_get_sgn (a);
@@ -2395,7 +2395,7 @@ uint32_t helper_bcdadd(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdsub (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDSUB (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {ppc_avr_t bcopy = *b;int sgnb =bcd_get_sgn (b);
@@ -2406,10 +2406,10 @@ uint32_t helper_bcdsub(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps) }/* else invalid ... defer to bcdadd code for proper handling */ -return helper_bcdadd (r, a, &bcopy, ps); +return helper_BCDADD (r, a, &bcopy, ps); } -uint32_t helper_bcdcfn (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCFN (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;
@@ -2445,7 +2445,7 @@ uint32_t helper_bcdcfn(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdctn (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCTN (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;
@@ -2479,7 +2479,7 @@ uint32_t helper_bcdctn(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdcfz (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCFZ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;
@@ -2523,7 +2523,7 @@ uint32_t helper_bcdcfz(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdctz (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCTZ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr =0 ;
@@ -2582,7 +2582,7 @@ static inline int ucmp128(uint64_t alo, uint64_t ahi, (ahi > bhi ?1 :-1 ); } -uint32_t helper_bcdcfsq (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCFSQ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int i;int cr;
@@ -2640,7 +2640,7 @@ uint32_t helper_bcdcfsq(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdctsq (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCTSQ (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {uint8_t i;int cr;
@@ -2680,7 +2680,7 @@ uint32_t helper_bcdctsq(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdcpsgn (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDCPSGN (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int i;int invalid =0 ;
@@ -2703,7 +2703,7 @@ uint32_t helper_bcdcpsgn(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return bcd_cmp_zero (r); } -uint32_t helper_bcdsetsgn (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDSETSGN (ppc_avr_t *r,ppc_avr_t *b,uint32_t ps) {int sgnb =bcd_get_sgn (b);
@@ -2717,7 +2717,7 @@ uint32_t helper_bcdsetsgn(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps)return bcd_cmp_zero (r); } -uint32_t helper_bcds (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDS (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int cr;int i = a->VsrSB (7 );
@@ -2753,7 +2753,7 @@ uint32_t helper_bcds(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdus (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDUS (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int cr;int i;
@@ -2790,7 +2790,7 @@ uint32_t helper_bcdus(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdsr (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDSR (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int cr;int unused =0 ;
@@ -2836,7 +2836,7 @@ uint32_t helper_bcdsr(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return cr; } -uint32_t helper_bcdtrunc (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDTRUNC (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {uint64_t mask;uint32_t ox_flag =0 ;
@@ -2869,7 +2869,7 @@ uint32_t helper_bcdtrunc(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)return bcd_cmp_zero (&ret) | ox_flag; } -uint32_t helper_bcdutrunc (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) +uint32_t helper_BCDUTRUNC (ppc_avr_t *r,ppc_avr_t *a,ppc_avr_t *b,uint32_t ps) {int i;uint64_t mask;
target/ppc/translate/vmx-impl.c.inc +129 -170
363 lines not on this page · raw message
target/ppc/translate/vmx-ops.c.inc +0 -22
@@ -24,39 +24,17 @@ GEN_HANDLER_E(name0##_##name1, 0x4, opc2, opc3, 0x00000000, type0, type1) GEN_HANDLER_E(name0##_##name1, 0x4, opc2, opc3, 0x00000000, tp0, tp1), \ GEN_HANDLER_E(name0##_##name1, 0x4, opc2, (opc3 | 0x10), 0x00000000, tp0, tp1), -GEN_VXFORM_DUAL(vaddubm, vmul10cuq, 0, 0, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM_DUAL(vadduhm, vmul10ecuq, 0, 1, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM(vadduwm, 0, 2), -GEN_VXFORM_207(vaddudm, 0, 3), -GEN_VXFORM_DUAL(vsububm, bcdadd, 0, 16, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM_DUAL(vsubuhm, bcdsub, 0, 17, PPC_ALTIVEC, PPC_NONE), -GEN_VXFORM_DUAL(vsubuwm, bcdus, 0, 18, PPC_ALTIVEC, PPC2_ISA300), -GEN_VXFORM_DUAL(vsubudm, bcds, 0, 19, PPC2_ALTIVEC_207, PPC2_ISA300), -GEN_VXFORM_300(bcds, 0, 27), GEN_VXFORM_300(vextublx, 6, 24), GEN_VXFORM_300(vextuhlx, 6, 25), GEN_VXFORM_DUAL(vmrgow, vextuwlx, 6, 26, PPC_NONE, PPC2_ALTIVEC_207), GEN_VXFORM_300(vextubrx, 6, 28), GEN_VXFORM_300(vextuhrx, 6, 29), GEN_VXFORM_DUAL(vmrgew, vextuwrx, 6, 30, PPC_NONE, PPC2_ALTIVEC_207), -GEN_VXFORM_207(vmuluwm, 4, 2), GEN_VXFORM_300(vsrv, 2, 28), GEN_VXFORM_300(vslv, 2, 29), GEN_VXFORM(vslo, 6, 16), GEN_VXFORM(vsro, 6, 17), -GEN_VXFORM(xpnd04_1, 0, 22), -GEN_VXFORM_300(bcdsr, 0, 23), -GEN_VXFORM_300(bcdsr, 0, 31), -GEN_VXFORM_300_EXT(vmul10uq, 0, 8, 0x0000F800), -GEN_VXFORM_300(vmul10euq, 0, 9), -GEN_VXFORM_300(bcdcpsgn, 0, 13), -GEN_VXFORM_207(bcdadd, 0, 24), -GEN_VXFORM_207(bcdsub, 0, 25), -GEN_VXFORM_300(bcdtrunc, 0, 28), -GEN_VXFORM_300(xpnd04_2, 0, 30), -GEN_VXFORM_300(bcdtrunc, 0, 20), -GEN_VXFORM_300(bcdutrunc, 0, 21), GEN_VXFORM(vsl, 2, 7), GEN_VXFORM(vsr, 2, 11), GEN_VXFORM(vsum4ubs, 4, 24),
Signature · 1 line
2.54.0
Re: [PATCH v2] target/ppc: Move VMX integer arithmetic and BCD instructions to decodetree.
Quoted 8 lines · Shivang Upadhyay
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the '-d in_asm,op' flag.
Signed-off-by Chinmay Rath <[email protected]>Signed-off-by Shivang Upadhyay <[email protected]>---
Forgot to mention Changelog, I'll do that here.
-- Changelog --
Since v1:
remove the dangling macro GEN_FORM_V.
~Shivang.
RFC PATCH 24/28 target/ppc: Move rlwimi, rlwinm instructions to decodetree
In reply to Chinmay RathFrom: Tanushree Shah <[email protected]>
-Moving the following instructions to decodetree specification:
rlwimi : M-form
rlwimi. : M-form
rlwinm : M-form
rlwinm. : M-formThe changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the "-d in_asm,op" flag.
Additionally, validated using small assembly tests confirming the destination register is correctly updated based on rotated and masked source values and confirmed that the value was same before and after the change
--- target/ppc/insn32.decode | 6 ++ target/ppc/translate.c | 106 --------------------- target/ppc/translate/fixedpoint-impl.c.inc | 98 +++++++++++++++++++ 3 files changed, 104 insertions(+), 106 deletions(-)
target/ppc/insn32.decode +6 -0
@@ -312,6 +312,9 @@ @Z23_te_tbp ...... ....0 te:5 ....0 rmc:2 ........ rc:1 &Z23_te_tb frt=%z23_frtp frb=%z23_frbp +&M ra rs sh mb me rc:bool +@M ...... rs:5 ra:5 sh:5 mb:5 me:5 rc:1 &M + ### Fixed-Point Load Instructions LBZ 100010 ..... ..... ................ @D
@@ -561,6 +564,9 @@ SRADI 011111 ..... ..... ..... 110011101 . . @XS EXTSWSLI 011111 ..... ..... ..... 110111101 . . @XS +RLWIMI 010100 ..... ..... ..... ..... ...... @M +RLWINM 010101 ..... ..... ..... ..... ...... @M + ## BCD Assist ADDG6S 011111 ..... ..... ..... - 001001010 - @X
target/ppc/translate.c +0 -106
118 lines not on this page · raw message
target/ppc/translate/fixedpoint-impl.c.inc +98 -0
104 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH 25/28 target/ppc: Move lmw, stmw instructions to decodetree
In reply to Chinmay RathFrom: Tanushree Shah <[email protected]>
Moving the following instructions to decodetree specification:
lmw : D-form
stmw : D-form
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the "-d in_asm,op" flag.
Additionally, validated using small assembly tests confirming the the correct register store/load behavior. Also, confirmed the register values are same before and after the change.
--- target/ppc/helper.h | 4 +-- target/ppc/insn32.decode | 3 ++ target/ppc/mem_helper.c | 4 +-- target/ppc/translate.c | 39 ---------------------- target/ppc/translate/fixedpoint-impl.c.inc | 32 ++++++++++++++++++ 5 files changed, 39 insertions(+), 43 deletions(-)
target/ppc/helper.h +2 -2
@@ -43,8 +43,8 @@ DEF_HELPER_1(check_tlb_flush_local, void, env) DEF_HELPER_1(check_tlb_flush_global, void, env)#endif -DEF_HELPER_3(lmw, void, env, tl, i32) -DEF_HELPER_FLAGS_3(stmw, TCG_CALL_NO_WG, void, env, tl, i32) +DEF_HELPER_3(LMW, void, env, tl, i32) +DEF_HELPER_FLAGS_3(STMW, TCG_CALL_NO_WG, void, env, tl, i32) DEF_HELPER_4(LSW, void, env, tl, i32, i32) DEF_HELPER_5(LSWX, void, env, tl, i32, i32, i32)DEF_HELPER_FLAGS_4 (STSW ,TCG_CALL_NO_WG , void, env, tl, i32, i32)
target/ppc/insn32.decode +3 -0
@@ -354,6 +354,7 @@ LVDX 011111 ..... ..... ..... 0000010001 - @X LSKU 111010 ..... ..... ............. 0 11 @DD LCXU 111010 ..... ..... ............. 1 11 @DD +LMW 101110 ..... ..... ................ @D ### Fixed-Point Atomic Load/Store Instructions
@@ -399,6 +400,8 @@ STBCIX 011111 ..... ..... ..... 1111010101 - @X STHBRX 011111 ..... ..... ..... 1110010110 - @X STWBRX 011111 ..... ..... ..... 1010010110 - @X +STMW 101111 ..... ..... ................ @D + ### Fixed-Point Compare Instructions CMP 011111 ... - . ..... ..... 0000000000 - @X_bfl
target/ppc/mem_helper.c +2 -2
@@ -73,7 +73,7 @@ static void *probe_contiguous(CPUPPCState *env, target_ulong addr, uint32_t nb,return NULL ; } -void helper_lmw (CPUPPCState *env,target_ulong addr,uint32_t reg) +void helper_LMW (CPUPPCState *env,target_ulong addr,uint32_t reg) {uintptr_t raddr =GETPC ();int mmu_idx =ppc_env_mmu_index (env, false);
@@ -98,7 +98,7 @@ void helper_lmw(CPUPPCState *env, target_ulong addr, uint32_t reg) } } -void helper_stmw (CPUPPCState *env,target_ulong addr,uint32_t reg) +void helper_STMW (CPUPPCState *env,target_ulong addr,uint32_t reg) {uintptr_t raddr =GETPC ();int mmu_idx =ppc_env_mmu_index (env, false);
target/ppc/translate.c +0 -39
@@ -2457,43 +2457,6 @@ GEN_LDX(lwbr, ld32ur, 0x16, 0x10, PPC_INTEGER);GEN_LDX_E (ldbr, ld64ur_i64,0x14 ,0x10 ,PPC_NONE ,PPC2_DBRX ,CHK_NONE );#endif /* TARGET_PPC64 */ -/*** Integer load and store multiple ***/ - -/* lmw */ -static void gen_lmw (DisasContext *ctx) -{ -TCGv t0; -TCGv_i32 t1; - -if (ctx->le_mode) { -gen_align_no_le (ctx); -return ; - } -gen_set_access_type (ctx,ACCESS_INT ); - t0 =tcg_temp_new (); - t1 =tcg_constant_i32 (rD (ctx->opcode)); -gen_addr_imm_index (ctx, t0,0 ); -gen_helper_lmw (tcg_env, t0, t1); -} - -/* stmw */ -static void gen_stmw (DisasContext *ctx) -{ -TCGv t0; -TCGv_i32 t1; - -if (ctx->le_mode) { -gen_align_no_le (ctx); -return ; - } -gen_set_access_type (ctx,ACCESS_INT ); - t0 =tcg_temp_new (); - t1 =tcg_constant_i32 (rS (ctx->opcode)); -gen_addr_imm_index (ctx, t0,0 ); -gen_helper_stmw (tcg_env, t0, t1); -} - -#if !defined(CONFIG_USER_ONLY )static inline void gen_check_tlb_flush (DisasContext *ctx,bool global) {
@@ -4734,8 +4697,6 @@ GEN_HANDLER(rlwnm, 0x17, 0xFF, 0xFF, 0x00000000, PPC_INTEGER),GEN_HANDLER_E (dform39,0x39 ,0xFF ,0xFF ,0x00000000 ,PPC_NONE ,PPC2_ISA205 ),/* handles stfdp, stxsd, stxssp */ GEN_HANDLER_E (dform3D,0x3D ,0xFF ,0xFF ,0x00000000 ,PPC_NONE ,PPC2_ISA205 ), -GEN_HANDLER (lmw,0x2E ,0xFF ,0xFF ,0x00000000 ,PPC_INTEGER ), -GEN_HANDLER (stmw,0x2F ,0xFF ,0xFF ,0x00000000 ,PPC_INTEGER ),/* ISA v3.0 changed the extended opcode from 62 to 30 */ GEN_HANDLER (rfi,0x13 ,0x12 ,0x01 ,0x03FF8001 ,PPC_FLOW ), #if defined(TARGET_PPC64)
target/ppc/translate/fixedpoint-impl.c.inc +32 -0
@@ -288,6 +288,38 @@ static bool trans_STQCX(DisasContext *ctx, arg_STQCX *a) return true; } +/* Load/Store Multiple Word */ +static bool do_ldst_multiple(DisasContext *ctx, arg_D *a, bool store) +{ + TCGv ea; + TCGv_i32 reg; + + REQUIRE_INSNS_FLAGS(ctx, INTEGER); + + /* Little-endian mode is not supported for multiple word operations */ + if (ctx->le_mode) { + gen_align_no_le(ctx); + return true; + } + + gen_set_access_type(ctx, ACCESS_INT); + + reg = tcg_constant_i32(a->rt); + ea = do_ea_calc(ctx, a->ra, tcg_constant_tl(a->si)); + + /* Call the appropriate helper function */ + if (store) { + gen_helper_STMW(tcg_env, ea, reg); + } else { + gen_helper_LMW(tcg_env, ea, reg); + } + + return true; +} + +TRANS(LMW, do_ldst_multiple, false) +TRANS(STMW, do_ldst_multiple, true) + /* * Fixed-Point Compare Instructions */
Signature · 1 line
2.53.0
RFC PATCH 26/28 target/ppc: Move mfmsr, mtmsr[d] instructions to decodetree
In reply to Chinmay RathFrom: Vishal Chourasia <[email protected]>
Moving the following instructions to decodetree specification:
mfmsr : X-form
mtmsr[d] : X-form
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the -d in_asm,op flag.
This also includes improvements from review feedback:
- Gate MFMSR/MTMSR on PPC_MISC via TRANS_FLAGS()
- Use UINT32_MAX instead of 0xFFFFFFFF for clarity
--- target/ppc/insn32.decode | 5 ++ target/ppc/translate.c | 97 ---------------------------- target/ppc/translate/misc-impl.c.inc | 64 ++++++++++++++++++ 3 files changed, 69 insertions(+), 97 deletions(-)
target/ppc/insn32.decode +5 -0
@@ -315,6 +315,11 @@ &M ra rs sh mb me rc:bool @M ...... rs:5 ra:5 sh:5 mb:5 me:5 rc:1 &M +### MSR +MFMSR 011111 ..... ----- ----- 0001010011 - @X_t +MTMSR 011111 ..... ---- . ----- 0010010010 - @X_rs_l +MTMSRD 011111 ..... ---- . ----- 0010110010 - @X_rs_l + ### Fixed-Point Load Instructions LBZ 100010 ..... ..... ................ @D
target/ppc/translate.c +0 -97
121 lines not on this page · raw message
target/ppc/translate/misc-impl.c.inc +64 -0
67 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH 27/28 target/ppc: Move byte-reverse instructions to decodetree
In reply to Chinmay RathFrom: Vishal Chourasia <[email protected]>
Moving the following instructions to decodetree specification:
brd, brw, brh : X-form
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the -d in_asm,op flag.
This also includes improvements from review feedback:
- Add TARGET_PPC64 guards with qemu_build_not_reached() for 32-bit builds
--- target/ppc/insn32.decode | 5 +++ target/ppc/translate.c | 35 ------------------- target/ppc/translate/fixedpoint-impl.c.inc | 40 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 35 deletions(-)
target/ppc/insn32.decode +5 -0
@@ -320,6 +320,11 @@ MFMSR 011111 ..... ----- ----- 0001010011 - @X_t MTMSR 011111 ..... ---- . ----- 0010010010 - @X_rs_l MTMSRD 011111 ..... ---- . ----- 0010110010 - @X_rs_l +### Fixed-Point Byte-Reverse Instructions +BRW 011111 ..... ..... ----- 0010011011 - @X_sa +BRD 011111 ..... ..... ----- 0010111011 - @X_sa +BRH 011111 ..... ..... ----- 0011011011 - @X_sa + ### Fixed-Point Load Instructions LBZ 100010 ..... ..... ................ @D
target/ppc/translate.c +0 -35
@@ -4558,42 +4558,7 @@ static void gen_dform3D(DisasContext *ctx)return gen_invalid (ctx); } -#if defined(TARGET_PPC64 ) -/* brd */ -static void gen_brd (DisasContext *ctx) -{ -tcg_gen_bswap64_i64 (cpu_gpr[rA (ctx->opcode)], cpu_gpr[rS (ctx->opcode)]); -} - -/* brw */ -static void gen_brw (DisasContext *ctx) -{ -tcg_gen_bswap64_i64 (cpu_gpr[rA (ctx->opcode)], cpu_gpr[rS (ctx->opcode)]); -tcg_gen_rotli_i64 (cpu_gpr[rA (ctx->opcode)], cpu_gpr[rA (ctx->opcode)],32 ); - -} - -/* brh */ -static void gen_brh (DisasContext *ctx) -{ -TCGv_i64 mask =tcg_constant_i64 (0x00ff00ff00ff00ffull ); -TCGv_i64 t1 =tcg_temp_new_i64 (); -TCGv_i64 t2 =tcg_temp_new_i64 (); - -tcg_gen_shri_i64 (t1, cpu_gpr[rS (ctx->opcode)],8 ); -tcg_gen_and_i64 (t2, t1, mask); -tcg_gen_and_i64 (t1, cpu_gpr[rS (ctx->opcode)], mask); -tcg_gen_shli_i64 (t1, t1,8 ); -tcg_gen_or_i64 (cpu_gpr[rA (ctx->opcode)], t1, t2); -} -#endif -static opcode_t opcodes[] = { -#if defined(TARGET_PPC64) -GEN_HANDLER_E(brd, 0x1F, 0x1B, 0x05, 0x0000F801, PPC_NONE, PPC2_ISA310), -GEN_HANDLER_E(brw, 0x1F, 0x1B, 0x04, 0x0000F801, PPC_NONE, PPC2_ISA310), -GEN_HANDLER_E(brh, 0x1F, 0x1B, 0x06, 0x0000F801, PPC_NONE, PPC2_ISA310), -#endifGEN_HANDLER (invalid,0x00 ,0x00 ,0x00 ,0xFFFFFFFF ,PPC_NONE ),GEN_HANDLER_E (copy,0x1F ,0x06 ,0x18 ,0x03C00001 ,PPC_NONE ,PPC2_ISA300 ),GEN_HANDLER_E (cp_abort,0x1F ,0x06 ,0x1A ,0x03FFF801 ,PPC_NONE ,PPC2_ISA300 ),
target/ppc/translate/fixedpoint-impl.c.inc +40 -0
@@ -17,6 +17,46 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* + * Byte-Reverse Instructions + */ +static bool do_byte_reverse_X_sa(DisasContext *ctx, arg_X_sa *a, int kind) +{ +#if defined(TARGET_PPC64) + switch (kind) { + case 0: /* brd */ + tcg_gen_bswap64_i64(cpu_gpr[a->ra], cpu_gpr[a->rs]); + break; + case 1: /* brw */ + tcg_gen_bswap64_i64(cpu_gpr[a->ra], cpu_gpr[a->rs]); + tcg_gen_rotli_i64(cpu_gpr[a->ra], cpu_gpr[a->ra], 32); + break; + case 2: /* brh */ + { + TCGv_i64 mask = tcg_constant_i64(0x00ff00ff00ff00ffull); + TCGv_i64 t1 = tcg_temp_new_i64(); + TCGv_i64 t2 = tcg_temp_new_i64(); + + tcg_gen_shri_i64(t1, cpu_gpr[a->rs], 8); + tcg_gen_and_i64(t2, t1, mask); + tcg_gen_and_i64(t1, cpu_gpr[a->rs], mask); + tcg_gen_shli_i64(t1, t1, 8); + tcg_gen_or_i64(cpu_gpr[a->ra], t1, t2); + break; + } + default: + g_assert_not_reached(); + } +#else + qemu_build_not_reached(); +#endif + return true; +} + +TRANS64_FLAGS2(ISA310, BRD, do_byte_reverse_X_sa, 0) +TRANS64_FLAGS2(ISA310, BRW, do_byte_reverse_X_sa, 1) +TRANS64_FLAGS2(ISA310, BRH, do_byte_reverse_X_sa, 2) + /* * Fixed-Point Load/Store Instructions */
Signature · 1 line
2.53.0
RFC PATCH 28/28 target/ppc: Move system call and rfi instructions to decodetree
In reply to Chinmay RathFrom: Vishal Chourasia <[email protected]>
Moving the following instructions to decodetree specification:
sc, scv : SC-form
rfi, rfid, rfscv, hrfid : XL-form
This builds upon the previous work that moved mfmsr and mtmsr[d] instructions to decodetree.
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the -d in_asm,op flag, and also by booting a pseries qemu guest.
This also includes improvements from review feedback:
- Rename helpers to uppercase (RFI/RFID/RFSCV/HRFID) to match ISA mnemonics
- Add TRANS_FLAGS_NOT() and TRANS64_FLAGS() macro variants
- Add REQUIRE_INSNS_FLAGS_NOT() check for flag exclusion
- Specify lev field as uint8_t in SC instruction format
- Remove redundant masking in SCV since lev is already 7-bit
- Replace TARGET_PPC64 ifdefs with REQUIRE_64BIT() macro
- Gate SC, SCV, RFI, RFID, RFSCV, and HRFID with appropriate flags
- Replace runtime is_book3s_arch2x() check in RFI with TRANS_FLAGS_NOT(SEGMENT_64B)
- Consolidate CONFIG_USER_ONLY guards into single block
--- target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 11 +++ target/ppc/tcg-excp_helper.c | 8 +- target/ppc/translate.c | 139 ++++----------------------- target/ppc/translate/misc-impl.c.inc | 105 ++++++++++++++++++++ 5 files changed, 144 insertions(+), 127 deletions(-)
target/ppc/helper.h +4 -4
@@ -11,7 +11,7 @@ DEF_HELPER_4(HASHCHKP, void, env, tl, tl, tl)#if !defined(CONFIG_USER_ONLY ) DEF_HELPER_2(store_msr, void, env, tl) DEF_HELPER_1(ppc_maybe_interrupt, void, env) -DEF_HELPER_1(rfi, void, env) +DEF_HELPER_1(RFI, void, env) DEF_HELPER_1(40x_rfci, void, env) DEF_HELPER_1(rfci, void, env)DEF_HELPER_1 (rfdi, void, env)
@@ -19,9 +19,9 @@ DEF_HELPER_1(rfmci, void, env)#if defined(TARGET_PPC64 ) DEF_HELPER_2(scv, noreturn, env, i32) DEF_HELPER_2(PMINSN, void, env, i32) -DEF_HELPER_1(rfid, void, env) -DEF_HELPER_1(rfscv, void, env) -DEF_HELPER_1(hrfid, void, env) +DEF_HELPER_1(RFID, void, env) +DEF_HELPER_1(RFSCV, void, env) +DEF_HELPER_1(HRFID, void, env) DEF_HELPER_2(rfebb, void, env, tl) DEF_HELPER_2(store_lpcr, void, env, tl)DEF_HELPER_2 (store_pcr, void, env, tl)
target/ppc/insn32.decode +11 -0
@@ -199,6 +199,9 @@ &X_rs_l rs l:bool @X_rs_l ...... rs:5 .... l:1 ..... .......... . &X_rs_l +&SC lev:uint8_t +@SC ...... ..... ..... .... lev:7 ... . . &SC + &X_uim5 xt uim:uint8_t @X_uim5 ...... ..... ..... uim:5 .......... . &X_uim5 xt=%x_xt
@@ -320,6 +323,14 @@ MFMSR 011111 ..... ----- ----- 0001010011 - @X_t MTMSR 011111 ..... ---- . ----- 0010010010 - @X_rs_l MTMSRD 011111 ..... ---- . ----- 0010110010 - @X_rs_l +### System Call and Return from Interrupt +SC 010001 ----- ----- ---- ....... --- 1 - @SC +SCV 010001 ----- ----- ---- ....... --- 0 1 @SC +RFI 010011 ----- ----- ----- 0000110010 - +RFID 010011 ----- ----- ----- 0000010010 - +RFSCV 010011 ----- ----- ----- 0001010010 - +HRFID 010011 ----- ----- ----- 0100010010 - + ### Fixed-Point Byte-Reverse Instructions BRW 011111 ..... ..... ----- 0010011011 - @X_sa BRD 011111 ..... ..... ----- 0010111011 - @X_sa
target/ppc/tcg-excp_helper.c +4 -4
@@ -527,13 +527,13 @@ static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)check_tlb_flush (env, false); } -void helper_rfi (CPUPPCState *env) +void helper_RFI (CPUPPCState *env) {do_rfi (env, env->spr[SPR_SRR0 ], env->spr[SPR_SRR1 ] &0xfffffffful ); }#ifdef TARGET_PPC64 -void helper_rfid (CPUPPCState *env) +void helper_RFID (CPUPPCState *env) {/* * The architecture defines a number of rules for which bits can
@@ -544,12 +544,12 @@ void helper_rfid(CPUPPCState *env)do_rfi (env, env->spr[SPR_SRR0 ], env->spr[SPR_SRR1 ]); } -void helper_rfscv (CPUPPCState *env) +void helper_RFSCV (CPUPPCState *env) {do_rfi (env, env->lr, env->ctr); } -void helper_hrfid (CPUPPCState *env) +void helper_HRFID (CPUPPCState *env) {do_rfi (env, env->spr[SPR_HSRR0 ], env->spr[SPR_HSRR1 ]); }
target/ppc/translate.c +20 -119
167 lines not on this page · raw message
target/ppc/translate/misc-impl.c.inc +105 -0
108 lines not on this page · raw message
Signature · 1 line
2.53.0
Hi All,
I see there is a test case that fails during the CI run.
https://gitlab.com/rathc/qemu/-/jobs/14481511189/
Looking into it
Thanks,
vishalc
Quoted 94 lines · Chinmay Rath
We recently had a QEMU decodetree hackathon at our org focusing on moving instructions to decodetree specification. I have consolidated the patches generated out of this effort in this series. Though I have done a round of review on all of them, might share some more review comments later.
The checkpatch.pl script emits false error for a couple of patches which are of the following nature :
TRANS(STWAT, do_st_atomic, DEF_MEMOP(MO_UL))static bool
trans_LDAT(DisasContext *ctx, arg_LDAT *a)^I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).
Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?Gitlab CI: https://gitlab.com/rathc/qemu/-/pipelines/2540725424
Please note that check-python-tox and migration-compat-aarch64 from CI fails in the upstream master branch as seen in the following:
https://gitlab.com/rathc/qemu/-/pipelines/2537246569Thanks,
ChinmayAboorva Devarajan (3):
target/ppc: Move vector merge instructions to decodetree target/ppc: Move vector pack instructions to decodetree target/ppc: Move GPR atomic load/store instructions to decodetreeAmit Machhiwal (2):
target/ppc: Move fixed-point Shift insns to decodetree target/ppc: Move fixed-point byte-reversal store insns to decodetreeMukesh Kumar Chaurasiya (IBM) (2):
target/ppc: convert slw,srw instruction via decode spec target/ppc: convert sraw[i] instruction via decode specNikhil Kumar Singh (3):
target/ppc: Migrate extswsli to decodetree target/ppc: Migrate atomic loads to decodetree target/ppc: Convert cache instructions to decodetreeOjaswin Mujoo (7):
target/ppc: Move isync instruction to decodetree. target/ppc: Convert b{a, l, la} to decode tree target/ppc: move various conditional branch insns to decodetree target/ppc: Fix TRANS* macro variadic arguments handling target/ppc: Move wait instruction to decodetree target/ppc: Move sleep & friends to decodetree target/ppc: Refactor sleep and its variants to use a common helperShivang Upadhyay (4):
target/ppc: Move Condition Register access instructions to decodetree. target/ppc: Move Condition Register logical instructions to
decodetree.
target/ppc: Move Fixed-Point Load/Store String instructions to
decodetree.
target/ppc: Move VMX integer arithmetic and BCD instructions to
decodetree.Shivani Nittor (1):
target/ppc : Convert mcrf to decode treeTanushree Shah (2):
target/ppc: Move rlwimi, rlwinm instructions to decodetree target/ppc: Move lmw, stmw instructions to decodetreeUtkarsh Verma (1):
target/ppc: Move st{b, h, w, d, q}cx instructions to decodetreeVishal Chourasia (3):
target/ppc: Move mfmsr, mtmsr[d] instructions to decodetree target/ppc: Move byte-reverse instructions to decodetree target/ppc: Move system call and rfi instructions to decodetreetarget/ppc/helper.h | 100 +- target/ppc/insn32.decode | 244 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 18 +- target/ppc/tcg-excp_helper.c | 10 +- target/ppc/translate.c | 2592 ++++------------- target/ppc/translate/branch-impl.c.inc | 181 ++ target/ppc/translate/fixedpoint-impl.c.inc | 936 ++++++ target/ppc/translate/misc-impl.c.inc | 175 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 30 + target/ppc/translate/storage-ctrl-impl.c.inc | 117 + target/ppc/translate/vmx-impl.c.inc | 360 +-- target/ppc/translate/vmx-ops.c.inc | 41 - 14 files changed, 2529 insertions(+), 2358 deletions(-)
RFC PATCH v2 1/1 target/ppc: Move system call and rfi instructions to decodetree
From: Vishal Chourasia <[email protected]>
Moving the following instructions to decodetree specification:
sc, scv : SC-form
rfi, rfid, rfscv, hrfid : XL-form
This builds upon the previous work that moved mfmsr and mtmsr[d] instructions to decodetree.
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the -d in_asm,op flag, and also by booting a pseries qemu guest.
This also includes improvements from review feedback:
- Rename helpers to uppercase (RFI/RFID/RFSCV/HRFID) to match ISA mnemonics
- Add TRANS_FLAGS_NOT() and TRANS64_FLAGS() macro variants
- Add REQUIRE_INSNS_FLAGS_NOT() check for flag exclusion
- Specify lev field as uint8_t in SC instruction format
- Remove redundant masking in SCV since lev is already 7-bit
- Replace TARGET_PPC64 ifdefs with REQUIRE_64BIT() macro
- Gate SC, SCV, RFI, RFID, RFSCV, and HRFID with appropriate flags
- Replace runtime is_book3s_arch2x() check in RFI with TRANS_FLAGS_NOT(SEGMENT_64B)
- Consolidate CONFIG_USER_ONLY guards into single block
---
v2: In v1, do_rfi() path effectively only implemented the instruction for user-only and 64-bit builds, so on qemu-system-ppc every rfi was translated as invalid. This trapped OpenBIOS in exception return paths and caused the boot/tests to hang. In v2 restore the 32-bit system emulation rfi path while keeping rfid, hrfid, and rfscv 64-bit-only.
target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 11 +++ target/ppc/tcg-excp_helper.c | 8 +- target/ppc/translate.c | 139 ++++----------------------- target/ppc/translate/misc-impl.c.inc | 100 +++++++++++++++++++ 5 files changed, 139 insertions(+), 127 deletions(-)
target/ppc/helper.h +4 -4
@@ -11,7 +11,7 @@ DEF_HELPER_4(HASHCHKP, void, env, tl, tl, tl)#if !defined(CONFIG_USER_ONLY ) DEF_HELPER_2(store_msr, void, env, tl) DEF_HELPER_1(ppc_maybe_interrupt, void, env) -DEF_HELPER_1(rfi, void, env) +DEF_HELPER_1(RFI, void, env) DEF_HELPER_1(40x_rfci, void, env) DEF_HELPER_1(rfci, void, env)DEF_HELPER_1 (rfdi, void, env)
@@ -19,9 +19,9 @@ DEF_HELPER_1(rfmci, void, env)#if defined(TARGET_PPC64 ) DEF_HELPER_2(scv, noreturn, env, i32) DEF_HELPER_2(PMINSN, void, env, i32) -DEF_HELPER_1(rfid, void, env) -DEF_HELPER_1(rfscv, void, env) -DEF_HELPER_1(hrfid, void, env) +DEF_HELPER_1(RFID, void, env) +DEF_HELPER_1(RFSCV, void, env) +DEF_HELPER_1(HRFID, void, env) DEF_HELPER_2(rfebb, void, env, tl) DEF_HELPER_2(store_lpcr, void, env, tl)DEF_HELPER_2 (store_pcr, void, env, tl)
target/ppc/insn32.decode +11 -0
@@ -202,6 +202,9 @@ &X_rs_l rs l:bool @X_rs_l ...... rs:5 .... l:1 ..... .......... . &X_rs_l +&SC lev:uint8_t +@SC ...... ..... ..... .... lev:7 ... . . &SC + &X_uim5 xt uim:uint8_t @X_uim5 ...... ..... ..... uim:5 .......... . &X_uim5 xt=%x_xt
@@ -323,6 +326,14 @@ MFMSR 011111 ..... ----- ----- 0001010011 - @X_t MTMSR 011111 ..... ---- . ----- 0010010010 - @X_rs_l MTMSRD 011111 ..... ---- . ----- 0010110010 - @X_rs_l +### System Call and Return from Interrupt +SC 010001 ----- ----- ---- ....... --- 1 - @SC +SCV 010001 ----- ----- ---- ....... --- 0 1 @SC +RFI 010011 ----- ----- ----- 0000110010 - +RFID 010011 ----- ----- ----- 0000010010 - +RFSCV 010011 ----- ----- ----- 0001010010 - +HRFID 010011 ----- ----- ----- 0100010010 - + ### Fixed-Point Byte-Reverse Instructions BRW 011111 ..... ..... ----- 0010011011 - @X_sa BRD 011111 ..... ..... ----- 0010111011 - @X_sa
target/ppc/tcg-excp_helper.c +4 -4
@@ -527,13 +527,13 @@ static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)check_tlb_flush (env, false); } -void helper_rfi (CPUPPCState *env) +void helper_RFI (CPUPPCState *env) {do_rfi (env, env->spr[SPR_SRR0 ], env->spr[SPR_SRR1 ] &0xfffffffful ); }#ifdef TARGET_PPC64 -void helper_rfid (CPUPPCState *env) +void helper_RFID (CPUPPCState *env) {/* * The architecture defines a number of rules for which bits can
@@ -544,12 +544,12 @@ void helper_rfid(CPUPPCState *env)do_rfi (env, env->spr[SPR_SRR0 ], env->spr[SPR_SRR1 ]); } -void helper_rfscv (CPUPPCState *env) +void helper_RFSCV (CPUPPCState *env) {do_rfi (env, env->lr, env->ctr); } -void helper_hrfid (CPUPPCState *env) +void helper_HRFID (CPUPPCState *env) {do_rfi (env, env->spr[SPR_HSRR0 ], env->spr[SPR_HSRR1 ]); }
target/ppc/translate.c +20 -119
167 lines not on this page · raw message
target/ppc/translate/misc-impl.c.inc +100 -0
103 lines not on this page · raw message
Signature · 1 line
2.54.0
Re: [RFC PATCH v2] target/ppc: Move system call and rfi instructions to decodetree
Quoted 24 lines · Vishal Chourasia
From: Vishal Chourasia <[email protected]>
Moving the following instructions to decodetree specification:
sc, scv : SC-form
rfi, rfid, rfscv, hrfid : XL-formThis builds upon the previous work that moved mfmsr and mtmsr[d] instructions to decodetree.
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the
-d in_asm,opflag, and also by booting a pseries qemu guest.This also includes improvements from review feedback:
- Rename helpers to uppercase (RFI/RFID/RFSCV/HRFID) to match ISA mnemonics
- AddTRANS_FLAGS_NOT()andTRANS64_FLAGS()macro variants
- AddREQUIRE_INSNS_FLAGS_NOT()check for flag exclusion
- Specify lev field asuint8_tin SC instruction format
- Remove redundant masking in SCV since lev is already 7-bit
- ReplaceTARGET_PPC64ifdefs withREQUIRE_64BIT()macro
- Gate SC, SCV, RFI, RFID, RFSCV, and HRFID with appropriate flags
- Replace runtimeis_book3s_arch2x()check in RFI withTRANS_FLAGS_NOT(SEGMENT_64B)
- ConsolidateCONFIG_USER_ONLYguards into single block
Quoted 8 lines
Signed-off-by Vishal Chourasia <[email protected]>---
v2: In v1,
do_rfi()path effectively only implemented the instruction for user-only and 64-bit builds, so on qemu-system-ppc every rfi was translated as invalid. This trapped OpenBIOS in exception return paths and caused the boot/tests to hang. In v2 restore the 32-bit system emulation rfi path while keeping rfid, hrfid, and rfscv 64-bit-only.
Hi Vishal,
Thanks for fixing this. I had some queries :
Quoted 252 lines
target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 11 +++ target/ppc/tcg-excp_helper.c | 8 +- target/ppc/translate.c | 139 ++++----------------------- target/ppc/translate/misc-impl.c.inc | 100 +++++++++++++++++++ 5 files changed, 139 insertions(+), 127 deletions(-)target/ppc/helper.h +4
-4@@ -11,7 +11,7 @@ DEF_HELPER_4(HASHCHKP, void, env, tl, tl, tl)#if !defined(CONFIG_USER_ONLY ) DEF_HELPER_2(store_msr, void, env, tl) DEF_HELPER_1(ppc_maybe_interrupt, void, env) -DEF_HELPER_1(rfi, void, env) +DEF_HELPER_1(RFI, void, env) DEF_HELPER_1(40x_rfci, void, env) DEF_HELPER_1(rfci, void, env)DEF_HELPER_1 (rfdi, void, env)@@ -19,9 +19,9 @@ DEF_HELPER_1(rfmci, void, env)#if defined(TARGET_PPC64 ) DEF_HELPER_2(scv, noreturn, env, i32) DEF_HELPER_2(PMINSN, void, env, i32) -DEF_HELPER_1(rfid, void, env) -DEF_HELPER_1(rfscv, void, env) -DEF_HELPER_1(hrfid, void, env) +DEF_HELPER_1(RFID, void, env) +DEF_HELPER_1(RFSCV, void, env) +DEF_HELPER_1(HRFID, void, env) DEF_HELPER_2(rfebb, void, env, tl) DEF_HELPER_2(store_lpcr, void, env, tl)DEF_HELPER_2 (store_pcr, void, env, tl)target/ppc/insn32.decode +11
-0@@ -202,6 +202,9 @@ &X_rs_l rs l:bool @X_rs_l ...... rs:5 .... l:1 ..... .......... . &X_rs_l +&SC lev:uint8_t +@SC ...... ..... ..... .... lev:7 ... . . &SC + &X_uim5 xt uim:uint8_t @X_uim5 ...... ..... ..... uim:5 .......... . &X_uim5 xt=%x_xt@@ -323,6 +326,14 @@ MFMSR 011111 ..... ----- ----- 0001010011 - @X_t MTMSR 011111 ..... ---- . ----- 0010010010 - @X_rs_l MTMSRD 011111 ..... ---- . ----- 0010110010 - @X_rs_l +### System Call and Return from Interrupt +SC 010001 ----- ----- ---- ....... --- 1 - @SC +SCV 010001 ----- ----- ---- ....... --- 0 1 @SC +RFI 010011 ----- ----- ----- 0000110010 - +RFID 010011 ----- ----- ----- 0000010010 - +RFSCV 010011 ----- ----- ----- 0001010010 - +HRFID 010011 ----- ----- ----- 0100010010 - + ### Fixed-Point Byte-Reverse Instructions BRW 011111 ..... ..... ----- 0010011011 - @X_sa BRD 011111 ..... ..... ----- 0010111011 - @X_satarget/ppc/tcg-excp_helper.c +4
-4@@ -527,13 +527,13 @@ static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)check_tlb_flush (env, false); } -void helper_rfi (CPUPPCState *env) +void helper_RFI (CPUPPCState *env) {do_rfi (env, env->spr[SPR_SRR0 ], env->spr[SPR_SRR1 ] &0xfffffffful ); }#ifdef TARGET_PPC64 -void helper_rfid (CPUPPCState *env) +void helper_RFID (CPUPPCState *env) {/* * The architecture defines a number of rules for which bits can @@ -544,12 +544,12 @@ void helper_rfid(CPUPPCState *env)do_rfi (env, env->spr[SPR_SRR0 ], env->spr[SPR_SRR1 ]); } -void helper_rfscv (CPUPPCState *env) +void helper_RFSCV (CPUPPCState *env) {do_rfi (env, env->lr, env->ctr); } -void helper_hrfid (CPUPPCState *env) +void helper_HRFID (CPUPPCState *env) {do_rfi (env, env->spr[SPR_HSRR0 ], env->spr[SPR_HSRR1 ]); }target/ppc/translate.c +20
-104@@ -2681,110 +2681,6 @@ static inline void gen_setlr(DisasContext *ctx, target_ulong nip)tcg_gen_movi_tl (cpu_lr, nip); } -/*** System linkage ***/ - -/* rfi (supervisor only) */ -static void gen_rfi (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -/* -* This instruction doesn't exist anymore on 64-bit server -* processors compliant with arch 2.x -*/ -if (is_book3s_arch2x (ctx)) { -gen_inval_exception (ctx,POWERPC_EXCP_INVAL_INVAL ); -return ; - } -/* Restore CPU state */ -CHK_SV (ctx); -translator_io_start (&ctx->base); -gen_update_branch_history (ctx, ctx->cia,NULL ,BHRB_TYPE_NORECORD ); -gen_helper_rfi (tcg_env); - ctx->base.is_jmp =DISAS_EXIT ; -#endif -} - -#if defined(TARGET_PPC64 ) -static void gen_rfid (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -/* Restore CPU state */ -CHK_SV (ctx); -translator_io_start (&ctx->base); -gen_update_branch_history (ctx, ctx->cia,NULL ,BHRB_TYPE_NORECORD ); -gen_helper_rfid (tcg_env); - ctx->base.is_jmp =DISAS_EXIT ; -#endif -} - -#if !defined(CONFIG_USER_ONLY ) -static void gen_rfscv (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -/* Restore CPU state */ -CHK_SV (ctx); -translator_io_start (&ctx->base); -gen_update_branch_history (ctx, ctx->cia,NULL ,BHRB_TYPE_NORECORD ); -gen_helper_rfscv (tcg_env); - ctx->base.is_jmp =DISAS_EXIT ; -#endif -} -#endif - -static void gen_hrfid (DisasContext *ctx) -{ -#if defined(CONFIG_USER_ONLY ) -GEN_PRIV (ctx); -#else -/* Restore CPU state */ -CHK_HV (ctx); -translator_io_start (&ctx->base); -gen_helper_hrfid (tcg_env); - ctx->base.is_jmp =DISAS_EXIT ; -#endif -} -#endif - -/* sc */ -#if defined(CONFIG_USER_ONLY ) -#define POWERPC_SYSCALL POWERPC_EXCP_SYSCALL_USER -#else -#define POWERPC_SYSCALL POWERPC_EXCP_SYSCALL -#endif -static void gen_sc (DisasContext *ctx) -{ -uint32_t lev; - -/* -* LEV is a 7-bit field, but the top 6 bits are treated as a reserved -* field (i.e., ignored). ISA v3.1 changes that to 5 bits, but that is -* for Ultravisor which TCG does not support, so just ignore the top 6. -*/ - lev = (ctx->opcode >>5 ) &0x1 ; -gen_exception_err (ctx,POWERPC_SYSCALL , lev); -} - -#if defined(TARGET_PPC64 ) -#if !defined(CONFIG_USER_ONLY ) -static void gen_scv (DisasContext *ctx) -{ -uint32_t lev = (ctx->opcode >>5 ) &0x7F ; - -/* Set the PC back to the faulting instruction. */ -gen_update_nip (ctx, ctx->cia); -gen_helper_scv (tcg_env,tcg_constant_i32 (lev)); - - ctx->base.is_jmp =DISAS_NORETURN ; -} -#endif -#endif -/*** Trap ***/ /* Check for unconditional traps (always or never) */ @@ -4044,6 +3940,13 @@ static int64_t dw_compose_ea(DisasContext *ctx, int x) } \ } while (0) +#define REQUIRE_INSNS_FLAGS_NOT (CTX ,NAME ) \ + do { \ + if (((CTX)->insns_flags & PPC_##NAME) != 0) { \ + return false; \ + } \ + } while (0) +/* Then special-case the check for 64-bit so that we elide code for ppc32. */ #if TARGET_LONG_BITS ==32 # define REQUIRE_64BIT (CTX ) return false@@ -4123,10 +4026,23 @@ static int64_t dw_compose_ea(DisasContext *ctx, int x)REQUIRE_INSNS_FLAGS2 (ctx,FLAGS2 ); \ return FUNC(ctx, a, ##__VA_ARGS__); \ } +#define TRANS_FLAGS_NOT (FLAGS ,NAME ,FUNC , ...) \ + static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ + { \ + REQUIRE_INSNS_FLAGS_NOT(ctx, FLAGS); \ + 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__); } +#define TRANS64_FLAGS (FLAGS ,NAME ,FUNC , ...) \ + static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ + { \ + REQUIRE_64BIT(ctx); \ + REQUIRE_INSNS_FLAGS(ctx, FLAGS); \ + return FUNC(ctx, a, ##__VA_ARGS__); \ + }#define TRANS64_FLAGS2 (FLAGS2 ,NAME ,FUNC , ...) \ static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ { \
target/ppc/translate.c GEN_HANDLER(rlwnm, 0x17, 0xFF, 0xFF, 0x00000000, PPC_INTEGER), · line 4570
Quoted 5 lines
target/ppc/translate.c +0
-2@@ -4566,21 +4482,6 @@ GEN_HANDLER(rlwnm, 0x17, 0xFF, 0xFF, 0x00000000, PPC_INTEGER),GEN_HANDLER_E (dform39,0x39 ,0xFF ,0xFF ,0x00000000 ,PPC_NONE ,PPC2_ISA205 ),/* handles stfdp, stxsd, stxssp */ GEN_HANDLER_E(dform3D, 0x3D, 0xFF, 0xFF, 0x00000000, PPC_NONE, PPC2_ISA205), -/* ISA v3.0 changed the extended opcode from 62 to 30 */ -GEN_HANDLER(rfi, 0x13, 0x12, 0x01, 0x03FF8001, PPC_FLOW),
Above PPC_FLOW flag is missing in the new code it seems. I have pointed it out at the relevant TRANS macro as well.
target/ppc/translate.c GEN_HANDLER(rlwnm, 0x17, 0xFF, 0xFF, 0x00000000, PPC_INTEGER), · line 4579
Quoted 9 lines
target/ppc/translate.c +0
-9-#if defined(TARGET_PPC64 ) -GEN_HANDLER(rfid, 0x13, 0x12, 0x00, 0x03FF8001, PPC_64B), -#if !defined(CONFIG_USER_ONLY ) -/* Top bit of opc2 corresponds with low bit of LEV, so use two handlers */ -GEN_HANDLER_E (scv,0x11 ,0x10 ,0xFF ,0x03FFF01E ,PPC_NONE ,PPC2_ISA300 ), -GEN_HANDLER_E (scv,0x11 ,0x00 ,0xFF ,0x03FFF01E ,PPC_NONE ,PPC2_ISA300 ), -GEN_HANDLER_E (rfscv,0x13 ,0x12 ,0x02 ,0x03FF8001 ,PPC_NONE ,PPC2_ISA300 ), -#endif -GEN_HANDLER(hrfid, 0x13, 0x12, 0x08, 0x03FF8001, PPC_64H),
Above PPC_64H flag is missing in the new code it seems. I have pointed it out at the relevant TRANS macro as well.
Quoted 63 lines
target/ppc/translate.c +0
-4-#endif -/* Top bit of opc2 corresponds with low bit of LEV, so use two handlers */ -GEN_HANDLER (sc,0x11 ,0x11 ,0xFF ,0x03FFF01D ,PPC_FLOW ), -GEN_HANDLER (sc,0x11 ,0x01 ,0xFF ,0x03FFF01D ,PPC_FLOW ),GEN_HANDLER (mcrxr,0x1F ,0x00 ,0x10 ,0x007FF801 ,PPC_MISC ),GEN_HANDLER (mfspr,0x1F ,0x13 ,0x0A ,0x00000001 ,PPC_MISC ), GEN_HANDLER(mftb, 0x1F, 0x13, 0x0B, 0x00000001, PPC_MFTB),target/ppc/translate/misc-impl.c.inc +48
-0@@ -225,3 +225,103 @@ static bool do_mtmsr(DisasContext *ctx, arg_X_rs_l *a, bool is_mtmsrd) TRANS_FLAGS(MISC, MTMSR, do_mtmsr, false) TRANS64(MTMSRD, do_mtmsr, true) + +/* + * System Call and Return from Interrupt Instructions + */ + +static bool do_SC(DisasContext *ctx, arg_SC *a, uint32_t excp) +{ + uint32_t lev; + + /* + * LEV is a 7-bit field, but the top 6 bits are treated as a reserved + * field (i.e., ignored). ISA v3.1 changes that to 5 bits, but that is + * for Ultravisor which TCG does not support, so just ignore the top 6. + */ + lev = a->lev & 0x1; + gen_exception_err(ctx, excp, lev); + return true; +} + +static bool do_SCV(DisasContext *ctx, arg_SC *a) +{ +#if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) + /* Set the PC back to the faulting instruction. */ + gen_update_nip(ctx, ctx->cia); + gen_helper_scv(tcg_env, tcg_constant_i32(a->lev)); + + ctx->base.is_jmp = DISAS_NORETURN; + return true; +#else + gen_invalid(ctx); + return true; +#endif +} + +/* + * Common helper for return-from-interrupt instructions + */ +enum { + RFI = 0, + RFID = 1, + HRFID = 2, + RFSCV = 3, +}; + +static bool do_rfi(DisasContext *ctx, arg_RFID *a, int kind) +{ +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx);
target/ppc/translate/misc-impl.c.inc static bool do_mtmsr(DisasContext *ctx, arg_X_rs_l *a, bool is_mtmsrd) · line 285
Quoted 10 lines
target/ppc/translate/misc-impl.c.inc +10
-0+ return true; +#else + void (*helper)(TCGv_ptr); + + switch (kind) { + case RFI: + if (is_book3s_arch2x(ctx)) { + gen_invalid(ctx); + return true; + }
Since you are already using TRANS_FLAGS_NOT, is it still necessary to have the above check ? Or, better yet, from the other way around, since you have this check, is it necessary to introduce and have the TRANS_FLAGS_NOT macro at all ? I felt both are doing the same job. Let me if I am missing something.
Quoted 32 lines
target/ppc/translate/misc-impl.c.inc +32
-0+ REQUIRE_SV(ctx); + helper = gen_helper_RFI; + break; +#if defined(TARGET_PPC64) + case HRFID: + REQUIRE_HV(ctx); + helper = gen_helper_HRFID; + break; + case RFID: + REQUIRE_SV(ctx); + helper = gen_helper_RFID; + break; + case RFSCV: + REQUIRE_SV(ctx); + helper = gen_helper_RFSCV; + break; +#endif + default: + gen_invalid(ctx); + return true; + } + + translator_io_start(&ctx->base); + gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_NORECORD); + helper(tcg_env); + ctx->base.is_jmp = DISAS_EXIT; + return true; +#endif +} + +#if defined(CONFIG_USER_ONLY) +TRANS_FLAGS(FLOW, SC, do_SC, POWERPC_EXCP_SYSCALL_USER)
target/ppc/translate/misc-impl.c.inc static bool do_mtmsr(DisasContext *ctx, arg_X_rs_l *a, bool is_mtmsrd) · line 327
Quoted 10 lines
target/ppc/translate/misc-impl.c.inc +10
-0+#else +TRANS_FLAGS(FLOW, SC, do_SC, POWERPC_EXCP_SYSCALL) +#endif + +TRANS64_FLAGS2(ISA300, SCV, do_SCV) + +TRANS_FLAGS_NOT(SEGMENT_64B, RFI, do_rfi, RFI) +TRANS64(RFID, do_rfi, RFID) +TRANS64(HRFID, do_rfi, HRFID) +TRANS64_FLAGS2(ISA300, RFSCV, do_rfi, RFSCV)
Looks like we have dropped some flag checks :
RFI is missing PPC_FLOW and HRFID is missing PPC_64H
Thanks,
Chinmay
Re: [RFC PATCH v2] target/ppc: Move system call and rfi instructions to decodetree
Quoted 47 lines · Chinmay Rath
Quoted 24 lines · Vishal Chourasia
From: Vishal Chourasia <[email protected]>
Moving the following instructions to decodetree specification:
sc, scv : SC-form
rfi, rfid, rfscv, hrfid : XL-formThis builds upon the previous work that moved mfmsr and mtmsr[d] instructions to decodetree.
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the
-d in_asm,opflag, and also by booting a pseries qemu guest.This also includes improvements from review feedback:
- Rename helpers to uppercase (RFI/RFID/RFSCV/HRFID) to match ISA mnemonics
- AddTRANS_FLAGS_NOT()andTRANS64_FLAGS()macro variants
- AddREQUIRE_INSNS_FLAGS_NOT()check for flag exclusion
- Specify lev field asuint8_tin SC instruction format
- Remove redundant masking in SCV since lev is already 7-bit
- ReplaceTARGET_PPC64ifdefs withREQUIRE_64BIT()macro
- Gate SC, SCV, RFI, RFID, RFSCV, and HRFID with appropriate flags
- Replace runtimeis_book3s_arch2x()check in RFI withTRANS_FLAGS_NOT(SEGMENT_64B)
- ConsolidateCONFIG_USER_ONLYguards into single blockQuoted 8 lines
Signed-off-by Vishal Chourasia <[email protected]>---
v2: In v1,
do_rfi()path effectively only implemented the instruction for user-only and 64-bit builds, so on qemu-system-ppc every rfi was translated as invalid. This trapped OpenBIOS in exception return paths and caused the boot/tests to hang. In v2 restore the 32-bit system emulation rfi path while keeping rfid, hrfid, and rfscv 64-bit-only.Hi Vishal,
Thanks for fixing this. I had some queries :
Quoted 8 lines
target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 11 +++ target/ppc/tcg-excp_helper.c | 8 +- target/ppc/translate.c | 139 ++++----------------------- target/ppc/translate/misc-impl.c.inc | 100 +++++++++++++++++++ 5 files changed, 139 insertions(+), 127 deletions(-)
<snip>
Quoted 26 lines
target/ppc/translate.c GEN_HANDLER(rlwnm, 0x17, 0xFF, 0xFF, 0x00000000, PPC_INTEGER), · line 4570
Quoted 6 lines
target/ppc/translate.c +0
-2@@ -4566,21 +4482,6 @@ GEN_HANDLER(rlwnm, 0x17, 0xFF, 0xFF, 0x00000000, PPC_INTEGER),GEN_HANDLER_E (dform39,0x39 ,0xFF ,0xFF ,0x00000000 ,PPC_NONE ,PPC2_ISA205 ),/* handles stfdp, stxsd, stxssp */ GEN_HANDLER_E(dform3D, 0x3D, 0xFF, 0xFF, 0x00000000, PPC_NONE, PPC2_ISA205), -/* ISA v3.0 changed the extended opcode from 62 to 30 */ -GEN_HANDLER(rfi, 0x13, 0x12, 0x01, 0x03FF8001, PPC_FLOW),Above
PPC_FLOWflag is missing in the new code it seems. I have pointed it out at the relevant TRANS macro as well.target/ppc/translate.c GEN_HANDLER(rlwnm, 0x17, 0xFF, 0xFF, 0x00000000, PPC_INTEGER), · line 4579
Quoted 9 lines
target/ppc/translate.c +0
-9-#if defined(TARGET_PPC64 ) -GEN_HANDLER(rfid, 0x13, 0x12, 0x00, 0x03FF8001, PPC_64B), -#if !defined(CONFIG_USER_ONLY ) -/* Top bit of opc2 corresponds with low bit of LEV, so use two handlers */ -GEN_HANDLER_E (scv,0x11 ,0x10 ,0xFF ,0x03FFF01E ,PPC_NONE ,PPC2_ISA300 ), -GEN_HANDLER_E (scv,0x11 ,0x00 ,0xFF ,0x03FFF01E ,PPC_NONE ,PPC2_ISA300 ), -GEN_HANDLER_E (rfscv,0x13 ,0x12 ,0x02 ,0x03FF8001 ,PPC_NONE ,PPC2_ISA300 ), -#endif -GEN_HANDLER(hrfid, 0x13, 0x12, 0x08, 0x03FF8001, PPC_64H),Above
PPC_64Hflag is missing in the new code it seems. I have pointed it out at the relevant TRANS macro as well.Quoted 7 lines
target/ppc/translate.c +0
-4-#endif -/* Top bit of opc2 corresponds with low bit of LEV, so use two handlers */ -GEN_HANDLER (sc,0x11 ,0x11 ,0xFF ,0x03FFF01D ,PPC_FLOW ), -GEN_HANDLER (sc,0x11 ,0x01 ,0xFF ,0x03FFF01D ,PPC_FLOW ),GEN_HANDLER (mcrxr,0x1F ,0x00 ,0x10 ,0x007FF801 ,PPC_MISC ),GEN_HANDLER (mfspr,0x1F ,0x13 ,0x0A ,0x00000001 ,PPC_MISC ), GEN_HANDLER(mftb, 0x1F, 0x13, 0x0B, 0x00000001, PPC_MFTB),
<snip>
Quoted 12 lines
Quoted 12 lines
target/ppc/translate/misc-impl.c.inc +12
-0+ +static bool do_rfi(DisasContext *ctx, arg_RFID *a, int kind) +{ +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(ctx); + return true; +#else + void (*helper)(TCGv_ptr); + + switch (kind) { + case RFI: + if (is_book3s_arch2x(ctx)) {
Quoted 8 lines
target/ppc/translate/misc-impl.c.inc static bool do_mtmsr(DisasContext *ctx, arg_X_rs_l *a, bool is_mtmsrd) · line 260
Quoted 3 lines
target/ppc/translate/misc-impl.c.inc +3
-0+ gen_invalid(ctx); + return true; + }Since you are already using
TRANS_FLAGS_NOT, is it still necessary to have the above check ? Or, better yet, from the other way around, since you have this check, is it necessary to introduce and have theTRANS_FLAGS_NOTmacro at all ?
I felt both are doing the same job. Let me if I am missing something.
No, you are not. Latter should be the preferred approach. I will address it in the next version.
Quoted 22 lines
Quoted 22 lines
target/ppc/translate/misc-impl.c.inc +22
-0+ REQUIRE_SV(ctx); + helper = gen_helper_RFI; + break; +#if defined(TARGET_PPC64) + case HRFID: + REQUIRE_HV(ctx); + helper = gen_helper_HRFID; + break; + case RFID: + REQUIRE_SV(ctx); + helper = gen_helper_RFID; + break; + case RFSCV: + REQUIRE_SV(ctx); + helper = gen_helper_RFSCV; + break; +#endif + default: + gen_invalid(ctx); + return true; + } +
<snip>
Quoted 8 lines
target/ppc/translate/misc-impl.c.inc static bool do_mtmsr(DisasContext *ctx, arg_X_rs_l *a, bool is_mtmsrd) · line 327
Quoted 5 lines
target/ppc/translate/misc-impl.c.inc +5
-0+ +TRANS_FLAGS_NOT(SEGMENT_64B, RFI, do_rfi, RFI) +TRANS64(RFID, do_rfi, RFID) +TRANS64(HRFID, do_rfi, HRFID) +TRANS64_FLAGS2(ISA300, RFSCV, do_rfi, RFSCV)Looks like we have dropped some flag checks :
RFI is missingPPC_FLOWand HRFID is missingPPC_64H
Yes, I missed adding those flags. Thank you for pointing out. And, apologies for the delay in response.
I will post another version shortly.
Thanks,
Vishal
RFC PATCH v3 1/1 target/ppc: Move system call and rfi instructions to decodetree
In reply to Chinmay RathFrom: Vishal Chourasia <[email protected]>
Moving the following instructions to decodetree specification:
sc, scv : SC-form
rfi, rfid, rfscv, hrfid : XL-form
This builds upon the previous work that moved mfmsr and mtmsr[d] instructions to decodetree.
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the -d in_asm,op flag, and also by booting a pseries qemu guest.
This also includes improvements from review feedback:
- Rename helpers to uppercase (RFI/RFID/RFSCV/HRFID) to match ISA mnemonics
- Add TRANS_FLAGS_NOT() and TRANS64_FLAGS() macro variants
- Add REQUIRE_INSNS_FLAGS_NOT() check for flag exclusion
- Specify lev field as uint8_t in SC instruction format
- Remove redundant masking in SCV since lev is already 7-bit
- Replace TARGET_PPC64 ifdefs with REQUIRE_64BIT() macro
- Gate SC, SCV, RFI, RFID, RFSCV, and HRFID with appropriate flags
- Replace runtime is_book3s_arch2x() check in RFI with TRANS_FLAGS_NOT(SEGMENT_64B)
- Consolidate CONFIG_USER_ONLY guards into single block
---
v3: Addressed missing flag checks for RFI and HRFID instructions pointed out by Chinmay.
v2: In v1, do_rfi() path effectively only implemented the instruction for user-only and 64-bit builds, so on qemu-system-ppc every rfi was translated as invalid. This trapped OpenBIOS in exception return paths and caused the boot/tests to hang. In v2 restore the 32-bit system emulation rfi path while keeping rfid, hrfid, and rfscv 64-bit-only.
target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 11 +++ target/ppc/tcg-excp_helper.c | 8 +- target/ppc/translate.c | 126 ++------------------------- target/ppc/translate/misc-impl.c.inc | 100 +++++++++++++++++++++ 5 files changed, 126 insertions(+), 127 deletions(-)
target/ppc/helper.h +4 -4
@@ -11,7 +11,7 @@ DEF_HELPER_4(HASHCHKP, void, env, tl, tl, tl)#if !defined(CONFIG_USER_ONLY ) DEF_HELPER_2(store_msr, void, env, tl) DEF_HELPER_1(ppc_maybe_interrupt, void, env) -DEF_HELPER_1(rfi, void, env) +DEF_HELPER_1(RFI, void, env) DEF_HELPER_1(40x_rfci, void, env) DEF_HELPER_1(rfci, void, env)DEF_HELPER_1 (rfdi, void, env)
@@ -19,9 +19,9 @@ DEF_HELPER_1(rfmci, void, env)#if defined(TARGET_PPC64 ) DEF_HELPER_2(scv, noreturn, env, i32) DEF_HELPER_2(PMINSN, void, env, i32) -DEF_HELPER_1(rfid, void, env) -DEF_HELPER_1(rfscv, void, env) -DEF_HELPER_1(hrfid, void, env) +DEF_HELPER_1(RFID, void, env) +DEF_HELPER_1(RFSCV, void, env) +DEF_HELPER_1(HRFID, void, env) DEF_HELPER_2(rfebb, void, env, tl) DEF_HELPER_2(store_lpcr, void, env, tl)DEF_HELPER_2 (store_pcr, void, env, tl)
target/ppc/insn32.decode +11 -0
@@ -202,6 +202,9 @@ &X_rs_l rs l:bool @X_rs_l ...... rs:5 .... l:1 ..... .......... . &X_rs_l +&SC lev:uint8_t +@SC ...... ..... ..... .... lev:7 ... . . &SC + &X_uim5 xt uim:uint8_t @X_uim5 ...... ..... ..... uim:5 .......... . &X_uim5 xt=%x_xt
@@ -323,6 +326,14 @@ MFMSR 011111 ..... ----- ----- 0001010011 - @X_t MTMSR 011111 ..... ---- . ----- 0010010010 - @X_rs_l MTMSRD 011111 ..... ---- . ----- 0010110010 - @X_rs_l +### System Call and Return from Interrupt +SC 010001 ----- ----- ---- ....... --- 1 - @SC +SCV 010001 ----- ----- ---- ....... --- 0 1 @SC +RFI 010011 ----- ----- ----- 0000110010 - +RFID 010011 ----- ----- ----- 0000010010 - +RFSCV 010011 ----- ----- ----- 0001010010 - +HRFID 010011 ----- ----- ----- 0100010010 - + ### Fixed-Point Byte-Reverse Instructions BRW 011111 ..... ..... ----- 0010011011 - @X_sa BRD 011111 ..... ..... ----- 0010111011 - @X_sa
target/ppc/tcg-excp_helper.c +4 -4
@@ -527,13 +527,13 @@ static void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr)check_tlb_flush (env, false); } -void helper_rfi (CPUPPCState *env) +void helper_RFI (CPUPPCState *env) {do_rfi (env, env->spr[SPR_SRR0 ], env->spr[SPR_SRR1 ] &0xfffffffful ); }#ifdef TARGET_PPC64 -void helper_rfid (CPUPPCState *env) +void helper_RFID (CPUPPCState *env) {/* * The architecture defines a number of rules for which bits can
@@ -544,12 +544,12 @@ void helper_rfid(CPUPPCState *env)do_rfi (env, env->spr[SPR_SRR0 ], env->spr[SPR_SRR1 ]); } -void helper_rfscv (CPUPPCState *env) +void helper_RFSCV (CPUPPCState *env) {do_rfi (env, env->lr, env->ctr); } -void helper_hrfid (CPUPPCState *env) +void helper_HRFID (CPUPPCState *env) {do_rfi (env, env->spr[SPR_HSRR0 ], env->spr[SPR_HSRR1 ]); }
target/ppc/translate.c +7 -119
144 lines not on this page · raw message
target/ppc/translate/misc-impl.c.inc +100 -0
103 lines not on this page · raw message
Signature · 1 line
2.54.0
Re: [RFC PATCH v3] target/ppc: Move system call and rfi instructions to decodetree
Quoted 24 lines · Vishal Chourasia
From: Vishal Chourasia <[email protected]>
Moving the following instructions to decodetree specification:
sc, scv : SC-form
rfi, rfid, rfscv, hrfid : XL-formThis builds upon the previous work that moved mfmsr and mtmsr[d] instructions to decodetree.
The changes were verified by validating that the tcg ops generated by those instructions remain the same, which were captured with the
-d in_asm,opflag, and also by booting a pseries qemu guest.This also includes improvements from review feedback:
- Rename helpers to uppercase (RFI/RFID/RFSCV/HRFID) to match ISA mnemonics
- AddTRANS_FLAGS_NOT()andTRANS64_FLAGS()macro variants
- AddREQUIRE_INSNS_FLAGS_NOT()check for flag exclusion
- Specify lev field asuint8_tin SC instruction format
- Remove redundant masking in SCV since lev is already 7-bit
- ReplaceTARGET_PPC64ifdefs withREQUIRE_64BIT()macro
- Gate SC, SCV, RFI, RFID, RFSCV, and HRFID with appropriate flags
- Replace runtimeis_book3s_arch2x()check in RFI withTRANS_FLAGS_NOT(SEGMENT_64B)
- ConsolidateCONFIG_USER_ONLYguards into single block
Quoted 4 lines
Signed-off-by Vishal Chourasia <[email protected]>---
v3: Addressed missing flag checks for RFI and HRFID instructions pointed out by Chinmay.
Thanks for taking care of this !
Quoted 12 lines
v2: In v1,
do_rfi()path effectively only implemented the instruction for user-only and 64-bit builds, so on qemu-system-ppc every rfi was translated as invalid. This trapped OpenBIOS in exception return paths and caused the boot/tests to hang. In v2 restore the 32-bit system emulation rfi path while keeping rfid, hrfid, and rfscv 64-bit-only.target/ppc/helper.h | 8 +- target/ppc/insn32.decode | 11 +++ target/ppc/tcg-excp_helper.c | 8 +- target/ppc/translate.c | 126 ++------------------------- target/ppc/translate/misc-impl.c.inc | 100 +++++++++++++++++++++ 5 files changed, 126 insertions(+), 127 deletions(-)
Quoted 6 lines · Vishal Chourasia
Hi All,
I see there is a test case that fails during the CI run.
https://gitlab.com/rathc/qemu/-/jobs/14481511189/Looking into it
Hi All,
In v1, do_rfi() effectively only handled user-only and 64-bit builds, so on 32-bit qemu-system-ppc every rfi was treated as invalid.
OpenBIOS uses rfi to return from exceptions, so it got stuck in the exception path and the test timed out.
I have a fix that restores the 32-bit system-emulation rfi path while keeping rfid, hrfid, and rfscv 64-bit-only.
https://lore.kernel.org/all/[email protected]/
Link to the Gitlab CI
https://gitlab.com/vishalc-ibm/qemu/-/pipelines/2558504095
Thanks,
vishalc
Quoted 100 lines
Thanks,
vishalcQuoted 94 lines · Chinmay Rath
We recently had a QEMU decodetree hackathon at our org focusing on moving instructions to decodetree specification. I have consolidated the patches generated out of this effort in this series. Though I have done a round of review on all of them, might share some more review comments later.
The checkpatch.pl script emits false error for a couple of patches which are of the following nature :
TRANS(STWAT, do_st_atomic, DEF_MEMOP(MO_UL))static bool
trans_LDAT(DisasContext *ctx, arg_LDAT *a)^I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).
Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?Gitlab CI: https://gitlab.com/rathc/qemu/-/pipelines/2540725424
Please note that check-python-tox and migration-compat-aarch64 from CI fails in the upstream master branch as seen in the following:
https://gitlab.com/rathc/qemu/-/pipelines/2537246569Thanks,
ChinmayAboorva Devarajan (3):
target/ppc: Move vector merge instructions to decodetree target/ppc: Move vector pack instructions to decodetree target/ppc: Move GPR atomic load/store instructions to decodetreeAmit Machhiwal (2):
target/ppc: Move fixed-point Shift insns to decodetree target/ppc: Move fixed-point byte-reversal store insns to decodetreeMukesh Kumar Chaurasiya (IBM) (2):
target/ppc: convert slw,srw instruction via decode spec target/ppc: convert sraw[i] instruction via decode specNikhil Kumar Singh (3):
target/ppc: Migrate extswsli to decodetree target/ppc: Migrate atomic loads to decodetree target/ppc: Convert cache instructions to decodetreeOjaswin Mujoo (7):
target/ppc: Move isync instruction to decodetree. target/ppc: Convert b{a, l, la} to decode tree target/ppc: move various conditional branch insns to decodetree target/ppc: Fix TRANS* macro variadic arguments handling target/ppc: Move wait instruction to decodetree target/ppc: Move sleep & friends to decodetree target/ppc: Refactor sleep and its variants to use a common helperShivang Upadhyay (4):
target/ppc: Move Condition Register access instructions to decodetree. target/ppc: Move Condition Register logical instructions to
decodetree.
target/ppc: Move Fixed-Point Load/Store String instructions to
decodetree.
target/ppc: Move VMX integer arithmetic and BCD instructions to
decodetree.Shivani Nittor (1):
target/ppc : Convert mcrf to decode treeTanushree Shah (2):
target/ppc: Move rlwimi, rlwinm instructions to decodetree target/ppc: Move lmw, stmw instructions to decodetreeUtkarsh Verma (1):
target/ppc: Move st{b, h, w, d, q}cx instructions to decodetreeVishal Chourasia (3):
target/ppc: Move mfmsr, mtmsr[d] instructions to decodetree target/ppc: Move byte-reverse instructions to decodetree target/ppc: Move system call and rfi instructions to decodetreetarget/ppc/helper.h | 100 +- target/ppc/insn32.decode | 244 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 18 +- target/ppc/tcg-excp_helper.c | 10 +- target/ppc/translate.c | 2592 ++++------------- target/ppc/translate/branch-impl.c.inc | 181 ++ target/ppc/translate/fixedpoint-impl.c.inc | 936 ++++++ target/ppc/translate/misc-impl.c.inc | 175 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 30 + target/ppc/translate/storage-ctrl-impl.c.inc | 117 + target/ppc/translate/vmx-impl.c.inc | 360 +-- target/ppc/translate/vmx-ops.c.inc | 41 - 14 files changed, 2529 insertions(+), 2358 deletions(-)
Quoted 10 lines · Chinmay Rath
We recently had a QEMU decodetree hackathon at our org focusing on moving instructions to decodetree specification. I have consolidated the patches generated out of this effort in this series. Though I have done a round of review on all of them, might share some more review comments later.
The checkpatch.pl script emits false error for a couple of patches which are of the following nature :
TRANS(STWAT, do_st_atomic, DEF_MEMOP(MO_UL))
Quoted 8 lines
static bool
trans_LDAT(DisasContext *ctx, arg_LDAT *a)^I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).
Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?
Hi Chao,
I was wondering if you would be able to advise a way forward for this checkpatch issue ? TIA.
Quoted 7 lines
Gitlab CI: https://gitlab.com/rathc/qemu/-/pipelines/2540725424
Please note that check-python-tox and migration-compat-aarch64 from CI fails in the upstream master branch as seen in the following:
https://gitlab.com/rathc/qemu/-/pipelines/2537246569Thanks,
Chinmay
Hi Glenn,
If possible, would you like to have a look at this series when you get a chance ? TIA.
Thanks,
Chinmay
Quoted 67 lines
Aboorva Devarajan (3):
target/ppc: Move vector merge instructions to decodetree target/ppc: Move vector pack instructions to decodetree target/ppc: Move GPR atomic load/store instructions to decodetreeAmit Machhiwal (2):
target/ppc: Move fixed-point Shift insns to decodetree target/ppc: Move fixed-point byte-reversal store insns to decodetreeMukesh Kumar Chaurasiya (IBM) (2):
target/ppc: convert slw,srw instruction via decode spec target/ppc: convert sraw[i] instruction via decode specNikhil Kumar Singh (3):
target/ppc: Migrate extswsli to decodetree target/ppc: Migrate atomic loads to decodetree target/ppc: Convert cache instructions to decodetreeOjaswin Mujoo (7):
target/ppc: Move isync instruction to decodetree. target/ppc: Convert b{a, l, la} to decode tree target/ppc: move various conditional branch insns to decodetree target/ppc: Fix TRANS* macro variadic arguments handling target/ppc: Move wait instruction to decodetree target/ppc: Move sleep & friends to decodetree target/ppc: Refactor sleep and its variants to use a common helperShivang Upadhyay (4):
target/ppc: Move Condition Register access instructions to decodetree. target/ppc: Move Condition Register logical instructions to
decodetree.
target/ppc: Move Fixed-Point Load/Store String instructions to
decodetree.
target/ppc: Move VMX integer arithmetic and BCD instructions to
decodetree.Shivani Nittor (1):
target/ppc : Convert mcrf to decode treeTanushree Shah (2):
target/ppc: Move rlwimi, rlwinm instructions to decodetree target/ppc: Move lmw, stmw instructions to decodetreeUtkarsh Verma (1):
target/ppc: Move st{b, h, w, d, q}cx instructions to decodetreeVishal Chourasia (3):
target/ppc: Move mfmsr, mtmsr[d] instructions to decodetree target/ppc: Move byte-reverse instructions to decodetree target/ppc: Move system call and rfi instructions to decodetreetarget/ppc/helper.h | 100 +- target/ppc/insn32.decode | 244 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 18 +- target/ppc/tcg-excp_helper.c | 10 +- target/ppc/translate.c | 2592 ++++------------- target/ppc/translate/branch-impl.c.inc | 181 ++ target/ppc/translate/fixedpoint-impl.c.inc | 936 ++++++ target/ppc/translate/misc-impl.c.inc | 175 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 30 + target/ppc/translate/storage-ctrl-impl.c.inc | 117 + target/ppc/translate/vmx-impl.c.inc | 360 +-- target/ppc/translate/vmx-ops.c.inc | 41 - 14 files changed, 2529 insertions(+), 2358 deletions(-)
Quoted 27 lines · Chinmay Rath
Quoted 10 lines · Chinmay Rath
We recently had a QEMU decodetree hackathon at our org focusing on moving instructions to decodetree specification. I have consolidated the patches generated out of this effort in this series. Though I have done a round of review on all of them, might share some more review comments later.
The checkpatch.pl script emits false error for a couple of patches which are of the following nature :
TRANS(STWAT, do_st_atomic, DEF_MEMOP(MO_UL))Quoted 8 lines
static bool
trans_LDAT(DisasContext *ctx, arg_LDAT *a)^I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).
Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?Hi Chao,
I was wondering if you would be able to advise a way forward for this checkpatch issue ? TIA.Quoted 5 lines
Gitlab CI: https://gitlab.com/rathc/qemu/-/pipelines/2540725424
Please note that check-python-tox and migration-compat-aarch64 from CI fails in the upstream master branch as seen in the following:
https://gitlab.com/rathc/qemu/-/pipelines/2537246569
Quoted 5 lines
Quoted 2 lines
Thanks,
ChinmayHi Glenn,
If possible, would you like to have a look at this series when you get a chance ? TIA.
Hi Chinmay,
First, I'd like to thank you and everyone that worked on this for their efforts! This seems like one of those tasks that everyone knows is needed but everyone would rather work on other more interesting things (myself included). I would like to take a look at this series when I get the chance. I do have a lot on my plate right now, but hopefully I can get to it in the next week or so.
Thanks,
Glenn
Quoted 70 lines
Thanks,
ChinmayQuoted 67 lines
Aboorva Devarajan (3):
target/ppc: Move vector merge instructions to decodetree target/ppc: Move vector pack instructions to decodetree target/ppc: Move GPR atomic load/store instructions to decodetreeAmit Machhiwal (2):
target/ppc: Move fixed-point Shift insns to decodetree target/ppc: Move fixed-point byte-reversal store insns to decodetreeMukesh Kumar Chaurasiya (IBM) (2):
target/ppc: convert slw,srw instruction via decode spec target/ppc: convert sraw[i] instruction via decode specNikhil Kumar Singh (3):
target/ppc: Migrate extswsli to decodetree target/ppc: Migrate atomic loads to decodetree target/ppc: Convert cache instructions to decodetreeOjaswin Mujoo (7):
target/ppc: Move isync instruction to decodetree. target/ppc: Convert b{a, l, la} to decode tree target/ppc: move various conditional branch insns to decodetree target/ppc: Fix TRANS* macro variadic arguments handling target/ppc: Move wait instruction to decodetree target/ppc: Move sleep & friends to decodetree target/ppc: Refactor sleep and its variants to use a common helperShivang Upadhyay (4):
target/ppc: Move Condition Register access instructions to decodetree. target/ppc: Move Condition Register logical instructions to
decodetree.
target/ppc: Move Fixed-Point Load/Store String instructions to
decodetree.
target/ppc: Move VMX integer arithmetic and BCD instructions to
decodetree.Shivani Nittor (1):
target/ppc : Convert mcrf to decode treeTanushree Shah (2):
target/ppc: Move rlwimi, rlwinm instructions to decodetree target/ppc: Move lmw, stmw instructions to decodetreeUtkarsh Verma (1):
target/ppc: Move st{b, h, w, d, q}cx instructions to decodetreeVishal Chourasia (3):
target/ppc: Move mfmsr, mtmsr[d] instructions to decodetree target/ppc: Move byte-reverse instructions to decodetree target/ppc: Move system call and rfi instructions to decodetreetarget/ppc/helper.h | 100 +- target/ppc/insn32.decode | 244 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 18 +- target/ppc/tcg-excp_helper.c | 10 +- target/ppc/translate.c | 2592 ++++------------- target/ppc/translate/branch-impl.c.inc | 181 ++ target/ppc/translate/fixedpoint-impl.c.inc | 936 ++++++ target/ppc/translate/misc-impl.c.inc | 175 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 30 + target/ppc/translate/storage-ctrl-impl.c.inc | 117 + target/ppc/translate/vmx-impl.c.inc | 360 +-- target/ppc/translate/vmx-ops.c.inc | 41 - 14 files changed, 2529 insertions(+), 2358 deletions(-)
Quoted 42 lines · Miles Glenn
Quoted 27 lines · Chinmay Rath
Quoted 10 lines · Chinmay Rath
We recently had a QEMU decodetree hackathon at our org focusing on moving instructions to decodetree specification. I have consolidated the patches generated out of this effort in this series. Though I have done a round of review on all of them, might share some more review comments later.
The checkpatch.pl script emits false error for a couple of patches which are of the following nature :
TRANS(STWAT, do_st_atomic, DEF_MEMOP(MO_UL))Quoted 8 lines
static bool
trans_LDAT(DisasContext *ctx, arg_LDAT *a)^I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).
Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?Hi Chao,
I was wondering if you would be able to advise a way forward for this checkpatch issue ? TIA.Quoted 5 lines
Gitlab CI: https://gitlab.com/rathc/qemu/-/pipelines/2540725424
Please note that check-python-tox and migration-compat-aarch64 from CI fails in the upstream master branch as seen in the following:
https://gitlab.com/rathc/qemu/-/pipelines/2537246569Quoted 5 lines
Quoted 2 lines
Thanks,
ChinmayHi Glenn,
If possible, would you like to have a look at this series when you get a chance ? TIA.Hi Chinmay,
First, I'd like to thank you and everyone that worked on this for their efforts! This seems like one of those tasks that everyone knows is needed but everyone would rather work on other more interesting things (myself included). I would like to take a look at this series when I get the chance. I do have a lot on my plate right now, but hopefully I can get to it in the next week or so.
Quoted 3 lines
Thanks,
Glenn
Sure Glenn, thanks !
-Chinmay
Quoted 70 lines
Quoted 69 lines
Thanks,
ChinmayQuoted 67 lines
Aboorva Devarajan (3):
target/ppc: Move vector merge instructions to decodetree target/ppc: Move vector pack instructions to decodetree target/ppc: Move GPR atomic load/store instructions to decodetreeAmit Machhiwal (2):
target/ppc: Move fixed-point Shift insns to decodetree target/ppc: Move fixed-point byte-reversal store insns to decodetreeMukesh Kumar Chaurasiya (IBM) (2):
target/ppc: convert slw,srw instruction via decode spec target/ppc: convert sraw[i] instruction via decode specNikhil Kumar Singh (3):
target/ppc: Migrate extswsli to decodetree target/ppc: Migrate atomic loads to decodetree target/ppc: Convert cache instructions to decodetreeOjaswin Mujoo (7):
target/ppc: Move isync instruction to decodetree. target/ppc: Convert b{a, l, la} to decode tree target/ppc: move various conditional branch insns to decodetree target/ppc: Fix TRANS* macro variadic arguments handling target/ppc: Move wait instruction to decodetree target/ppc: Move sleep & friends to decodetree target/ppc: Refactor sleep and its variants to use a common helperShivang Upadhyay (4):
target/ppc: Move Condition Register access instructions to decodetree. target/ppc: Move Condition Register logical instructions to
decodetree.
target/ppc: Move Fixed-Point Load/Store String instructions to
decodetree.
target/ppc: Move VMX integer arithmetic and BCD instructions to
decodetree.Shivani Nittor (1):
target/ppc : Convert mcrf to decode treeTanushree Shah (2):
target/ppc: Move rlwimi, rlwinm instructions to decodetree target/ppc: Move lmw, stmw instructions to decodetreeUtkarsh Verma (1):
target/ppc: Move st{b, h, w, d, q}cx instructions to decodetreeVishal Chourasia (3):
target/ppc: Move mfmsr, mtmsr[d] instructions to decodetree target/ppc: Move byte-reverse instructions to decodetree target/ppc: Move system call and rfi instructions to decodetreetarget/ppc/helper.h | 100 +- target/ppc/insn32.decode | 244 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 18 +- target/ppc/tcg-excp_helper.c | 10 +- target/ppc/translate.c | 2592 ++++------------- target/ppc/translate/branch-impl.c.inc | 181 ++ target/ppc/translate/fixedpoint-impl.c.inc | 936 ++++++ target/ppc/translate/misc-impl.c.inc | 175 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 30 + target/ppc/translate/storage-ctrl-impl.c.inc | 117 + target/ppc/translate/vmx-impl.c.inc | 360 +-- target/ppc/translate/vmx-ops.c.inc | 41 - 14 files changed, 2529 insertions(+), 2358 deletions(-)
Quoted 43 lines · Chinmay Rath
Quoted 42 lines · Miles Glenn
Quoted 27 lines · Chinmay Rath
Quoted 10 lines · Chinmay Rath
We recently had a QEMU decodetree hackathon at our org focusing on moving instructions to decodetree specification. I have consolidated the patches generated out of this effort in this series. Though I have done a round of review on all of them, might share some more review comments later.
The checkpatch.pl script emits false error for a couple of patches which are of the following nature :
TRANS(STWAT, do_st_atomic, DEF_MEMOP(MO_UL))Quoted 8 lines
static bool
trans_LDAT(DisasContext *ctx, arg_LDAT *a)^I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).
Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?Hi Chao,
I was wondering if you would be able to advise a way forward for this checkpatch issue ? TIA.Quoted 5 lines
Gitlab CI: https://gitlab.com/rathc/qemu/-/pipelines/2540725424
Please note that check-python-tox and migration-compat-aarch64 from CI fails in the upstream master branch as seen in the following:
https://gitlab.com/rathc/qemu/-/pipelines/2537246569Quoted 5 lines
Quoted 2 lines
Thanks,
ChinmayHi Glenn,
If possible, would you like to have a look at this series when you get a chance ? TIA.Hi Chinmay,
First, I'd like to thank you and everyone that worked on this for their efforts! This seems like one of those tasks that everyone knows is needed but everyone would rather work on other more interesting things (myself included). I would like to take a look at this series when I get the chance. I do have a lot on my plate right now, but hopefully I can get to it in the next week or so.
Quoted 4 lines
Quoted 3 lines
Thanks,
Glenn
Sure Glenn, thanks !
I had a little time to look over the changes today and I didn't see any major issues. I did notice that the change, "Refactor sleep and its variants to use a common helper", didn't seem related to moving things into decodetree, so maybe that should be reviewed separately? There was also a lot of moving of implementation code out of translate.c into more specific files, like fixedpoint-impl.c.inc. This didn't seem required in order to use decodetree either, so perhaps those changes should be split out into another patch?
Otherwise, I think it looks pretty good.
Thanks,
Glenn
Quoted 70 lines
-Chinmay
Quoted 69 lines
Quoted 69 lines
Thanks,
ChinmayQuoted 67 lines
Aboorva Devarajan (3):
target/ppc: Move vector merge instructions to decodetree target/ppc: Move vector pack instructions to decodetree target/ppc: Move GPR atomic load/store instructions to decodetreeAmit Machhiwal (2):
target/ppc: Move fixed-point Shift insns to decodetree target/ppc: Move fixed-point byte-reversal store insns to decodetreeMukesh Kumar Chaurasiya (IBM) (2):
target/ppc: convert slw,srw instruction via decode spec target/ppc: convert sraw[i] instruction via decode specNikhil Kumar Singh (3):
target/ppc: Migrate extswsli to decodetree target/ppc: Migrate atomic loads to decodetree target/ppc: Convert cache instructions to decodetreeOjaswin Mujoo (7):
target/ppc: Move isync instruction to decodetree. target/ppc: Convert b{a, l, la} to decode tree target/ppc: move various conditional branch insns to decodetree target/ppc: Fix TRANS* macro variadic arguments handling target/ppc: Move wait instruction to decodetree target/ppc: Move sleep & friends to decodetree target/ppc: Refactor sleep and its variants to use a common helperShivang Upadhyay (4):
target/ppc: Move Condition Register access instructions to decodetree. target/ppc: Move Condition Register logical instructions to
decodetree.
target/ppc: Move Fixed-Point Load/Store String instructions to
decodetree.
target/ppc: Move VMX integer arithmetic and BCD instructions to
decodetree.Shivani Nittor (1):
target/ppc : Convert mcrf to decode treeTanushree Shah (2):
target/ppc: Move rlwimi, rlwinm instructions to decodetree target/ppc: Move lmw, stmw instructions to decodetreeUtkarsh Verma (1):
target/ppc: Move st{b, h, w, d, q}cx instructions to decodetreeVishal Chourasia (3):
target/ppc: Move mfmsr, mtmsr[d] instructions to decodetree target/ppc: Move byte-reverse instructions to decodetree target/ppc: Move system call and rfi instructions to decodetreetarget/ppc/helper.h | 100 +- target/ppc/insn32.decode | 244 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 18 +- target/ppc/tcg-excp_helper.c | 10 +- target/ppc/translate.c | 2592 ++++------------- target/ppc/translate/branch-impl.c.inc | 181 ++ target/ppc/translate/fixedpoint-impl.c.inc | 936 ++++++ target/ppc/translate/misc-impl.c.inc | 175 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 30 + target/ppc/translate/storage-ctrl-impl.c.inc | 117 + target/ppc/translate/vmx-impl.c.inc | 360 +-- target/ppc/translate/vmx-ops.c.inc | 41 - 14 files changed, 2529 insertions(+), 2358 deletions(-)
Quoted 57 lines · Miles Glenn
Quoted 43 lines · Chinmay Rath
Quoted 42 lines · Miles Glenn
Quoted 27 lines · Chinmay Rath
Quoted 10 lines · Chinmay Rath
We recently had a QEMU decodetree hackathon at our org focusing on moving instructions to decodetree specification. I have consolidated the patches generated out of this effort in this series. Though I have done a round of review on all of them, might share some more review comments later.
The checkpatch.pl script emits false error for a couple of patches which are of the following nature :
TRANS(STWAT, do_st_atomic, DEF_MEMOP(MO_UL))Quoted 8 lines
static bool
trans_LDAT(DisasContext *ctx, arg_LDAT *a)^I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).
Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?Hi Chao,
I was wondering if you would be able to advise a way forward for this checkpatch issue ? TIA.Quoted 5 lines
Gitlab CI: https://gitlab.com/rathc/qemu/-/pipelines/2540725424
Please note that check-python-tox and migration-compat-aarch64 from CI fails in the upstream master branch as seen in the following:
https://gitlab.com/rathc/qemu/-/pipelines/2537246569Quoted 5 lines
Quoted 2 lines
Thanks,
ChinmayHi Glenn,
If possible, would you like to have a look at this series when you get a chance ? TIA.Hi Chinmay,
First, I'd like to thank you and everyone that worked on this for their efforts! This seems like one of those tasks that everyone knows is needed but everyone would rather work on other more interesting things (myself included). I would like to take a look at this series when I get the chance. I do have a lot on my plate right now, but hopefully I can get to it in the next week or so.
Quoted 4 lines
Quoted 3 lines
Thanks,
Glenn
Sure Glenn, thanks !
I had a little time to look over the changes today and I didn't see any major issues. I did notice that the change, "Refactor sleep and its variants to use a common helper", didn't seem related to moving things into decodetree, so maybe that should be reviewed separately? There was also a lot of moving of implementation code out of
translate.cinto more specific files, like fixedpoint-impl.c.inc. This didn't seem required in order to use decodetree either, so perhaps those changes should be split out into another patch?
Quoted 5 lines
Otherwise, I think it looks pretty good.
Thanks,
Glenn
Thanks for going through this Glenn !
I shall mention in the cover letter that some patches in the series facilitate the movement instead of purely doing the movement (like the "Refactor sleep and its variants to use a common helper" patch). Would that be okay to you ?
The movement of instructions from translate.c to specific files along with their decodetree movement is something that has been traditionally in all older decodetree movement patches, so that is something that's expected IMO.
Thanks,
Chinmay
Quoted 73 lines
Quoted 72 lines
-Chinmay
Quoted 69 lines
Quoted 69 lines
Thanks,
ChinmayQuoted 67 lines
Aboorva Devarajan (3):
target/ppc: Move vector merge instructions to decodetree target/ppc: Move vector pack instructions to decodetree target/ppc: Move GPR atomic load/store instructions to decodetreeAmit Machhiwal (2):
target/ppc: Move fixed-point Shift insns to decodetree target/ppc: Move fixed-point byte-reversal store insns to decodetreeMukesh Kumar Chaurasiya (IBM) (2):
target/ppc: convert slw,srw instruction via decode spec target/ppc: convert sraw[i] instruction via decode specNikhil Kumar Singh (3):
target/ppc: Migrate extswsli to decodetree target/ppc: Migrate atomic loads to decodetree target/ppc: Convert cache instructions to decodetreeOjaswin Mujoo (7):
target/ppc: Move isync instruction to decodetree. target/ppc: Convert b{a, l, la} to decode tree target/ppc: move various conditional branch insns to decodetree target/ppc: Fix TRANS* macro variadic arguments handling target/ppc: Move wait instruction to decodetree target/ppc: Move sleep & friends to decodetree target/ppc: Refactor sleep and its variants to use a common helperShivang Upadhyay (4):
target/ppc: Move Condition Register access instructions to decodetree. target/ppc: Move Condition Register logical instructions to
decodetree.
target/ppc: Move Fixed-Point Load/Store String instructions to
decodetree.
target/ppc: Move VMX integer arithmetic and BCD instructions to
decodetree.Shivani Nittor (1):
target/ppc : Convert mcrf to decode treeTanushree Shah (2):
target/ppc: Move rlwimi, rlwinm instructions to decodetree target/ppc: Move lmw, stmw instructions to decodetreeUtkarsh Verma (1):
target/ppc: Move st{b, h, w, d, q}cx instructions to decodetreeVishal Chourasia (3):
target/ppc: Move mfmsr, mtmsr[d] instructions to decodetree target/ppc: Move byte-reverse instructions to decodetree target/ppc: Move system call and rfi instructions to decodetree
target/ppc/helper.h| 100 +-
target/ppc/insn32.decode | 244 ++
target/ppc/int_helper.c| 76 +-
target/ppc/internal.h| 7 -
target/ppc/mem_helper.c| 18 +-
target/ppc/tcg-excp_helper.c| 10 +-
target/ppc/translate.c| 2592 ++++-------------
target/ppc/translate/branch-impl.c.inc | 181 ++
target/ppc/translate/fixedpoint-impl.c.inc | 936 ++++++
target/ppc/translate/misc-impl.c.inc | 175 ++
.../ppc/translate/processor-ctrl-impl.c.inc | 30 +
target/ppc/translate/storage-ctrl-impl.c.inc | 117 +
target/ppc/translate/vmx-impl.c.inc | 360 +--
target/ppc/translate/vmx-ops.c.inc | 41 -
14 files changed, 2529 insertions(+), 2358 deletions(-)
Quoted 63 lines · Chinmay Rath
Quoted 61 lines · Miles Glenn
Quoted 43 lines · Chinmay Rath
Quoted 42 lines · Miles Glenn
Quoted 27 lines · Chinmay Rath
Quoted 10 lines · Chinmay Rath
We recently had a QEMU decodetree hackathon at our org focusing on moving instructions to decodetree specification. I have consolidated the patches generated out of this effort in this series. Though I have done a round of review on all of them, might share some more review comments later.
The checkpatch.pl script emits false error for a couple of patches which are of the following nature :
TRANS(STWAT, do_st_atomic, DEF_MEMOP(MO_UL))Quoted 8 lines
static bool
trans_LDAT(DisasContext *ctx, arg_LDAT *a)^ I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?Hi Chao,
I was wondering if you would be able to advise a way forward for this checkpatch issue ? TIA.Quoted 5 lines
Gitlab CI: https://gitlab.com/rathc/qemu/-/pipelines/2540725424
Please note that check-python-tox and migration-compat-aarch64 from CI fails in the upstream master branch as seen in the following:
https://gitlab.com/rathc/qemu/-/pipelines/2537246569Quoted 5 lines
Quoted 2 lines
Thanks,
ChinmayHi Glenn,
If possible, would you like to have a look at this series when you get a chance ? TIA.Hi Chinmay,
First, I'd like to thank you and everyone that worked on this for their efforts! This seems like one of those tasks that everyone knows is needed but everyone would rather work on other more interesting things (myself included). I would like to take a look at this series when I get the chance. I do have a lot on my plate right now, but hopefully I can get to it in the next week or so.
Quoted 4 lines
Quoted 3 lines
Thanks,
Glenn
Sure Glenn, thanks !
I had a little time to look over the changes today and I didn't see any major issues. I did notice that the change, "Refactor sleep and its variants to use a common helper", didn't seem related to moving things into decodetree, so maybe that should be reviewed separately? There was also a lot of moving of implementation code out of
translate.cinto more specific files, like fixedpoint-impl.c.inc. This didn't seem required in order to use decodetree either, so perhaps those changes should be split out into another patch?Otherwise, I think it looks pretty good.
Thanks,
Quoted 8 lines
Quoted 1 line
Glenn
Thanks for going through this Glenn !
I shall mention in the cover letter that some patches in the series facilitate the movement instead of purely doing the movement (like the "Refactor sleep and its variants to use a common helper" patch). Would that be okay to you ?The movement of instructions from
translate.cto specific files along with their decodetree movement is something that has been traditionally in all older decodetree movement patches, so that is something that's expected IMO.Thanks,
Chinmay
Hi Glenn,
Please do share if you have any further review comments. Please feel free to provide your R-by if you seem fit in any of the patches. Will help us expedite the review.
Regards,
Chinmay
Quoted 75 lines
Quoted 74 lines
Quoted 73 lines
-Chinmay
Quoted 70 lines
Quoted 70 lines
Thanks,
ChinmayQuoted 68 lines
Aboorva Devarajan (3):
target/ppc: Move vector merge instructions to decodetree target/ppc: Move vector pack instructions to decodetree target/ppc: Move GPR atomic load/store instructions to decodetreeAmit Machhiwal (2):
target/ppc: Move fixed-point Shift insns to decodetree target/ppc: Move fixed-point byte-reversal store insns to decodetreeMukesh Kumar Chaurasiya (IBM) (2):
target/ppc: convert slw,srw instruction via decode spec target/ppc: convert sraw[i] instruction via decode specNikhil Kumar Singh (3):
target/ppc: Migrate extswsli to decodetree target/ppc: Migrate atomic loads to decodetree target/ppc: Convert cache instructions to decodetreeOjaswin Mujoo (7):
target/ppc: Move isync instruction to decodetree. target/ppc: Convert b{a, l, la} to decode tree target/ppc: move various conditional branch insns to decodetree target/ppc: Fix TRANS* macro variadic arguments handling target/ppc: Move wait instruction to decodetree target/ppc: Move sleep & friends to decodetree target/ppc: Refactor sleep and its variants to use a common helperShivang Upadhyay (4):
target/ppc: Move Condition Register access instructions to decodetree. target/ppc: Move Condition Register logical instructions to decodetree.
target/ppc: Move Fixed-Point Load/Store String instructions to decodetree.
target/ppc: Move VMX integer arithmetic and BCD instructions to decodetree.Shivani Nittor (1):
target/ppc : Convert mcrf to decode treeTanushree Shah (2):
target/ppc: Move rlwimi, rlwinm instructions to decodetree target/ppc: Move lmw, stmw instructions to decodetreeUtkarsh Verma (1):
target/ppc: Move st{b, h, w, d, q}cx instructions to decodetreeVishal Chourasia (3):
target/ppc: Move mfmsr, mtmsr[d] instructions to decodetree target/ppc: Move byte-reverse instructions to decodetree target/ppc: Move system call and rfi instructions to decodetreetarget/ppc/helper.h | 100 +- target/ppc/insn32.decode | 244 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 18 +- target/ppc/tcg-excp_helper.c | 10 +- target/ppc/translate.c | 2592
++++-------------
target/ppc/translate/branch-impl.c.inc | 181 ++ target/ppc/translate/fixedpoint-impl.c.inc | 936 ++++++ target/ppc/translate/misc-impl.c.inc | 175 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 30 + target/ppc/translate/storage-ctrl-impl.c.inc | 117 + target/ppc/translate/vmx-impl.c.inc | 360 +-- target/ppc/translate/vmx-ops.c.inc | 41 -14 files changed, 2529 insertions(+), 2358 deletions(-)
Quoted 8 lines · Chinmay Rath
static bool
trans_LDAT(DisasContext *ctx, arg_LDAT *a)^I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).
Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?
Just ignore those.
r~
Quoted 6 lines · Richard Henderson
Quoted 5 lines · Chinmay Rath
static bool
trans_LDAT(DisasContext *ctx, arg_LDAT *a)^ I see this happening in the last pointer argument in function definitions after macros (like TRANS(..) in this case).
Quoted 7 lines
Quoted 3 lines
Richard, Peter, Stefan,
Could you please advise if it would be okay to have the above false positive in the patches ?Just ignore those.
r~
Alright. Thanks Richard !
-Chinmay