target/ppc: PPC TCG Improvements (decodetree migrations + ISA 2.07 flag updates)
v3 cover target/ppc: PPC TCG Improvements (decodetree migrations + ISA 2.07 flag updates)
This series primarily contains 3 changes :
1. PPC instructions movement to decodetree specification Changes from v2 :
- Addressed review comments from Amit, as discussed in the v2 series.
- Retained Rbs received.
2. PPC ISA 2.07 flag cleanup and updates
This series is based on top the above decodetree series.
- No changes. Only Rbs added.
3. Stepping up as an active maintainer for PowerPC TCG CPUs module.
Link to v2: https://lore.kernel.org/qemu-devel/[email protected]/
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
Chinmay Rath (9):
target/ppc: make do_ea_calc_ra available for 32 bit builds target/ppc: Replace PPC2_VSX207 flag with PPC2_ISA207 target/ppc: Use PPC2_ISA207 instead of PPC2_BCTAR_ISA207 target/ppc: Use PPC2_ISA207 instead of PPC2_LSQ_ISA207 target/ppc: Use PPC2_ISA207 instead of PPC2_ALTIVEC_207 target/ppc: Use PPC2_ISA207 instead of PPC2_ISA207S target/ppc: Reorder PPC2 flags
target/ppc: Add ICBT support for ISA version 2.07 target/ppc: Add self as maintainer for PowerPC TCG CPUs
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
MAINTAINERS | 2 +- hw/ppc/spapr_caps.c | 2 +- linux-user/ppc/elfload.c | 6 +- target/ppc/cpu.h | 38 +- target/ppc/cpu_init.c | 6 +- target/ppc/cpu_init.h | 7 +- target/ppc/helper.h | 96 +- target/ppc/insn32.decode | 252 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 14 +- target/ppc/tcg-excp_helper.c | 18 +- target/ppc/translate.c | 2258 +++-------------- target/ppc/translate/bhrb-impl.c.inc | 4 +- target/ppc/translate/branch-impl.c.inc | 182 +- target/ppc/translate/fixedpoint-impl.c.inc | 947 ++++++- target/ppc/translate/fp-impl.c.inc | 4 +- target/ppc/translate/misc-impl.c.inc | 172 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 39 +- target/ppc/translate/storage-ctrl-impl.c.inc | 116 + target/ppc/translate/vmx-impl.c.inc | 457 ++-- target/ppc/translate/vmx-ops.c.inc | 59 +- target/ppc/translate/vsx-impl.c.inc | 56 +- target/ppc/translate/vsx-ops.c.inc | 24 +- 24 files changed, 2473 insertions(+), 2369 deletions(-)
Signature · 1 line
2.55.0
PATCH v3 1/37 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.55.0
PATCH v3 2/37 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 | 118 +++++++++++++++++++-------------------- 2 files changed, 63 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 +56 -62
151 lines not on this page · raw message
Signature · 1 line
2.55.0
Re: [PATCH v3 02/37] target/ppc: Migrate atomic loads to decodetree
Hi Chinmay,
Thanks for addressing the reviews comments on v2 and sending the v3.
Quoted 161 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]>Reviewed-by Glenn Miles <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/insn32.decode | 7 +++ target/ppc/translate.c | 118 +++++++++++++++++++-------------------- 2 files changed, 63 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 +36
-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,62 @@ 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; +} + +TRANS_FLAGS2(ATOMIC_ISA206, LBARX, do_load_locked, DEF_MEMOP(MO_UB)) +TRANS_FLAGS2(ATOMIC_ISA206, LHARX, do_load_locked, DEF_MEMOP(MO_UW)) +TRANS(LWARX, do_load_locked, DEF_MEMOP(MO_UL)) +TRANS64(LDARX, do_load_locked, DEF_MEMOP(MO_UQ)) + +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;
target/ppc/translate.c static bool trans_EXTSWSLI(DisasContext *ctx, arg_XS *a) · line 5732
Quoted 10 lines
target/ppc/translate.c +10
-0+ } + +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 );
LGTM.
Quoted 35 lines
target/ppc/translate.c +10
-5+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 +5852,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 +5860,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), #endifSignature · 1 line
2.55.0
PATCH v3 3/37 target/ppc: Convert cache instructions to decodetree
In reply to Chinmay RathFrom: Nikhil Kumar Singh <[email protected]>
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
--- target/ppc/helper.h | 4 +- target/ppc/insn32.decode | 33 ++++ target/ppc/mem_helper.c | 4 +- target/ppc/translate.c | 409 ++++++++++++++++++++------------------- 4 files changed, 249 insertions(+), 201 deletions(-)
target/ppc/helper.h +2 -2
@@ -52,8 +52,8 @@ 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)#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 +33 -0
@@ -1306,6 +1306,39 @@ 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 + +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 +2 -2
@@ -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 +212 -197
435 lines not on this page · raw message
Signature · 1 line
2.55.0
Re: [PATCH v3 03/37] target/ppc: Convert cache instructions to decodetree
Quoted 33 lines · Chinmay Rath
From: Nikhil Kumar Singh <[email protected]>
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 viado_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 oflegal 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 operationsSigned-off-by Nikhil Kumar Singh <[email protected]>Tested-by Tasmiya Nalatwad <[email protected]>Reviewed-by Glenn Miles <[email protected]>Signed-off-by Chinmay Rath <[email protected]>
Quoted 6 lines
--- target/ppc/helper.h | 4 +- target/ppc/insn32.decode | 33 ++++ target/ppc/mem_helper.c | 4 +- target/ppc/translate.c | 409 ++++++++++++++++++++------------------- 4 files changed, 249 insertions(+), 201 deletions(-)
Chinmay, following up on your response on the v2 of this patch, I can see that DCBZL is not in ISA anywhere and it may be a right idea to drop it for now. But I also noticed that you have dropped the movement of DCBZ insn which is well defined in ISA.
Not sure if there was any blocker to have DCBZ retained but if you want to add via a follow up patch, that should be okay too. I'll leave that upto you. The current changes look fine to me.
Quoted 528 lines
target/ppc/helper.h +2
-2@@ -52,8 +52,8 @@ 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)#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 +33
-0@@ -1306,6 +1306,39 @@ 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 + +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 . . @XStarget/ppc/mem_helper.c +2
-2@@ -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 +212
-197@@ -4298,128 +4298,6 @@ static void gen_setb(DisasContext *ctx)/*** 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) {@@ -4448,64 +4326,6 @@ static void gen_dcbzep(DisasContext *ctx)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: */ @@ -5740,6 +5560,218 @@ 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) +{ +TCGv EA ; + +REQUIRE_INSNS_FLAGS2 (ctx,BOOKE206 ); + +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_DCBI (DisasContext *ctx,arg_X_ea *a) +{ +REQUIRE_INSNS_FLAGS (ctx,CACHE ); + +#if defined(CONFIG_USER_ONLY ) +gen_priv_opc (ctx); +return true; +#else +TCGv EA , val; + +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; +} +#include "translate/fixedpoint-impl.c.inc" #include "translate/fp-impl.c.inc" @@ -5904,25 +5936,8 @@ 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),Signature · 1 line
2.55.0
PATCH v3 4/37 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
@@ -173,12 +173,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.55.0
PATCH v3 5/37 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
@@ -249,19 +249,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.55.0
PATCH v3 6/37 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.55.0
PATCH v3 7/37 target/ppc: convert slw, srw instruction via decode spec
In reply to Chinmay RathFrom: "Mukesh Kumar Chaurasiya (IBM)" <[email protected]>
Move slw and srw to decodetree specification using the @X_rc format. The existing shift-masking logic from gen_slw/gen_srw is preserved verbatim in the new trans_SLW/trans_SRW handlers.
--- target/ppc/insn32.decode | 5 +++ target/ppc/translate.c | 49 ---------------------- target/ppc/translate/fixedpoint-impl.c.inc | 48 +++++++++++++++++++++ 3 files changed, 53 insertions(+), 49 deletions(-)
target/ppc/insn32.decode +5 -0
@@ -505,6 +505,11 @@ 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.55.0
PATCH v3 8/37 target/ppc: convert sraw[i] instruction via decode spec
In reply to Chinmay RathFrom: "Mukesh Kumar Chaurasiya (IBM)" <[email protected]>
Move sraw and srawi to decodetree specification using the @X_rc format. The existing shift-masking logic from gen_sraw/gen_srawi is preserved verbatim in the new trans_SRAW/trans_SRAWI handlers.
--- target/ppc/helper.h | 2 +- target/ppc/insn32.decode | 2 ++ target/ppc/int_helper.c | 2 +- target/ppc/translate.c | 42 ---------------------- target/ppc/translate/fixedpoint-impl.c.inc | 41 +++++++++++++++++++++ 5 files changed, 45 insertions(+), 44 deletions(-)
target/ppc/helper.h +1 -1
@@ -64,7 +64,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 +2 -0
@@ -509,6 +509,8 @@ HASHCHKP 011111 ..... ..... ..... 1010110010 . @X_DW SLW 011111 ..... ..... ..... 0000011000 . @X_rc SRW 011111 ..... ..... ..... 1000011000 . @X_rc +SRAW 011111 ..... ..... ..... 1100011000 . @X_rc +SRAWI 011111 ..... ..... ..... 1100111000 . @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.55.0
PATCH v3 9/37 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
@@ -1452,6 +1452,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) */
@@ -5709,7 +5703,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.55.0
PATCH v3 10/37 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 | 12 ++- target/ppc/int_helper.c | 2 +- target/ppc/translate.c | 96 ---------------------- target/ppc/translate/fixedpoint-impl.c.inc | 72 ++++++++++++++++ 5 files changed, 82 insertions(+), 102 deletions(-)
target/ppc/helper.h +1 -1
@@ -74,7 +74,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 +8 -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,13 @@ SRW 011111 ..... ..... ..... 1000011000 . @X_rc SRAW 011111 ..... ..... ..... 1100011000 . @X_rc SRAWI 011111 ..... ..... ..... 1100111000 . @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 ADDG6S 011111 ..... ..... ..... - 001001010 - @X
@@ -1379,9 +1386,6 @@ 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 - ## 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.55.0
PATCH v3 11/37 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_STX 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.55.0
PATCH v3 12/37 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 | 214 +++++++++++++++++++++ 3 files changed, 221 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 +214 -0
217 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH v3 13/37 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
@@ -1470,6 +1470,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) {
@@ -5364,7 +5350,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.55.0
PATCH v3 14/37 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
@@ -1486,6 +1486,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
@@ -197,13 +197,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
@@ -5353,7 +5330,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.55.0
PATCH v3 15/37 target/ppc: move various conditional branch insns to decodetree
In reply to Chinmay RathFrom: Ojaswin Mujoo <[email protected]>
Convert the following instructions 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 | 156 +++++++++++++++++++++++++ 3 files changed, 169 insertions(+), 148 deletions(-)
target/ppc/insn32.decode +13 -0
@@ -1493,6 +1493,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 +156 -0
159 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH v3 16/37 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
@@ -4749,29 +4749,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.55.0
PATCH v3 17/37 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 | 99 ++++++++++++++++++++ 3 files changed, 114 insertions(+), 91 deletions(-)
target/ppc/insn32.decode +15 -0
@@ -1478,6 +1478,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 +99 -0
102 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH v3 18/37 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 | 100 ++++++++++++++++++ 3 files changed, 108 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 +100 -0
103 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH v3 19/37 target/ppc: Refactor sleep and its variants to use a common helper
In reply to Chinmay RathFrom: Ojaswin Mujoo <[email protected]>
With sleep, doze, nap, rvwinkle and stop instructions moved to decodetree, the helper these instructions used : gen_helper_pminsn, should now be renamed to gen_helper_PMINSN, abiding by the decodetree standards. Do the same.
Also refactor their translation routine to use a common do_sleep routine since they share majority of the code.
--- target/ppc/helper.h | 2 +- target/ppc/tcg-excp_helper.c | 2 +- .../ppc/translate/processor-ctrl-impl.c.inc | 99 +++---------------- 3 files changed, 17 insertions(+), 86 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
@@ -459,7 +459,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 +15 -84
117 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH v3 20/37 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 | 78 ++++++++++++++++++++++ 3 files changed, 86 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 +78 -0
84 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH v3 21/37 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.55.0
PATCH v3 22/37 target/ppc: make do_ea_calc_ra available for 32 bit builds
In reply to Chinmay RathThere is no reason to keep do_ea_calc_ra exclusive to TARGET_PPC64. Make it available for PPC32 builds.
--- target/ppc/translate.c | 2 -- 1 file changed, 2 deletions(-)
target/ppc/translate.c +0 -2
@@ -2397,7 +2397,6 @@ static TCGv do_ea_calc(DisasContext *ctx, int ra, TCGv displ)return ea; } -#if defined(TARGET_PPC64 )/* EA <- (ra == 0) ? 0 : GPR[ra] */ static TCGv do_ea_calc_ra (DisasContext *ctx,int ra) {
@@ -2411,7 +2410,6 @@ static TCGv do_ea_calc_ra(DisasContext *ctx, int ra) }return EA ; } -#endif /*** Integer load ***/ #define DEF_MEMOP (op) ((op) | ctx->default_tcg_memop_mask)
Signature · 1 line
2.55.0
PATCH v3 23/37 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 | 102 +++++++++++++++++++++ 5 files changed, 115 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 +102 -0
108 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH v3 24/37 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 | 299 ++++++++++++---------------- target/ppc/translate/vmx-ops.c.inc | 22 -- 5 files changed, 199 insertions(+), 223 deletions(-)
target/ppc/helper.h +15 -15
@@ -349,21 +349,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.55.0
PATCH v3 25/37 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 | 102 ++++++++++++++++++++ 3 files changed, 108 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 +102 -0
108 lines not on this page · raw message
Signature · 1 line
2.55.0
Re: [PATCH v3 25/37] target/ppc: Move rlwimi, rlwinm instructions to decodetree
Quoted 16 lines · Chinmay Rath
From: 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
Quoted 8 lines
Signed-off-by Tanushree Shah <[email protected]>Reviewed-by Glenn Miles <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/insn32.decode | 6 ++ target/ppc/translate.c | 106 --------------------- target/ppc/translate/fixedpoint-impl.c.inc | 102 ++++++++++++++++++++ 3 files changed, 108 insertions(+), 106 deletions(-)
Quoted 265 lines
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 - @Xtarget/ppc/translate.c +0
-106@@ -2012,110 +2012,6 @@ static void gen_pause(DisasContext *ctx)/*** Integer rotate ***/ -/* rlwimi & rlwimi. */ -static void gen_rlwimi (DisasContext *ctx) -{ -TCGv t_ra = cpu_gpr[rA (ctx->opcode)]; -TCGv t_rs = cpu_gpr[rS (ctx->opcode)]; -uint32_t sh =SH (ctx->opcode); -uint32_t mb =MB (ctx->opcode); -uint32_t me =ME (ctx->opcode); - -if (sh == (31 - me) && mb <= me) { -tcg_gen_deposit_tl (t_ra, t_ra, t_rs, sh, me - mb +1 ); - }else { -target_ulong mask; -bool mask_in_32b = true; -TCGv t1; - -#if defined(TARGET_PPC64 ) - mb +=32 ; - me +=32 ; -#endif - mask =MASK (mb, me); - -#if defined(TARGET_PPC64 ) -if (mask >0xffffffffu ) { - mask_in_32b = false; - } -#endif - t1 =tcg_temp_new (); -if (mask_in_32b) { -TCGv_i32 t0 =tcg_temp_new_i32 (); -tcg_gen_trunc_tl_i32 (t0, t_rs); -tcg_gen_rotli_i32 (t0, t0, sh); -tcg_gen_extu_i32_tl (t1, t0); - }else { -#if defined(TARGET_PPC64 ) -tcg_gen_deposit_i64 (t1, t_rs, t_rs,32 ,32 ); -tcg_gen_rotli_i64 (t1, t1, sh); -#else -g_assert_not_reached (); -#endif - } - -tcg_gen_andi_tl (t1, t1, mask); -tcg_gen_andi_tl (t_ra, t_ra, ~mask); -tcg_gen_or_tl (t_ra, t_ra, t1); - } -if (unlikely (Rc (ctx->opcode) !=0 )) { -gen_set_Rc0 (ctx, t_ra); - } -} - -/* rlwinm & rlwinm. */ -static void gen_rlwinm (DisasContext *ctx) -{ -TCGv t_ra = cpu_gpr[rA (ctx->opcode)]; -TCGv t_rs = cpu_gpr[rS (ctx->opcode)]; -int sh =SH (ctx->opcode); -int mb =MB (ctx->opcode); -int me =ME (ctx->opcode); -int len = me - mb +1 ; -int rsh = (32 - sh) &31 ; - -if (sh !=0 && len >0 && me == (31 - sh)) { -tcg_gen_deposit_z_tl (t_ra, t_rs, sh, len); - }else if (me ==31 && rsh + len <=32 ) { -tcg_gen_extract_tl (t_ra, t_rs, rsh, len); - }else { -target_ulong mask; -bool mask_in_32b = true; -#if defined(TARGET_PPC64 ) - mb +=32 ; - me +=32 ; -#endif - mask =MASK (mb, me); -#if defined(TARGET_PPC64 ) -if (mask >0xffffffffu ) { - mask_in_32b = false; - } -#endif -if (mask_in_32b) { -if (sh ==0 ) { -tcg_gen_andi_tl (t_ra, t_rs, mask); - }else { -TCGv_i32 t0 =tcg_temp_new_i32 (); -tcg_gen_trunc_tl_i32 (t0, t_rs); -tcg_gen_rotli_i32 (t0, t0, sh); -tcg_gen_andi_i32 (t0, t0, mask); -tcg_gen_extu_i32_tl (t_ra, t0); - } - }else { -#if defined(TARGET_PPC64 ) -tcg_gen_deposit_i64 (t_ra, t_rs, t_rs,32 ,32 ); -tcg_gen_rotli_i64 (t_ra, t_ra, sh); -tcg_gen_andi_i64 (t_ra, t_ra, mask); -#else -g_assert_not_reached (); -#endif - } - } -if (unlikely (Rc (ctx->opcode) !=0 )) { -gen_set_Rc0 (ctx, t_ra); - } -} -/* rlwnm & rlwnm. */ static void gen_rlwnm (DisasContext *ctx) {@@ -4794,8 +4690,6 @@ GEN_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 ),GEN_HANDLER_E (paste,0x1F ,0x06 ,0x1C ,0x03C00000 ,PPC_NONE ,PPC2_ISA300 ), -GEN_HANDLER (rlwimi,0x14 ,0xFF ,0xFF ,0x00000000 ,PPC_INTEGER ), -GEN_HANDLER (rlwinm,0x15 ,0xFF ,0xFF ,0x00000000 ,PPC_INTEGER ),GEN_HANDLER (rlwnm,0x17 ,0xFF ,0xFF ,0x00000000 ,PPC_INTEGER ),/* handles lfdp, lxsd, lxssp */ GEN_HANDLER_E(dform39, 0x39, 0xFF, 0xFF, 0x00000000, PPC_NONE, PPC2_ISA205),target/ppc/translate/fixedpoint-impl.c.inc +102
-0@@ -1872,6 +1872,108 @@ static bool trans_SRAWI(DisasContext *ctx, arg_SRAWI *a) return true; } +static bool trans_RLWIMI(DisasContext *ctx, arg_RLWIMI *a) +{ + TCGv t_ra = cpu_gpr[a->ra]; + TCGv t_rs = cpu_gpr[a->rs]; + int mb = a->mb; + int me = a->me; + + if (a->sh == (31 - me) && mb <= me) { + tcg_gen_deposit_tl(t_ra, t_ra, t_rs, a->sh, me - mb + 1); + } else { + target_ulong mask; + bool mask_in_32b = true; + TCGv t1; + +#if defined(TARGET_PPC64) + mb += 32; + me += 32; +#endif + mask = MASK(mb, me); + +#if defined(TARGET_PPC64) + if (mask > 0xffffffffu) { + mask_in_32b = false; + } +#endif + t1 = tcg_temp_new(); + if (mask_in_32b) { + TCGv_i32 t0 = tcg_temp_new_i32(); + tcg_gen_trunc_tl_i32(t0, t_rs); + tcg_gen_rotli_i32(t0, t0, a->sh); + tcg_gen_extu_i32_tl(t1, t0); + } else { +#if defined(TARGET_PPC64) + tcg_gen_deposit_i64(t1, t_rs, t_rs, 32, 32); + tcg_gen_rotli_i64(t1, t1, a->sh); +#else + g_assert_not_reached(); +#endif + } + + tcg_gen_andi_tl(t1, t1, mask); + tcg_gen_andi_tl(t_ra, t_ra, ~mask); + tcg_gen_or_tl(t_ra, t_ra, t1); + } + if (unlikely(a->rc)) { + gen_set_Rc0(ctx, t_ra); + } + return true; +} + +static bool trans_RLWINM(DisasContext *ctx, arg_RLWINM *a) +{ + TCGv t_ra = cpu_gpr[a->ra]; + TCGv t_rs = cpu_gpr[a->rs]; + int me = a->me; + int mb = a->mb; + int len = me - mb + 1; + int rsh = (32 - a->sh) & 31; + + if (a->sh != 0 && len > 0 && me == (31 - a->sh)) { + tcg_gen_deposit_z_tl(t_ra, t_rs, a->sh, len); + } else if (me == 31 && rsh + len <= 32) { + tcg_gen_extract_tl(t_ra, t_rs, rsh, len); + } else { + target_ulong mask; + bool mask_in_32b = true; +#if defined(TARGET_PPC64) + mb += 32; + me += 32; +#endif + mask = MASK(mb, me); +#if defined(TARGET_PPC64) + if (mask > 0xffffffffu) { + mask_in_32b = false; + } +#endif + if (mask_in_32b) { + if (a->sh == 0) { + tcg_gen_andi_tl(t_ra, t_rs, mask); + } else { + TCGv_i32 t0 = tcg_temp_new_i32(); + tcg_gen_trunc_tl_i32(t0, t_rs); + tcg_gen_rotli_i32(t0, t0, a->sh); + tcg_gen_andi_i32(t0, t0, mask); + tcg_gen_extu_i32_tl(t_ra, t0); + } + } else { +#if defined(TARGET_PPC64) + tcg_gen_deposit_i64(t_ra, t_rs, t_rs, 32, 32); + tcg_gen_rotli_i64(t_ra, t_ra, a->sh); + tcg_gen_andi_i64(t_ra, t_ra, mask); +#else + g_assert_not_reached(); +#endif + } + } + if (unlikely(a->rc)) { + gen_set_Rc0(ctx, t_ra); + } + return true; +} + static void do_fetch_inc_conditional(DisasContext *ctx, MemOp memop, TCGv EA, int rt, TCGCond cond, int addend)Signature · 1 line
2.55.0
PATCH v3 26/37 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
@@ -2455,43 +2455,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) {
@@ -4695,8 +4658,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.55.0
PATCH v3 27/37 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.55.0
PATCH v3 28/37 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 | 48 ++++++++++++++++++++++ 3 files changed, 53 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
@@ -4519,42 +4519,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 +48 -0
54 lines not on this page · raw message
Signature · 1 line
2.55.0
Re: [PATCH v3 28/37] target/ppc: Move byte-reverse instructions to decodetree
Quoted 12 lines · Chinmay Rath
From: Vishal Chourasia <[email protected]>
Moving the following instructions to decodetree specification:
brd, brw, brh : 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,opflag.This also includes improvements from review feedback:
- AddTARGET_PPC64guards withqemu_build_not_reached()for 32-bit builds
Quoted 8 lines
Signed-off-by Vishal Chourasia <[email protected]>Reviewed-by Glenn Miles <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- target/ppc/insn32.decode | 5 +++ target/ppc/translate.c | 35 ---------------- target/ppc/translate/fixedpoint-impl.c.inc | 48 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 35 deletions(-)
Thanks for incorporating the review comments.
Quoted 126 lines
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 ..... ..... ................ @Dtarget/ppc/translate.c +0
-35@@ -4519,42 +4519,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 +48
-0@@ -17,6 +17,54 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +/* + * Byte-Reverse Instructions + */ +static bool trans_BRD(DisasContext *ctx, arg_BRD *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS2(ctx, ISA310); +#if defined(TARGET_PPC64) + tcg_gen_bswap64_i64(cpu_gpr[a->ra], cpu_gpr[a->rs]); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_BRW(DisasContext *ctx, arg_BRW *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS2(ctx, ISA310); +#if defined(TARGET_PPC64) + 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); +#else + qemu_build_not_reached(); +#endif + return true; +} + +static bool trans_BRH(DisasContext *ctx, arg_BRH *a) +{ + REQUIRE_64BIT(ctx); + REQUIRE_INSNS_FLAGS2(ctx, ISA310); +#if defined(TARGET_PPC64) + 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); +#else + qemu_build_not_reached(); +#endif + return true; +} + /* * Fixed-Point Load/Store Instructions */Signature · 1 line
2.55.0
PATCH v3 29/37 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 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
- 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 | 126 ++------------------------- target/ppc/translate/misc-impl.c.inc | 102 ++++++++++++++++++++++ 5 files changed, 128 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
@@ -528,13 +528,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
@@ -545,12 +545,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 +102 -0
105 lines not on this page · raw message
Signature · 1 line
2.55.0
Re: [PATCH v3 29/37] target/ppc: Move system call and rfi instructions to decodetree
Quoted 240 lines · Chinmay Rath
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
- AddTRANS64_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
- ConsolidateCONFIG_USER_ONLYguards into single blockSigned-off-by Vishal Chourasia <[email protected]>Reviewed-by Glenn Miles <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- 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 | 102 ++++++++++++++++++++++ 5 files changed, 128 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_satarget/ppc/tcg-excp_helper.c +4
-4@@ -528,13 +528,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 @@ -545,12 +545,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 +0
-104@@ -2679,110 +2679,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) */
target/ppc/translate.c static int64_t dw_compose_ea(DisasContext *ctx, int x) · line 4055
Quoted 5 lines
target/ppc/translate.c +2
-0@@ -4155,6 +4051,13 @@ static int64_t dw_compose_ea(DisasContext *ctx, int x)#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) \
Nit: Similar to what I mentioned below.
Quoted 35 lines
target/ppc/translate.c +5
-15+ { \ +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) \ { \@@ -4529,21 +4432,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), -#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), -#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 +0
-0
target/ppc/translate/misc-impl.c.inc static bool do_mtmsr(DisasContext *ctx, arg_X_rs_l *a, bool is_mtmsrd) · line 233
Quoted 9 lines
target/ppc/translate/misc-impl.c.inc +6
-0@@ -225,3 +225,105 @@ 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)
Nit: space before a — should be arg_SC *a per QEMU coding style (pointer attached to the type, not the variable name). This was present in v2 and wasn't caught earlier.
Quoted 37 lines
target/ppc/translate/misc-impl.c.inc +37
-0+{ + 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_KIND_RFI = 0, + RFI_KIND_RFID = 1, + RFI_KIND_HRFID = 2, + RFI_KIND_RFSCV = 3, +};
target/ppc/translate/misc-impl.c.inc static bool do_mtmsr(DisasContext *ctx, arg_X_rs_l *a, bool is_mtmsrd) · line 280
Quoted 10 lines
target/ppc/translate/misc-impl.c.inc +10
-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) {
On the broader design point I raised in v2 — preferring four separate translators over the consolidated do_rfi(kind) approach: I still think separate translators would be structurally cleaner. The RFI family has genuinely distinct privilege semantics (REQUIRE_SV vs REQUIRE_HV), a is_book3s_arch2x check for one variant only, and the BHRB omission for HRFID — all of which require guards that must be remembered to apply correctly when the function is modified in future.
That said, the RFI_KIND_HRFID guard is correctly in place in v3, and I am okay with this approach if you prefer to keep it. The key correctness issue is resolved.
With the two pointer-spacing nits fixed (@Harsh, if there's no respin, could you please take care of this while applying the patch?):
Quoted 52 lines
target/ppc/translate/misc-impl.c.inc +49
-0+ case RFI_KIND_RFI: + if (is_book3s_arch2x(ctx)) { + gen_invalid(ctx); + return true; + } + REQUIRE_SV(ctx); + helper = gen_helper_RFI; + break; +#if defined(TARGET_PPC64) + case RFI_KIND_HRFID: + REQUIRE_HV(ctx); + helper = gen_helper_HRFID; + break; + case RFI_KIND_RFID: + REQUIRE_SV(ctx); + helper = gen_helper_RFID; + break; + case RFI_KIND_RFSCV: + REQUIRE_SV(ctx); + helper = gen_helper_RFSCV; + break; +#endif + default: + gen_invalid(ctx); + return true; + } + + translator_io_start(&ctx->base); + if (kind != RFI_KIND_HRFID) { + 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) +#else +TRANS_FLAGS(FLOW, SC, do_SC, POWERPC_EXCP_SYSCALL) +#endif + +TRANS64_FLAGS2(ISA300, SCV, do_SCV) + +TRANS_FLAGS(FLOW, RFI, do_rfi, RFI_KIND_RFI) +TRANS64(RFID, do_rfi, RFI_KIND_RFID) +TRANS64_FLAGS(64H, HRFID, do_rfi, RFI_KIND_HRFID) +TRANS64_FLAGS2(ISA300, RFSCV, do_rfi, RFI_KIND_RFSCV)Signature · 1 line
2.55.0
Re: [PATCH v3 29/37] target/ppc: Move system call and rfi instructions to decodetree
Quoted 338 lines · Amit Machhiwal
Quoted 240 lines · Chinmay Rath
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
- AddTRANS64_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
- ConsolidateCONFIG_USER_ONLYguards into single blockSigned-off-by Vishal Chourasia <[email protected]>Reviewed-by Glenn Miles <[email protected]>Signed-off-by Chinmay Rath <[email protected]>--- 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 | 102 ++++++++++++++++++++++ 5 files changed, 128 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_satarget/ppc/tcg-excp_helper.c +4
-4@@ -528,13 +528,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 @@ -545,12 +545,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 +0
-104@@ -2679,110 +2679,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) */ target/ppc/translate.c static int64_t dw_compose_ea(DisasContext *ctx, int x) · line 4055
Quoted 5 lines
target/ppc/translate.c +2
-0@@ -4155,6 +4051,13 @@ static int64_t dw_compose_ea(DisasContext *ctx, int x)#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) \Nit: Similar to what I mentioned below.
Quoted 35 lines
target/ppc/translate.c +5
-15+ { \ +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) \ { \@@ -4529,21 +4432,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), -#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), -#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 +0
-0target/ppc/translate/misc-impl.c.inc static bool do_mtmsr(DisasContext *ctx, arg_X_rs_l *a, bool is_mtmsrd) · line 233
Quoted 9 lines
target/ppc/translate/misc-impl.c.inc +6
-0@@ -225,3 +225,105 @@ 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)Nit: space before a — should be
arg_SC*a per QEMU coding style (pointer attached to the type, not the variable name). This was present in v2 and wasn't caught earlier.Quoted 42 lines
target/ppc/translate/misc-impl.c.inc +42
-0+{ + 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_KIND_RFI = 0, + RFI_KIND_RFID = 1, + RFI_KIND_HRFID = 2, + RFI_KIND_RFSCV = 3, +}; + +static bool do_rfi(DisasContext *ctx, arg_RFID *a, int kind) +{ +#if defined(CONFIG_USER_ONLY) + gen_priv_opc(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 280
Quoted 5 lines
target/ppc/translate/misc-impl.c.inc +5
-0+ return true; +#else + void (*helper)(TCGv_ptr); + + switch (kind) {On the broader design point I raised in v2 — preferring four separate translators over the consolidated
do_rfi(kind)approach: I still think separate translators would be structurally cleaner. The RFI family has
I agree as well. I will post a follow up patch with your "Suggested-by".
Regards,
Chinmay
Quoted 66 lines
genuinely distinct privilege semantics (
REQUIRE_SVvsREQUIRE_HV), ais_book3s_arch2xcheck for one variant only, and the BHRB omission for HRFID — all of which require guards that must be remembered to apply correctly when the function is modified in future.That said, the
RFI_KIND_HRFIDguard is correctly in place in v3, and I am okay with this approach if you prefer to keep it. The key correctness issue is resolved.With the two pointer-spacing nits fixed (@Harsh, if there's no respin, could you please take care of this while applying the patch?):
Reviewed-by Amit Machhiwal <[email protected]>Quoted 52 lines
target/ppc/translate/misc-impl.c.inc +49
-0+ case RFI_KIND_RFI: + if (is_book3s_arch2x(ctx)) { + gen_invalid(ctx); + return true; + } + REQUIRE_SV(ctx); + helper = gen_helper_RFI; + break; +#if defined(TARGET_PPC64) + case RFI_KIND_HRFID: + REQUIRE_HV(ctx); + helper = gen_helper_HRFID; + break; + case RFI_KIND_RFID: + REQUIRE_SV(ctx); + helper = gen_helper_RFID; + break; + case RFI_KIND_RFSCV: + REQUIRE_SV(ctx); + helper = gen_helper_RFSCV; + break; +#endif + default: + gen_invalid(ctx); + return true; + } + + translator_io_start(&ctx->base); + if (kind != RFI_KIND_HRFID) { + 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) +#else +TRANS_FLAGS(FLOW, SC, do_SC, POWERPC_EXCP_SYSCALL) +#endif + +TRANS64_FLAGS2(ISA300, SCV, do_SCV) + +TRANS_FLAGS(FLOW, RFI, do_rfi, RFI_KIND_RFI) +TRANS64(RFID, do_rfi, RFI_KIND_RFID) +TRANS64_FLAGS(64H, HRFID, do_rfi, RFI_KIND_HRFID) +TRANS64_FLAGS2(ISA300, RFSCV, do_rfi, RFI_KIND_RFSCV)Signature · 1 line
2.55.0
PATCH v3 30/37 target/ppc: Replace PPC2_VSX207 flag with PPC2_ISA207
In reply to Chinmay RathThere are several flags for Power ISA 2.07 currently in use, namely :PPC2_VSX207, PPC2_BCTAR_ISA207, PPC2_LSQ_ISA207, etc, but most of them are used together without any individual use.
Create a generic ISA 2.07 flag and switch usage of PPC2_VSX207 to it instead. Next commits would consolidate the remaining flags.
--- target/ppc/cpu.h | 6 ++-- target/ppc/cpu_init.c | 2 +- target/ppc/cpu_init.h | 2 +- target/ppc/translate/fp-impl.c.inc | 4 +-- target/ppc/translate/vsx-impl.c.inc | 56 ++++++++++++++--------------- target/ppc/translate/vsx-ops.c.inc | 24 ++++++------- 6 files changed, 47 insertions(+), 47 deletions(-)
target/ppc/cpu.h +3 -3
@@ -2565,8 +2565,8 @@ enum {PPC2_DBRX =0x0000000000000010ULL ,/* Book I 2.05 PowerPC specification */ PPC2_ISA205 =0x0000000000000020ULL , -/* VSX additions in ISA 2.07 */ -PPC2_VSX207 =0x0000000000000040ULL , +/* POWER ISA 2.07 */ +PPC2_ISA207 =0x0000000000000040ULL ,/* ISA 2.06B bpermd */ PPC2_PERM_ISA206 = 0x0000000000000080ULL,/* ISA 2.06B divide extended variants */
@@ -2607,7 +2607,7 @@ enum { PPC2_PPE42XM = 0x0000000002000000ULL,#define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ - PPC2_ISA205 | PPC2_VSX207 | PPC2_PERM_ISA206 | \ + PPC2_ISA205 | PPC2_ISA207 | PPC2_PERM_ISA206 | \ PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \ PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | \
target/ppc/cpu_init.c +1 -1
@@ -6346,7 +6346,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, const void *data)PPC_SEGMENT_64B |PPC_SLBI |PPC_POPCNTB |PPC_POPCNTWD |PPC_CILDST ; - pcc->insns_flags2 =PPC2_VSX |PPC2_VSX207 |PPC2_DFP |PPC2_DBRX | + pcc->insns_flags2 =PPC2_VSX |PPC2_ISA207 |PPC2_DFP |PPC2_DBRX |PPC2_PERM_ISA206 |PPC2_DIVE_ISA206 |PPC2_ATOMIC_ISA206 |PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 |
target/ppc/cpu_init.h +1 -1
@@ -15,7 +15,7 @@#define PPC_INSNS_FLAGS_POWER11 PPC_INSNS_FLAGS_POWER10#define PPC_INSNS_FLAGS2_POWER_COMMON \ - (PPC2_VSX | PPC2_VSX207 | PPC2_DFP | PPC2_DBRX | \ + (PPC2_VSX | PPC2_ISA207 | PPC2_DFP | PPC2_DBRX | \ PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | \ PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | PPC2_ISA205 | \
target/ppc/translate/fp-impl.c.inc +2 -2
@@ -342,7 +342,7 @@ static bool trans_FCPSGN(DisasContext *ctx, arg_FCPSGN *a) static bool trans_FMRGEW(DisasContext *ctx, arg_FMRGEW *a) { TCGv_i64 t0, t1, t2; - REQUIRE_INSNS_FLAGS2(ctx, VSX207); + REQUIRE_INSNS_FLAGS2(ctx, ISA207); REQUIRE_FPU(ctx); t0 = tcg_temp_new_i64(); t1 = tcg_temp_new_i64();
@@ -358,7 +358,7 @@ static bool trans_FMRGEW(DisasContext *ctx, arg_FMRGEW *a) static bool trans_FMRGOW(DisasContext *ctx, arg_FMRGOW *a) { TCGv_i64 t0, t1, t2; - REQUIRE_INSNS_FLAGS2(ctx, VSX207); + REQUIRE_INSNS_FLAGS2(ctx, ISA207); REQUIRE_FPU(ctx); t0 = tcg_temp_new_i64(); t1 = tcg_temp_new_i64();
target/ppc/translate/vsx-impl.c.inc +28 -28
110 lines not on this page · raw message
target/ppc/translate/vsx-ops.c.inc +12 -12
@@ -1,9 +1,9 @@ -GEN_HANDLER_E(mfvsrwz, 0x1F, 0x13, 0x03, 0x0000F800, PPC_NONE, PPC2_VSX207), -GEN_HANDLER_E(mtvsrwa, 0x1F, 0x13, 0x06, 0x0000F800, PPC_NONE, PPC2_VSX207), -GEN_HANDLER_E(mtvsrwz, 0x1F, 0x13, 0x07, 0x0000F800, PPC_NONE, PPC2_VSX207), +GEN_HANDLER_E(mfvsrwz, 0x1F, 0x13, 0x03, 0x0000F800, PPC_NONE, PPC2_ISA207), +GEN_HANDLER_E(mtvsrwa, 0x1F, 0x13, 0x06, 0x0000F800, PPC_NONE, PPC2_ISA207), +GEN_HANDLER_E(mtvsrwz, 0x1F, 0x13, 0x07, 0x0000F800, PPC_NONE, PPC2_ISA207), #if defined(TARGET_PPC64) -GEN_HANDLER_E(mfvsrd, 0x1F, 0x13, 0x01, 0x0000F800, PPC_NONE, PPC2_VSX207), -GEN_HANDLER_E(mtvsrd, 0x1F, 0x13, 0x05, 0x0000F800, PPC_NONE, PPC2_VSX207), +GEN_HANDLER_E(mfvsrd, 0x1F, 0x13, 0x01, 0x0000F800, PPC_NONE, PPC2_ISA207), +GEN_HANDLER_E(mtvsrd, 0x1F, 0x13, 0x05, 0x0000F800, PPC_NONE, PPC2_ISA207), GEN_HANDLER_E(mfvsrld, 0X1F, 0x13, 0x09, 0x0000F800, PPC_NONE, PPC2_ISA300), GEN_HANDLER_E(mtvsrdd, 0X1F, 0x13, 0x0D, 0x0, PPC_NONE, PPC2_ISA300), GEN_HANDLER_E(mtvsrws, 0x1F, 0x13, 0x0C, 0x0000F800, PPC_NONE, PPC2_ISA300),
@@ -127,7 +127,7 @@ GEN_VSX_XFORM_300(xscmpoqp, 0x04, 0x04, 0x00600001), GEN_VSX_XFORM_300(xscmpuqp, 0x04, 0x14, 0x00600001), GEN_XX2FORM_EO(xscvdphp, 0x16, 0x15, 0x11, PPC2_ISA300), GEN_XX2FORM(xscvdpsp, 0x12, 0x10, PPC2_VSX), -GEN_XX2FORM(xscvdpspn, 0x16, 0x10, PPC2_VSX207), +GEN_XX2FORM(xscvdpspn, 0x16, 0x10, PPC2_ISA207), GEN_XX2FORM_EO(xscvhpdp, 0x16, 0x15, 0x10, PPC2_ISA300), GEN_VSX_XFORM_300_EO(xscvsdqp, 0x04, 0x1A, 0x0A, 0x00000001), GEN_XX2FORM(xscvspdp, 0x12, 0x14, PPC2_VSX),
@@ -145,12 +145,12 @@ GEN_XX2FORM(xsrdpip, 0x12, 0x06, PPC2_VSX), GEN_XX2FORM(xsrdpiz, 0x12, 0x05, PPC2_VSX), GEN_VSX_XFORM_300(xsdivqp, 0x04, 0x11, 0x0), -GEN_XX2FORM(xsresp, 0x14, 0x01, PPC2_VSX207), -GEN_XX2FORM(xsrsp, 0x12, 0x11, PPC2_VSX207), -GEN_XX2FORM(xssqrtsp, 0x16, 0x00, PPC2_VSX207), -GEN_XX2FORM(xsrsqrtesp, 0x14, 0x00, PPC2_VSX207), -GEN_XX2FORM(xscvsxdsp, 0x10, 0x13, PPC2_VSX207), -GEN_XX2FORM(xscvuxdsp, 0x10, 0x12, PPC2_VSX207), +GEN_XX2FORM(xsresp, 0x14, 0x01, PPC2_ISA207), +GEN_XX2FORM(xsrsp, 0x12, 0x11, PPC2_ISA207), +GEN_XX2FORM(xssqrtsp, 0x16, 0x00, PPC2_ISA207), +GEN_XX2FORM(xsrsqrtesp, 0x14, 0x00, PPC2_ISA207), +GEN_XX2FORM(xscvsxdsp, 0x10, 0x13, PPC2_ISA207), +GEN_XX2FORM(xscvuxdsp, 0x10, 0x12, PPC2_ISA207), GEN_XX2FORM(xvredp, 0x14, 0x0D, PPC2_VSX), GEN_XX2FORM(xvsqrtdp, 0x16, 0x0C, PPC2_VSX),
Signature · 1 line
2.55.0
PATCH v3 31/37 target/ppc: Use PPC2_ISA207 instead of PPC2_BCTAR_ISA207
In reply to Chinmay RathPPC2_BCTAR_ISA207 is only ever set in the CPUPPCState's insns_flags2 alongside PPC2_ISA207. Checks made by PPC2_BCTAR_ISA207 could be replaced with PPC2_ISA207, hence rendering it useless and apt for removal. This patch does the same.
--- linux-user/ppc/elfload.c | 7 +++---- target/ppc/cpu.h | 4 +--- target/ppc/cpu_init.c | 2 +- target/ppc/cpu_init.h | 2 +- target/ppc/translate/branch-impl.c.inc | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-)
linux-user/ppc/elfload.c +3 -4
@@ -116,10 +116,9 @@ abi_ulong get_elf_hwcap2(CPUState *cs) do { if (cpu->env.insns_flags2 & flag) { features |= feature; } } while (0)GET_FEATURE (PPC_ISEL ,QEMU_PPC_FEATURE2_HAS_ISEL ); -GET_FEATURE2 (PPC2_BCTAR_ISA207 ,QEMU_PPC_FEATURE2_HAS_TAR ); -GET_FEATURE2 ((PPC2_BCTAR_ISA207 |PPC2_LSQ_ISA207 |PPC2_ALTIVEC_207 | -PPC2_ISA207S ),QEMU_PPC_FEATURE2_ARCH_2_07 | -QEMU_PPC_FEATURE2_VEC_CRYPTO ); +GET_FEATURE2 ((PPC2_ISA207 |PPC2_LSQ_ISA207 |PPC2_ALTIVEC_207 | +PPC2_ISA207S ), (QEMU_PPC_FEATURE2_ARCH_2_07 | +QEMU_PPC_FEATURE2_VEC_CRYPTO |QEMU_PPC_FEATURE2_HAS_TAR ));GET_FEATURE2 (PPC2_ISA300 ,QEMU_PPC_FEATURE2_ARCH_3_00 |QEMU_PPC_FEATURE2_DARN |QEMU_PPC_FEATURE2_HAS_IEEE128 ); GET_FEATURE2(PPC2_ISA310, QEMU_PPC_FEATURE2_ARCH_3_1 |
target/ppc/cpu.h +1 -3
@@ -2577,8 +2577,6 @@ enum {PPC2_FP_CVT_ISA206 =0x0000000000000400ULL ,/* ISA 2.06B floating point test instructions */ PPC2_FP_TST_ISA206 =0x0000000000000800ULL , -/* ISA 2.07 bctar instruction */ -PPC2_BCTAR_ISA207 =0x0000000000001000ULL ,/* ISA 2.07 load/store quadword */ PPC2_LSQ_ISA207 = 0x0000000000002000ULL,/* ISA 2.07 Altivec */
@@ -2610,7 +2608,7 @@ enum {PPC2_ISA205 |PPC2_ISA207 |PPC2_PERM_ISA206 | \PPC2_DIVE_ISA206 |PPC2_ATOMIC_ISA206 | \PPC2_FP_CVT_ISA206 |PPC2_FP_TST_ISA206 | \ -PPC2_BCTAR_ISA207 |PPC2_LSQ_ISA207 | \ +PPC2_LSQ_ISA207 | \PPC2_ALTIVEC_207 |PPC2_ISA207S |PPC2_DFP | \PPC2_FP_CVT_S64 |PPC2_TM |PPC2_PM_ISA206 | \ PPC2_ISA300 | PPC2_ISA310 | PPC2_MEM_LWSYNC | \
target/ppc/cpu_init.c +1 -1
@@ -6349,7 +6349,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, const void *data) pcc->insns_flags2 =PPC2_VSX |PPC2_ISA207 |PPC2_DFP |PPC2_DBRX |PPC2_PERM_ISA206 |PPC2_DIVE_ISA206 |PPC2_ATOMIC_ISA206 |PPC2_FP_CVT_ISA206 | -PPC2_FP_TST_ISA206 |PPC2_BCTAR_ISA207 | +PPC2_FP_TST_ISA206 |PPC2_LSQ_ISA207 |PPC2_ALTIVEC_207 |PPC2_ISA205 |PPC2_ISA207S |PPC2_FP_CVT_S64 | PPC2_TM | PPC2_PM_ISA206 | PPC2_MEM_LWSYNC |
target/ppc/cpu_init.h +1 -1
@@ -17,7 +17,7 @@#define PPC_INSNS_FLAGS2_POWER_COMMON \ (PPC2_VSX | PPC2_ISA207 | PPC2_DFP | PPC2_DBRX | \ PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ - PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | \ + PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \ PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | PPC2_ISA205 | \ PPC2_ISA207S | PPC2_FP_CVT_S64 | PPC2_ISA300 | PPC2_PRCNTL | \ PPC2_MEM_LWSYNC | PPC2_BCDA_ISA206)
target/ppc/translate/branch-impl.c.inc +1 -1
@@ -210,4 +210,4 @@ static bool bclr_helper(DisasContext *ctx, arg_bclr *a, int type) TRANS(BCLR, bclr_helper, BCOND_LR) TRANS(BCCTR, bclr_helper, BCOND_CTR) -TRANS_FLAGS2(BCTAR_ISA207, BCTAR, bclr_helper, BCOND_TAR) +TRANS_FLAGS2(ISA207, BCTAR, bclr_helper, BCOND_TAR)
Signature · 1 line
2.55.0
PATCH v3 32/37 target/ppc: Use PPC2_ISA207 instead of PPC2_LSQ_ISA207
In reply to Chinmay RathPPC2_LSQ_ISA207 is only ever set in the CPUPPCState's insns_flags2 alongside PPC2_ISA207. Checks made by PPC2_LSQ_ISA207 could be replaced with PPC2_ISA207, hence rendering it useless and apt for removal. This patch does the same.
--- linux-user/ppc/elfload.c | 2 +- target/ppc/cpu.h | 3 --- target/ppc/cpu_init.c | 3 +-- target/ppc/cpu_init.h | 2 +- target/ppc/translate/fixedpoint-impl.c.inc | 4 ++-- 5 files changed, 5 insertions(+), 9 deletions(-)
linux-user/ppc/elfload.c +1 -1
@@ -116,7 +116,7 @@ abi_ulong get_elf_hwcap2(CPUState *cs) do { if (cpu->env.insns_flags2 & flag) { features |= feature; } } while (0)GET_FEATURE (PPC_ISEL ,QEMU_PPC_FEATURE2_HAS_ISEL ); -GET_FEATURE2 ((PPC2_ISA207 |PPC2_LSQ_ISA207 |PPC2_ALTIVEC_207 | +GET_FEATURE2 ((PPC2_ISA207 |PPC2_ALTIVEC_207 |PPC2_ISA207S ), (QEMU_PPC_FEATURE2_ARCH_2_07 |QEMU_PPC_FEATURE2_VEC_CRYPTO |QEMU_PPC_FEATURE2_HAS_TAR )); GET_FEATURE2(PPC2_ISA300, QEMU_PPC_FEATURE2_ARCH_3_00 |
target/ppc/cpu.h +0 -3
@@ -2577,8 +2577,6 @@ enum {PPC2_FP_CVT_ISA206 =0x0000000000000400ULL ,/* ISA 2.06B floating point test instructions */ PPC2_FP_TST_ISA206 =0x0000000000000800ULL , -/* ISA 2.07 load/store quadword */ -PPC2_LSQ_ISA207 =0x0000000000002000ULL ,/* ISA 2.07 Altivec */ PPC2_ALTIVEC_207 = 0x0000000000004000ULL,/* PowerISA 2.07 Book3s specification */
@@ -2608,7 +2606,6 @@ enum {PPC2_ISA205 |PPC2_ISA207 |PPC2_PERM_ISA206 | \PPC2_DIVE_ISA206 |PPC2_ATOMIC_ISA206 | \PPC2_FP_CVT_ISA206 |PPC2_FP_TST_ISA206 | \ -PPC2_LSQ_ISA207 | \PPC2_ALTIVEC_207 |PPC2_ISA207S |PPC2_DFP | \PPC2_FP_CVT_S64 |PPC2_TM |PPC2_PM_ISA206 | \ PPC2_ISA300 | PPC2_ISA310 | PPC2_MEM_LWSYNC | \
target/ppc/cpu_init.c +1 -2
@@ -6349,8 +6349,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, const void *data) pcc->insns_flags2 =PPC2_VSX |PPC2_ISA207 |PPC2_DFP |PPC2_DBRX |PPC2_PERM_ISA206 |PPC2_DIVE_ISA206 |PPC2_ATOMIC_ISA206 |PPC2_FP_CVT_ISA206 | -PPC2_FP_TST_ISA206 | -PPC2_LSQ_ISA207 |PPC2_ALTIVEC_207 | +PPC2_FP_TST_ISA206 |PPC2_ALTIVEC_207 |PPC2_ISA205 |PPC2_ISA207S |PPC2_FP_CVT_S64 |PPC2_TM |PPC2_PM_ISA206 |PPC2_MEM_LWSYNC |PPC2_BCDA_ISA206 ;
target/ppc/cpu_init.h +1 -1
@@ -18,7 +18,7 @@ (PPC2_VSX |PPC2_ISA207 |PPC2_DFP |PPC2_DBRX | \PPC2_PERM_ISA206 |PPC2_DIVE_ISA206 |PPC2_ATOMIC_ISA206 | \PPC2_FP_CVT_ISA206 |PPC2_FP_TST_ISA206 | \ -PPC2_LSQ_ISA207 |PPC2_ALTIVEC_207 |PPC2_ISA205 | \ +PPC2_ALTIVEC_207 |PPC2_ISA205 | \PPC2_ISA207S |PPC2_FP_CVT_S64 |PPC2_ISA300 |PPC2_PRCNTL | \PPC2_MEM_LWSYNC |PPC2_BCDA_ISA206 )
target/ppc/translate/fixedpoint-impl.c.inc +2 -2
@@ -124,7 +124,7 @@ static bool do_ldst_quad(DisasContext *ctx, arg_D *a, bool store, bool prefixed) REQUIRE_INSNS_FLAGS(ctx, 64BX); - if (!prefixed && !(ctx->insns_flags2 & PPC2_LSQ_ISA207)) { + if (!prefixed && !(ctx->insns_flags2 & PPC2_ISA207)) { /* lq and stq were privileged prior to V. 2.07 */ REQUIRE_SV(ctx);
@@ -288,7 +288,7 @@ 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); + REQUIRE_INSNS_FLAGS2(ctx, ISA207); #if defined(TARGET_PPC64) TCGLabel *lfail = gen_new_label(); TCGv ea = do_ea_calc(ctx, a->ra, cpu_gpr[a->rb]);
Signature · 1 line
2.55.0
PATCH v3 33/37 target/ppc: Use PPC2_ISA207 instead of PPC2_ALTIVEC_207
In reply to Chinmay RathPPC2_ALTIVEC_207 is only ever set in the CPUPPCState's insns_flags2 alongside PPC2_ISA207. Checks made by PPC2_ALTIVEC_207 could be replaced with PPC2_ISA207, hence rendering it useless and apt for removal. This patch does the same.
--- linux-user/ppc/elfload.c | 3 +- target/ppc/cpu.h | 4 +- target/ppc/cpu_init.c | 2 +- target/ppc/cpu_init.h | 3 +- target/ppc/translate/vmx-impl.c.inc | 102 ++++++++++++++-------------- target/ppc/translate/vmx-ops.c.inc | 18 ++--- 6 files changed, 64 insertions(+), 68 deletions(-)
linux-user/ppc/elfload.c +1 -2
@@ -116,8 +116,7 @@ abi_ulong get_elf_hwcap2(CPUState *cs) do { if (cpu->env.insns_flags2 & flag) { features |= feature; } } while (0)GET_FEATURE (PPC_ISEL ,QEMU_PPC_FEATURE2_HAS_ISEL ); -GET_FEATURE2 ((PPC2_ISA207 |PPC2_ALTIVEC_207 | -PPC2_ISA207S ), (QEMU_PPC_FEATURE2_ARCH_2_07 | +GET_FEATURE2 ((PPC2_ISA207 |PPC2_ISA207S ), (QEMU_PPC_FEATURE2_ARCH_2_07 |QEMU_PPC_FEATURE2_VEC_CRYPTO |QEMU_PPC_FEATURE2_HAS_TAR ));GET_FEATURE2 (PPC2_ISA300 ,QEMU_PPC_FEATURE2_ARCH_3_00 |QEMU_PPC_FEATURE2_DARN |QEMU_PPC_FEATURE2_HAS_IEEE128 );
target/ppc/cpu.h +1 -3
@@ -2577,8 +2577,6 @@ enum {PPC2_FP_CVT_ISA206 =0x0000000000000400ULL ,/* ISA 2.06B floating point test instructions */ PPC2_FP_TST_ISA206 =0x0000000000000800ULL , -/* ISA 2.07 Altivec */ -PPC2_ALTIVEC_207 =0x0000000000004000ULL ,/* PowerISA 2.07 Book3s specification */ PPC2_ISA207S = 0x0000000000008000ULL,/* Double precision floating point conversion for signed integer 64 */
@@ -2606,7 +2604,7 @@ enum {PPC2_ISA205 |PPC2_ISA207 |PPC2_PERM_ISA206 | \PPC2_DIVE_ISA206 |PPC2_ATOMIC_ISA206 | \PPC2_FP_CVT_ISA206 |PPC2_FP_TST_ISA206 | \ -PPC2_ALTIVEC_207 |PPC2_ISA207S |PPC2_DFP | \ +PPC2_ISA207S |PPC2_DFP | \PPC2_FP_CVT_S64 |PPC2_TM |PPC2_PM_ISA206 | \PPC2_ISA300 |PPC2_ISA310 |PPC2_MEM_LWSYNC | \ PPC2_BCDA_ISA206 | PPC2_PPE42 | PPC2_PPE42X | \
target/ppc/cpu_init.c +1 -1
@@ -6349,7 +6349,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, const void *data) pcc->insns_flags2 =PPC2_VSX |PPC2_ISA207 |PPC2_DFP |PPC2_DBRX |PPC2_PERM_ISA206 |PPC2_DIVE_ISA206 |PPC2_ATOMIC_ISA206 |PPC2_FP_CVT_ISA206 | -PPC2_FP_TST_ISA206 |PPC2_ALTIVEC_207 | +PPC2_FP_TST_ISA206 |PPC2_ISA205 |PPC2_ISA207S |PPC2_FP_CVT_S64 |PPC2_TM |PPC2_PM_ISA206 |PPC2_MEM_LWSYNC |PPC2_BCDA_ISA206 ;
target/ppc/cpu_init.h +1 -2
@@ -17,8 +17,7 @@#define PPC_INSNS_FLAGS2_POWER_COMMON \ (PPC2_VSX | PPC2_ISA207 | PPC2_DFP | PPC2_DBRX | \ PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ - PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \ - PPC2_ALTIVEC_207 | PPC2_ISA205 | \ + PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_ISA205 | \ PPC2_ISA207S | PPC2_FP_CVT_S64 | PPC2_ISA300 | PPC2_PRCNTL | \ PPC2_MEM_LWSYNC | PPC2_BCDA_ISA206)
target/ppc/translate/vmx-impl.c.inc +51 -51
234 lines not on this page · raw message
target/ppc/translate/vmx-ops.c.inc +9 -9
@@ -2,7 +2,7 @@ GEN_HANDLER(name, 0x04, opc2, opc3, 0x00000000, PPC_ALTIVEC) #define GEN_VXFORM_207(name, opc2, opc3) \ -GEN_HANDLER_E(name, 0x04, opc2, opc3, 0x00000000, PPC_NONE, PPC2_ALTIVEC_207) +GEN_HANDLER_E(name, 0x04, opc2, opc3, 0x00000000, PPC_NONE, PPC2_ISA207) #define GEN_VXFORM_300(name, opc2, opc3) \ GEN_HANDLER_E(name, 0x04, opc2, opc3, 0x00000000, PPC_NONE, PPC2_ISA300)
@@ -26,10 +26,10 @@ GEN_HANDLER_E(name0##_##name1, 0x4, opc2, (opc3 | 0x10), 0x00000000, tp0, tp1), 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_DUAL(vmrgow, vextuwlx, 6, 26, PPC_NONE, PPC2_ISA207), 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_DUAL(vmrgew, vextuwrx, 6, 30, PPC_NONE, PPC2_ISA207), GEN_VXFORM_300(vsrv, 2, 28), GEN_VXFORM_300(vslv, 2, 29), GEN_VXFORM(vslo, 6, 16),
@@ -113,10 +113,10 @@ GEN_VXFORM_UIMM(vctsxs, 5, 15), GEN_HANDLER(name0##_##name1, 0x04, opc2, 0xFF, 0x00000000, PPC_ALTIVEC) GEN_VAFORM_PAIRED(vmaddfp, vnmsubfp, 23), -GEN_VXFORM_DUAL(vclzb, vpopcntb, 1, 28, PPC_NONE, PPC2_ALTIVEC_207), -GEN_VXFORM_DUAL(vclzh, vpopcnth, 1, 29, PPC_NONE, PPC2_ALTIVEC_207), -GEN_VXFORM_DUAL(vclzw, vpopcntw, 1, 30, PPC_NONE, PPC2_ALTIVEC_207), -GEN_VXFORM_DUAL(vclzd, vpopcntd, 1, 31, PPC_NONE, PPC2_ALTIVEC_207), +GEN_VXFORM_DUAL(vclzb, vpopcntb, 1, 28, PPC_NONE, PPC2_ISA207), +GEN_VXFORM_DUAL(vclzh, vpopcnth, 1, 29, PPC_NONE, PPC2_ISA207), +GEN_VXFORM_DUAL(vclzw, vpopcntw, 1, 30, PPC_NONE, PPC2_ISA207), +GEN_VXFORM_DUAL(vclzd, vpopcntd, 1, 31, PPC_NONE, PPC2_ISA207), GEN_VXFORM_300(vbpermd, 6, 23), GEN_VXFORM_207(vbpermq, 6, 21),
@@ -127,8 +127,8 @@ GEN_VXFORM_207(vpmsumw, 4, 18), GEN_VXFORM_207(vsbox, 4, 23), -GEN_VXFORM_DUAL(vcipher, vcipherlast, 4, 20, PPC_NONE, PPC2_ALTIVEC_207), -GEN_VXFORM_DUAL(vncipher, vncipherlast, 4, 21, PPC_NONE, PPC2_ALTIVEC_207), +GEN_VXFORM_DUAL(vcipher, vcipherlast, 4, 20, PPC_NONE, PPC2_ISA207), +GEN_VXFORM_DUAL(vncipher, vncipherlast, 4, 21, PPC_NONE, PPC2_ISA207), GEN_VXFORM_207(vshasigmaw, 1, 26), GEN_VXFORM_207(vshasigmad, 1, 27),
Signature · 1 line
2.55.0
PATCH v3 34/37 target/ppc: Use PPC2_ISA207 instead of PPC2_ISA207S
In reply to Chinmay RathPPC2_ISA207S is only ever set in the CPUPPCState's insns_flags2 alongside PPC2_ISA207. Checks made by PPC2_ISA207S could be replaced with PPC2_ISA207, hence rendering it useless and apt for removal. This patch does the same.
--- hw/ppc/spapr_caps.c | 2 +- linux-user/ppc/elfload.c | 2 +- target/ppc/cpu.h | 5 +---- target/ppc/cpu_init.c | 3 +-- target/ppc/cpu_init.h | 2 +- target/ppc/tcg-excp_helper.c | 8 ++++---- target/ppc/translate.c | 6 +++--- target/ppc/translate/bhrb-impl.c.inc | 4 ++-- target/ppc/translate/branch-impl.c.inc | 2 +- target/ppc/translate/processor-ctrl-impl.c.inc | 8 ++++---- 10 files changed, 19 insertions(+), 23 deletions(-)
hw/ppc/spapr_caps.c +1 -1
@@ -676,7 +676,7 @@ static void cap_ail_mode_3_apply(SpaprMachineState *spapr,if (tcg_enabled ()) {/* AIL-3 is only supported on POWER8 and above CPUs. */ -if (!(pcc->insns_flags2 &PPC2_ISA207S )) { +if (!(pcc->insns_flags2 &PPC2_ISA207 )) {error_setg (errp,"TCG only supports cap-ail-mode-3 on POWER8 and later CPUs" );error_append_hint (errp,"Try appending -machine cap-ail-mode-3=off\n" );return ;
linux-user/ppc/elfload.c +1 -1
@@ -116,7 +116,7 @@ abi_ulong get_elf_hwcap2(CPUState *cs) do { if (cpu->env.insns_flags2 & flag) { features |= feature; } } while (0)GET_FEATURE (PPC_ISEL ,QEMU_PPC_FEATURE2_HAS_ISEL ); -GET_FEATURE2 ((PPC2_ISA207 |PPC2_ISA207S ), (QEMU_PPC_FEATURE2_ARCH_2_07 | +GET_FEATURE2 (PPC2_ISA207 , (QEMU_PPC_FEATURE2_ARCH_2_07 |QEMU_PPC_FEATURE2_VEC_CRYPTO |QEMU_PPC_FEATURE2_HAS_TAR ));GET_FEATURE2 (PPC2_ISA300 ,QEMU_PPC_FEATURE2_ARCH_3_00 |QEMU_PPC_FEATURE2_DARN |QEMU_PPC_FEATURE2_HAS_IEEE128 );
target/ppc/cpu.h +1 -4
@@ -2577,8 +2577,6 @@ enum {PPC2_FP_CVT_ISA206 =0x0000000000000400ULL ,/* ISA 2.06B floating point test instructions */ PPC2_FP_TST_ISA206 =0x0000000000000800ULL , -/* PowerISA 2.07 Book3s specification */ -PPC2_ISA207S =0x0000000000008000ULL ,/* Double precision floating point conversion for signed integer 64 */ PPC2_FP_CVT_S64 = 0x0000000000010000ULL,/* Transactional Memory (ISA 2.07, Book II) */
@@ -2603,8 +2601,7 @@ enum {#define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ PPC2_ISA205 | PPC2_ISA207 | PPC2_PERM_ISA206 | \ PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ - PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \ - PPC2_ISA207S | PPC2_DFP | \ + PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_DFP | \ PPC2_FP_CVT_S64 | PPC2_TM | PPC2_PM_ISA206 | \ PPC2_ISA300 | PPC2_ISA310 | PPC2_MEM_LWSYNC | \ PPC2_BCDA_ISA206 | PPC2_PPE42 | PPC2_PPE42X | \
target/ppc/cpu_init.c +1 -2
@@ -6349,8 +6349,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, const void *data) pcc->insns_flags2 =PPC2_VSX |PPC2_ISA207 |PPC2_DFP |PPC2_DBRX |PPC2_PERM_ISA206 |PPC2_DIVE_ISA206 |PPC2_ATOMIC_ISA206 |PPC2_FP_CVT_ISA206 | -PPC2_FP_TST_ISA206 | -PPC2_ISA205 |PPC2_ISA207S |PPC2_FP_CVT_S64 | +PPC2_FP_TST_ISA206 |PPC2_ISA205 |PPC2_FP_CVT_S64 |PPC2_TM |PPC2_PM_ISA206 |PPC2_MEM_LWSYNC |PPC2_BCDA_ISA206 ; pcc->msr_mask = (1ull << MSR_SF) |
target/ppc/cpu_init.h +1 -1
@@ -18,7 +18,7 @@ (PPC2_VSX |PPC2_ISA207 |PPC2_DFP |PPC2_DBRX | \PPC2_PERM_ISA206 |PPC2_DIVE_ISA206 |PPC2_ATOMIC_ISA206 | \PPC2_FP_CVT_ISA206 |PPC2_FP_TST_ISA206 |PPC2_ISA205 | \ -PPC2_ISA207S |PPC2_FP_CVT_S64 |PPC2_ISA300 |PPC2_PRCNTL | \ +PPC2_FP_CVT_S64 |PPC2_ISA300 |PPC2_PRCNTL | \ PPC2_MEM_LWSYNC | PPC2_BCDA_ISA206)#define PPC_INSNS_FLAGS2_POWER9 \
target/ppc/tcg-excp_helper.c +4 -4
@@ -314,7 +314,7 @@ void ppc_cpu_debug_excp_handler(CPUState *cs)#if defined(TARGET_PPC64 )CPUPPCState *env =cpu_env (cs); -if (env->insns_flags2 &PPC2_ISA207S ) { +if (env->insns_flags2 &PPC2_ISA207 ) {if (cs->watchpoint_hit) {if (cs->watchpoint_hit->flags &BP_CPU ) { env->spr[SPR_DAR ] = cs->watchpoint_hit->hitaddr;
@@ -336,7 +336,7 @@ bool ppc_cpu_debug_check_breakpoint(CPUState *cs)#if defined(TARGET_PPC64 )CPUPPCState *env =cpu_env (cs); -if (env->insns_flags2 &PPC2_ISA207S ) { +if (env->insns_flags2 &PPC2_ISA207 ) {target_ulong priv; priv = env->spr[SPR_CIABR ] &PPC_BITMASK (62 ,63 );
@@ -365,7 +365,7 @@ bool ppc_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp)bool wt, wti, hv, sv, pr;uint32_t dawrx; -if ((env->insns_flags2 &PPC2_ISA207S ) && +if ((env->insns_flags2 &PPC2_ISA207 ) && (wp == env->dawr_watchpoint[0 ])) { dawrx = env->spr[SPR_DAWRX0 ]; } else if ((env->insns_flags2 & PPC2_ISA310) &&
@@ -849,7 +849,7 @@ void helper_book3s_msgsndp(CPUPPCState *env, target_ulong rb)void helper_book3s_trace (CPUPPCState *env,target_ulong prev_ip) {uint32_t error_code =0 ; -if (env->insns_flags2 &PPC2_ISA207S ) { +if (env->insns_flags2 &PPC2_ISA207 ) {/* Load/store reporting, SRR1[35, 36] and SDAR, are not implemented. */ env->spr[SPR_POWER_SIAR ] = prev_ip; error_code =PPC_BIT (33 );
target/ppc/translate.c +3 -3
@@ -2775,7 +2775,7 @@ static inline void gen_op_mfspr(DisasContext *ctx) } }else {/* ISA 2.07 defines these as no-ops */ -if ((ctx->insns_flags2 &PPC2_ISA207S ) && +if ((ctx->insns_flags2 &PPC2_ISA207 ) && (sprn >=808 && sprn <=811 )) {/* This is a nop */ return ;
@@ -2841,7 +2841,7 @@ static void gen_mtspr(DisasContext *ctx) } }else {/* ISA 2.07 defines these as no-ops */ -if ((ctx->insns_flags2 &PPC2_ISA207S ) && +if ((ctx->insns_flags2 &PPC2_ISA207 ) && (sprn >=808 && sprn <=811 )) {/* This is a nop */ return ;
@@ -4135,7 +4135,7 @@ TRANS64(LDARX, do_load_locked, DEF_MEMOP(MO_UQ))static bool trans_LQARX (DisasContext *ctx,arg_LQARX *a) {REQUIRE_64BIT (ctx); -REQUIRE_INSNS_FLAGS2 (ctx,ISA207S ); +REQUIRE_INSNS_FLAGS2 (ctx,ISA207 );#if defined(TARGET_PPC64 )TCGv EA ;TCGv_i128 t16;
target/ppc/translate/bhrb-impl.c.inc +2 -2
@@ -14,7 +14,7 @@ static bool trans_MFBHRBE(DisasContext *ctx, arg_XFX_bhrbe *arg) { - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); + REQUIRE_INSNS_FLAGS2(ctx, ISA207); TCGv_i32 bhrbe = tcg_constant_i32(arg->bhrbe); gen_helper_mfbhrbe(cpu_gpr[arg->rt], tcg_env, bhrbe); return true;
@@ -22,7 +22,7 @@ static bool trans_MFBHRBE(DisasContext *ctx, arg_XFX_bhrbe *arg) static bool trans_CLRBHRB(DisasContext *ctx, arg_CLRBHRB *arg) { - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); + REQUIRE_INSNS_FLAGS2(ctx, ISA207); gen_helper_clrbhrb(tcg_env); return true; }
target/ppc/translate/branch-impl.c.inc +1 -1
@@ -14,7 +14,7 @@ static bool trans_RFEBB(DisasContext *ctx, arg_XL_s *arg) { - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); + REQUIRE_INSNS_FLAGS2(ctx, ISA207); translator_io_start(&ctx->base); gen_update_branch_history(ctx, ctx->cia, NULL, BHRB_TYPE_NORECORD);
target/ppc/translate/processor-ctrl-impl.c.inc +4 -4
@@ -23,7 +23,7 @@ static bool trans_MSGCLR(DisasContext *ctx, arg_X_rb *a) { - if (!(ctx->insns_flags2 & PPC2_ISA207S)) { + if (!(ctx->insns_flags2 & PPC2_ISA207)) { /* * Before Power ISA 2.07, processor control instructions were only * implemented in the "Embedded.Processor Control" category.
@@ -47,7 +47,7 @@ static bool trans_MSGCLR(DisasContext *ctx, arg_X_rb *a) static bool trans_MSGSND(DisasContext *ctx, arg_X_rb *a) { - if (!(ctx->insns_flags2 & PPC2_ISA207S)) { + if (!(ctx->insns_flags2 & PPC2_ISA207)) { /* * Before Power ISA 2.07, processor control instructions were only * implemented in the "Embedded.Processor Control" category.
@@ -72,7 +72,7 @@ static bool trans_MSGSND(DisasContext *ctx, arg_X_rb *a) static bool trans_MSGCLRP(DisasContext *ctx, arg_X_rb *a) { REQUIRE_64BIT(ctx); - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); + REQUIRE_INSNS_FLAGS2(ctx, ISA207); REQUIRE_SV(ctx); #if !defined(CONFIG_USER_ONLY) && defined(TARGET_PPC64) gen_helper_book3s_msgclrp(tcg_env, cpu_gpr[a->rb]);
@@ -85,7 +85,7 @@ static bool trans_MSGCLRP(DisasContext *ctx, arg_X_rb *a) static bool trans_MSGSNDP(DisasContext *ctx, arg_X_rb *a) { REQUIRE_64BIT(ctx); - REQUIRE_INSNS_FLAGS2(ctx, ISA207S); + REQUIRE_INSNS_FLAGS2(ctx, ISA207); REQUIRE_SV(ctx); #if !defined(CONFIG_USER_ONLY) && defined(TARGET_PPC64) gen_helper_book3s_msgsndp(tcg_env, cpu_gpr[a->rb]);
Signature · 1 line
2.55.0
PATCH v3 35/37 target/ppc: Reorder PPC2 flags
In reply to Chinmay RathConsolidation of different variations of Power ISA 2.07 flags into the PPC2_ISA207 flag has left gaps in the flag encoding. This patch reorders them, restoring the expected incremental order without any gaps, freeing up bits for future use.
--- target/ppc/cpu.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
target/ppc/cpu.h +10 -10
@@ -2578,25 +2578,25 @@ enum {/* ISA 2.06B floating point test instructions */ PPC2_FP_TST_ISA206 =0x0000000000000800ULL ,/* Double precision floating point conversion for signed integer 64 */ -PPC2_FP_CVT_S64 =0x0000000000010000ULL , +PPC2_FP_CVT_S64 =0x0000000000001000ULL ,/* Transactional Memory (ISA 2.07, Book II) */ -PPC2_TM =0x0000000000020000ULL , +PPC2_TM =0x0000000000002000ULL ,/* Server PM instructgions (ISA 2.06, Book III) */ -PPC2_PM_ISA206 =0x0000000000040000ULL , +PPC2_PM_ISA206 =0x0000000000004000ULL ,/* POWER ISA 3.0 */ -PPC2_ISA300 =0x0000000000080000ULL , +PPC2_ISA300 =0x0000000000008000ULL ,/* POWER ISA 3.1 */ -PPC2_ISA310 =0x0000000000100000ULL , +PPC2_ISA310 =0x0000000000010000ULL ,/* lwsync instruction */ -PPC2_MEM_LWSYNC =0x0000000000200000ULL , +PPC2_MEM_LWSYNC =0x0000000000020000ULL ,/* ISA 2.06 BCD assist instructions */ -PPC2_BCDA_ISA206 =0x0000000000400000ULL , +PPC2_BCDA_ISA206 =0x0000000000040000ULL ,/* PPE42 instructions */ -PPC2_PPE42 =0x0000000000800000ULL , +PPC2_PPE42 =0x0000000000080000ULL ,/* PPE42X instructions */ -PPC2_PPE42X =0x0000000001000000ULL , +PPC2_PPE42X =0x0000000000100000ULL ,/* PPE42XM instructions */ -PPC2_PPE42XM =0x0000000002000000ULL , +PPC2_PPE42XM =0x0000000000200000ULL , #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ PPC2_ISA205 | PPC2_ISA207 | PPC2_PERM_ISA206 | \
Signature · 1 line
2.55.0
PATCH v3 36/37 target/ppc: Add ICBT support for ISA version 2.07
In reply to Chinmay RathThe summary of changes in Power ISA version 2.07B mentions :
"ICBT instruction has been moved from the Embedded category to the Base category".
Updating ICBT flag for the same.
While we are at it, correct the invalid mask as per the ISA as well.
--- target/ppc/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/ppc/translate.c +2 -2
@@ -4498,8 +4498,8 @@ GEN_HANDLER2_E(tlbilx_booke206, "tlbilx", 0x1F, 0x12, 0x00, 0x03800001,GEN_HANDLER (wrtee,0x1F ,0x03 ,0x04 ,0x000FFC01 ,PPC_WRTEE ),GEN_HANDLER (wrteei,0x1F ,0x03 ,0x05 ,0x000E7C01 ,PPC_WRTEE ),GEN_HANDLER (dlmzb,0x1F ,0x0E ,0x02 ,0x00000000 ,PPC_440_SPEC ), -GEN_HANDLER2_E (icbt_440,"icbt" ,0x1F ,0x16 ,0x00 ,0x03E00001 , -PPC_BOOKE ,PPC2_BOOKE206 ), +GEN_HANDLER2_E (icbt_440,"icbt" ,0x1F ,0x16 ,0x00 ,0x02000001 , +PPC_BOOKE , (PPC2_BOOKE206 |PPC2_ISA207 )),GEN_HANDLER2 (icbt_440,"icbt" ,0x1F ,0x06 ,0x08 ,0x03E00001 ,PPC_440_SPEC ), GEN_HANDLER(mfvscr, 0x04, 0x2, 0x18, 0x001ff800, PPC_ALTIVEC),
Signature · 1 line
2.55.0
PATCH v3 37/37 target/ppc: Add self as maintainer for PowerPC TCG CPUs
In reply to Chinmay RathI have been contributing and reviewing code in the PowerPC TCG CPUs module for a long time now. Stepping up as an active maintainer to better reflect the current status.
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
@@ -337,8 +337,8 @@ F: tests/functional/or1k/meson.build F: tests/tcg/or1k/ PowerPC TCG CPUs +M: Chinmay Rath <[email protected]> M: Nicholas Piggin <[email protected]> -R: Chinmay Rath <[email protected]> R: Glenn Miles <[email protected]> R: Harsh Prateek Bora <[email protected]> L: [email protected]
Signature · 1 line
2.55.0
Quoted 7 lines · Chinmay Rath
This series primarily contains 3 changes :
1. PPC instructions movement to decodetree specification Changes from v2 :
- Addressed review comments from Amit, as discussed in the v2 series.
- Retained Rbs received.
Quoted 7 lines
2. PPC ISA 2.07 flag cleanup and updates
This series is based on top the above decodetree series.
- No changes. Only Rbs added.3. Stepping up as an active maintainer for PowerPC TCG CPUs module.
Link to v2: https://lore.kernel.org/qemu-devel/[email protected]/
Harsh,
Aniket's Tested-by is missing in this v3. v2 got the Tested-by after I had prepared the v3 patches, hence missed.
Quoted 89 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 decodetreeChinmay Rath (9):
target/ppc: makedo_ea_calc_raavailable for 32 bit builds target/ppc: ReplacePPC2_VSX207flag withPPC2_ISA207target/ppc: UsePPC2_ISA207instead ofPPC2_BCTAR_ISA207target/ppc: UsePPC2_ISA207instead ofPPC2_LSQ_ISA207target/ppc: UsePPC2_ISA207instead ofPPC2_ALTIVEC_207target/ppc: UsePPC2_ISA207instead ofPPC2_ISA207Starget/ppc: Reorder PPC2 flags
target/ppc: Add ICBT support for ISA version 2.07 target/ppc: Add self as maintainer for PowerPC TCG CPUsMukesh 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 decodetreeMAINTAINERS | 2 +- hw/ppc/spapr_caps.c | 2 +- linux-user/ppc/elfload.c | 6 +- target/ppc/cpu.h | 38 +- target/ppc/cpu_init.c | 6 +- target/ppc/cpu_init.h | 7 +- target/ppc/helper.h | 96 +- target/ppc/insn32.decode | 252 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 14 +- target/ppc/tcg-excp_helper.c | 18 +- target/ppc/translate.c | 2258 +++-------------- target/ppc/translate/bhrb-impl.c.inc | 4 +- target/ppc/translate/branch-impl.c.inc | 182 +- target/ppc/translate/fixedpoint-impl.c.inc | 947 ++++++- target/ppc/translate/fp-impl.c.inc | 4 +- target/ppc/translate/misc-impl.c.inc | 172 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 39 +- target/ppc/translate/storage-ctrl-impl.c.inc | 116 + target/ppc/translate/vmx-impl.c.inc | 457 ++-- target/ppc/translate/vmx-ops.c.inc | 59 +- target/ppc/translate/vsx-impl.c.inc | 56 +- target/ppc/translate/vsx-ops.c.inc | 24 +- 24 files changed, 2473 insertions(+), 2369 deletions(-)
Quoted 69 lines · Chinmay Rath
This series primarily contains 3 changes :
1. PPC instructions movement to decodetree specification Changes from v2 :
- Addressed review comments from Amit, as discussed in the v2 series.
- Retained Rbs received.2. PPC ISA 2.07 flag cleanup and updates
This series is based on top the above decodetree series.
- No changes. Only Rbs added.3. Stepping up as an active maintainer for PowerPC TCG CPUs module.
Link to v2: https://lore.kernel.org/qemu-devel/[email protected]/
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 decodetreeChinmay Rath (9):
target/ppc: makedo_ea_calc_raavailable for 32 bit builds target/ppc: ReplacePPC2_VSX207flag withPPC2_ISA207target/ppc: UsePPC2_ISA207instead ofPPC2_BCTAR_ISA207target/ppc: UsePPC2_ISA207instead ofPPC2_LSQ_ISA207target/ppc: UsePPC2_ISA207instead ofPPC2_ALTIVEC_207target/ppc: UsePPC2_ISA207instead ofPPC2_ISA207Starget/ppc: Reorder PPC2 flags
target/ppc: Add ICBT support for ISA version 2.07 target/ppc: Add self as maintainer for PowerPC TCG CPUsMukesh 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 decodetree
Quoted 7 lines
Utkarsh 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
Ran my tests on the v3 patch, here are the findings:
- Built qemu with all 37 patches applied with no issues
- All relevant selftests are passing without errors
- Guest boots and runs in TCG mode, checked with SLES16.1 RC2 guest on an Ubuntu 26.10 host
- Basic functionality checks done for guest, no issues found
Quoted 27 lines
MAINTAINERS | 2 +- hw/ppc/spapr_caps.c | 2 +- linux-user/ppc/elfload.c | 6 +- target/ppc/cpu.h | 38 +- target/ppc/cpu_init.c | 6 +- target/ppc/cpu_init.h | 7 +- target/ppc/helper.h | 96 +- target/ppc/insn32.decode | 252 ++ target/ppc/int_helper.c | 76 +- target/ppc/internal.h | 7 - target/ppc/mem_helper.c | 14 +- target/ppc/tcg-excp_helper.c | 18 +- target/ppc/translate.c | 2258 +++-------------- target/ppc/translate/bhrb-impl.c.inc | 4 +- target/ppc/translate/branch-impl.c.inc | 182 +- target/ppc/translate/fixedpoint-impl.c.inc | 947 ++++++- target/ppc/translate/fp-impl.c.inc | 4 +- target/ppc/translate/misc-impl.c.inc | 172 ++ .../ppc/translate/processor-ctrl-impl.c.inc | 39 +- target/ppc/translate/storage-ctrl-impl.c.inc | 116 + target/ppc/translate/vmx-impl.c.inc | 457 ++-- target/ppc/translate/vmx-ops.c.inc | 59 +- target/ppc/translate/vsx-impl.c.inc | 56 +- target/ppc/translate/vsx-ops.c.inc | 24 +- 24 files changed, 2473 insertions(+), 2369 deletions(-)