target/ppc: add external PID support
PATCH v3 1/1 target/ppc: add external PID support
External PID is a mechanism present on BookE 2.06 that enables application to store/load data from different address spaces. There are special version of some instructions, which operate on alternate address space, which is described in the EPLC/EPSC regiser.
This implementation uses two additional MMU modes (mmu_idx) to provide the address space for the load and store instructions. The QEMU TLB fill code was modified to recognize these MMU modes and use the values in EPLC/EPSC to find the proper entry in he PPC TLB. These two QEMU TLBs are also flushed on each write to EPLC/EPSC.
Following instructions are implemented: dcbfep dcbstep dcbtep dcbtstep dcbzep dcbzlep icbiep lbepx ldepx lfdepx lhepx lwepx stbepx stdepx stfdepx sthepx stwepx.
Following vector instructions are not: evlddepx evstddepx lvepx lvepxl stvepx stvepxl.
---
v1 -> v2:
change helper_dcbz_common arguments
change get_epid -> get_as to avoid confusion
(do not construct an epid register simulacra)
v2 -> v3: fixes build problems
make icbiep no-op on user_only
fix uninitialized variable warning on some configurations
Note: the two checkpatch warnings are ok.
target/ppc/cpu.h | 24 +++++- target/ppc/helper.h | 4 + target/ppc/mem_helper.c | 24 +++++- target/ppc/mmu_helper.c | 172 ++++++++++++++++++++++++++++--------- target/ppc/translate.c | 145 ++++++++++++++++++++++++++++++- target/ppc/translate/fp-impl.inc.c | 34 ++++++++ target/ppc/translate/fp-ops.inc.c | 2 + target/ppc/translate_init.inc.c | 21 ++++- 8 files changed, 381 insertions(+), 45 deletions(-)
target/ppc/cpu.h +23 -1
@@ -934,6 +934,19 @@ enum {/* number of possible TLBs */ #define BOOKE206_MAX_TLBN 4 +#define EPID_EPID_SHIFT 0x0 +#define EPID_EPID 0xFF +#define EPID_ELPID_SHIFT 0x10 +#define EPID_ELPID 0x3F0000 +#define EPID_EGS 0x20000000 +#define EPID_EGS_SHIFT 29 +#define EPID_EAS 0x40000000 +#define EPID_EAS_SHIFT 30 +#define EPID_EPR 0x80000000 +#define EPID_EPR_SHIFT 31 +/* We don't support EGS and ELPID */ +#define EPID_MASK (EPID_EPID | EPID_EAS | EPID_EPR) +/*****************************************************************************/ /* Server and Embedded Processor Control */
@@ -963,7 +976,16 @@ struct ppc_radix_page_info {/*****************************************************************************/ /* The whole PowerPC CPU context */ -#define NB_MMU_MODES 8 + +/* PowerPC needs eight modes for different hypervisor/supervisor/guest + +* real/paged mode combinations. The other two modes are for external PID +* load/store. +*/ +#define NB_MMU_MODES 10 +#define MMU_MODE8_SUFFIX _epl +#define MMU_MODE9_SUFFIX _eps +#define PPC_TLB_EPID_LOAD 8 +#define PPC_TLB_EPID_STORE 9#define PPC_CPU_OPCODES_LEN 0x40#define PPC_CPU_INDIRECT_OPCODES_LEN 0x20
target/ppc/helper.h +4 -0
@@ -29,7 +29,9 @@ 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, i32) +DEF_HELPER_FLAGS_3(dcbzep, TCG_CALL_NO_WG, void, env, tl, i32) DEF_HELPER_FLAGS_2(icbi, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(icbiep, TCG_CALL_NO_WG, void, env, tl) DEF_HELPER_5(lscbx, tl, env, tl, i32, i32, i32)#if defined(TARGET_PPC64 )
@@ -658,6 +660,8 @@ DEF_HELPER_2(booke206_tlbilx1, void, env, tl) DEF_HELPER_2(booke206_tlbilx3, void, env, tl) DEF_HELPER_2(booke206_tlbflush, void, env, tl) DEF_HELPER_3(booke_setpid, void, env, i32, tl) +DEF_HELPER_2(booke_set_eplc, void, env, tl) +DEF_HELPER_2(booke_set_epsc, void, env, tl) DEF_HELPER_2(6xx_tlbd, void, env, tl) DEF_HELPER_2(6xx_tlbi, void, env, tl) DEF_HELPER_2(74xx_tlbd, void, env, tl)
target/ppc/mem_helper.c +22 -2
@@ -141,7 +141,8 @@ void helper_stsw(CPUPPCState *env, target_ulong addr, uint32_t nb, } } -void helper_dcbz (CPUPPCState *env,target_ulong addr,uint32_t opcode) +static void helper_dcbz_common (CPUPPCState *env,target_ulong addr, +uint32_t opcode,int mmu_idx) {target_ulong mask, dcbz_size = env->dcache_line_size;uint32_t i;
@@ -165,7 +166,7 @@ void helper_dcbz(CPUPPCState *env, target_ulong addr, uint32_t opcode) }/* Try fast path translate */ - haddr =tlb_vaddr_to_host (env, addr,MMU_DATA_STORE , env->dmmu_idx); + haddr =tlb_vaddr_to_host (env, addr,MMU_DATA_STORE , mmu_idx);if (haddr) {memset (haddr,0 , dcbz_size); }else {
@@ -176,6 +177,16 @@ void helper_dcbz(CPUPPCState *env, target_ulong addr, uint32_t opcode) } } +void helper_dcbz (CPUPPCState *env,target_ulong addr,uint32_t opcode) +{ +helper_dcbz_common (env, addr, opcode, env->dmmu_idx); +} + +void helper_dcbzep (CPUPPCState *env,target_ulong addr,uint32_t opcode) +{ +helper_dcbz_common (env, addr, opcode,PPC_TLB_EPID_STORE ); +} +void helper_icbi (CPUPPCState *env,target_ulong addr) { addr &= ~(env->dcache_line_size -1 );
@@ -187,6 +198,15 @@ void helper_icbi(CPUPPCState *env, target_ulong addr)cpu_ldl_data_ra (env, addr,GETPC ()); } +void helper_icbiep (CPUPPCState *env,target_ulong addr) +{ +#if !defined(CONFIG_USER_ONLY ) +/* See comments above */ + addr &= ~(env->dcache_line_size -1 ); +cpu_ldl_epl_ra (env, addr,GETPC ()); +#endif +} +/* XXX: to be tested */ target_ulong helper_lscbx (CPUPPCState *env,target_ulong addr,uint32_t reg,uint32_t ra,uint32_t rb)
target/ppc/mmu_helper.c +133 -39
296 lines not on this page · raw message
target/ppc/translate.c +144 -1
220 lines not on this page · raw message
target/ppc/translate/fp-impl.inc.c +34 -0
@@ -673,6 +673,23 @@ GEN_LDFS(lfd, ld64_i64, 0x12, PPC_FLOAT);/* lfs lfsu lfsux lfsx */ GEN_LDFS (lfs, ld32fs,0x10 ,PPC_FLOAT ); +/* lfdepx (external PID lfdx) */ +static void gen_lfdepx (DisasContext *ctx) +{ +TCGv EA ; +CHK_SV ; +if (unlikely (!ctx->fpu_enabled)) { +gen_exception (ctx,POWERPC_EXCP_FPU ); +return ; + } +gen_set_access_type (ctx,ACCESS_FLOAT ); +EA =tcg_temp_new (); +gen_addr_reg_index (ctx,EA ); +tcg_gen_qemu_ld_i64 (cpu_fpr[rD (ctx->opcode)],EA ,PPC_TLB_EPID_LOAD , +DEF_MEMOP (MO_Q )); +tcg_temp_free (EA ); +} +/* lfdp */ static void gen_lfdp (DisasContext *ctx) {
@@ -846,6 +863,23 @@ GEN_STFS(stfd, st64_i64, 0x16, PPC_FLOAT);/* stfs stfsu stfsux stfsx */ GEN_STFS (stfs, st32fs,0x14 ,PPC_FLOAT ); +/* stfdepx (external PID lfdx) */ +static void gen_stfdepx (DisasContext *ctx) +{ +TCGv EA ; +CHK_SV ; +if (unlikely (!ctx->fpu_enabled)) { +gen_exception (ctx,POWERPC_EXCP_FPU ); +return ; + } +gen_set_access_type (ctx,ACCESS_FLOAT ); +EA =tcg_temp_new (); +gen_addr_reg_index (ctx,EA ); +tcg_gen_qemu_st_i64 (cpu_fpr[rD (ctx->opcode)],EA ,PPC_TLB_EPID_STORE , +DEF_MEMOP (MO_Q )); +tcg_temp_free (EA ); +} +/* stfdp */ static void gen_stfdp (DisasContext *ctx) {
target/ppc/translate/fp-ops.inc.c +2 -0
@@ -66,6 +66,7 @@ GEN_LDXF(name, ldop, 0x17, op | 0x00, type) GEN_LDFS(lfd, ld64, 0x12, PPC_FLOAT) GEN_LDFS(lfs, ld32fs, 0x10, PPC_FLOAT) +GEN_HANDLER_E (lfdepx,0x1F ,0x1F ,0x12 ,0x00000001 ,PPC_NONE ,PPC2_BOOKE206 ),GEN_HANDLER_E (lfiwax,0x1f ,0x17 ,0x1a ,0x00000001 ,PPC_NONE ,PPC2_ISA205 ),GEN_HANDLER_E (lfiwzx,0x1f ,0x17 ,0x1b ,0x1 ,PPC_NONE ,PPC2_FP_CVT_ISA206 ), GEN_HANDLER_E(lfdpx, 0x1F, 0x17, 0x18, 0x00200001, PPC_NONE, PPC2_ISA205),
@@ -87,6 +88,7 @@ GEN_STXF(name, stop, 0x17, op | 0x00, type) GEN_STFS(stfd, st64_i64, 0x16, PPC_FLOAT) GEN_STFS(stfs, st32fs, 0x14, PPC_FLOAT) GEN_STXF(stfiw, st32fiw, 0x17, 0x1E, PPC_FLOAT_STFIWX) +GEN_HANDLER_E (stfdepx,0x1F ,0x1F ,0x16 ,0x00000001 ,PPC_NONE ,PPC2_BOOKE206 ),GEN_HANDLER_E (stfdpx,0x1F ,0x17 ,0x1C ,0x00200001 ,PPC_NONE ,PPC2_ISA205 ), GEN_HANDLER(frsqrtes, 0x3B, 0x1A, 0xFF, 0x001F07C0, PPC_FLOAT_FRSQRTES),
target/ppc/translate_init.inc.c +19 -2
@@ -1653,6 +1653,15 @@ static void spr_write_booke_pid(DisasContext *ctx, int sprn, int gprn)gen_helper_booke_setpid (cpu_env, t0, cpu_gpr[gprn]); tcg_temp_free_i32(t0); } +static void spr_write_eplc (DisasContext *ctx,int sprn,int gprn) +{ +gen_helper_booke_set_eplc (cpu_env, cpu_gpr[gprn]); +} +static void spr_write_epsc (DisasContext *ctx,int sprn,int gprn) +{ +gen_helper_booke_set_epsc (cpu_env, cpu_gpr[gprn]); +} +#endif static void gen_spr_usprg3 (CPUPPCState *env)
@@ -1912,6 +1921,16 @@ static void gen_spr_BookE206(CPUPPCState *env, uint32_t mas_mask, &spr_read_generic, &spr_write_booke_pid, 0x00000000); } + +spr_register (env,SPR_BOOKE_EPLC ,"EPLC" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_read_generic, &spr_write_eplc, +0x00000000 ); +spr_register (env,SPR_BOOKE_EPSC ,"EPSC" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_read_generic, &spr_write_epsc, +0x00000000 ); +/* XXX : not implemented */ spr_register(env, SPR_MMUCFG, "MMUCFG", SPR_NOACCESS, SPR_NOACCESS,
@@ -2797,8 +2816,6 @@ static void gen_spr_8xx(CPUPPCState *env)* perf => 768-783 (Power 2.04) * perf => 784-799 (Power 2.04) * PPR => SPR 896 (Power 2.04) -* EPLC => SPR 947 (Power 2.04 emb) -* EPSC => SPR 948 (Power 2.04 emb) * DABRX => 1015 (Power 2.04 hypv) * FPECR => SPR 1022 (?) * ... and more (thermal management, performance counters, ...)
Signature · 1 line
2.11.0
David Gibson
AppliedQuoted 11 lines · Roman Kapl
External PID is a mechanism present on BookE 2.06 that enables application to store/load data from different address spaces. There are special version of some instructions, which operate on alternate address space, which is described in the EPLC/EPSC regiser.
This implementation uses two additional MMU modes (
mmu_idx) to provide the address space for the load and store instructions. The QEMU TLB fill code was modified to recognize these MMU modes and use the values in EPLC/EPSC to find the proper entry in he PPC TLB. These two QEMU TLBs are also flushed on each write to EPLC/EPSC.
Quoted 8 lines
Following instructions are implemented: dcbfep dcbstep dcbtep dcbtstep dcbzep dcbzlep icbiep lbepx ldepx lfdepx lhepx lwepx stbepx stdepx stfdepx sthepx stwepx.
Following vector instructions are not: evlddepx evstddepx lvepx lvepxl stvepx stvepxl.
Signed-off-by Roman Kapl <[email protected]>
Applied to ppc-for-3.1, thanks.
Quoted 811 lines
---
v1 -> v2:
changehelper_dcbz_commonarguments
changeget_epid->get_asto avoid confusion
(do not construct an epid register simulacra)
v2 -> v3: fixes build problems
make icbiep no-op onuser_only
fix uninitialized variable warning on some configurationsNote: the two checkpatch warnings are ok.
target/ppc/cpu.h | 24 +++++- target/ppc/helper.h | 4 + target/ppc/mem_helper.c | 24 +++++- target/ppc/mmu_helper.c | 172 ++++++++++++++++++++++++++++--------- target/ppc/translate.c | 145 ++++++++++++++++++++++++++++++- target/ppc/translate/fp-impl.inc.c | 34 ++++++++ target/ppc/translate/fp-ops.inc.c | 2 + target/ppc/translate_init.inc.c | 21 ++++- 8 files changed, 381 insertions(+), 45 deletions(-)target/ppc/cpu.h +23
-1@@ -934,6 +934,19 @@ enum {/* number of possible TLBs */ #define BOOKE206_MAX_TLBN 4 +#define EPID_EPID_SHIFT 0x0 +#define EPID_EPID 0xFF +#define EPID_ELPID_SHIFT 0x10 +#define EPID_ELPID 0x3F0000 +#define EPID_EGS 0x20000000 +#define EPID_EGS_SHIFT 29 +#define EPID_EAS 0x40000000 +#define EPID_EAS_SHIFT 30 +#define EPID_EPR 0x80000000 +#define EPID_EPR_SHIFT 31 +/* We don't support EGS and ELPID */ +#define EPID_MASK (EPID_EPID | EPID_EAS | EPID_EPR) +/*****************************************************************************/ /* Server and Embedded Processor Control */ @@ -963,7 +976,16 @@ struct ppc_radix_page_info {/*****************************************************************************/ /* The whole PowerPC CPU context */ -#define NB_MMU_MODES 8 + +/* PowerPC needs eight modes for different hypervisor/supervisor/guest + +* real/paged mode combinations. The other two modes are for external PID +* load/store. +*/ +#define NB_MMU_MODES 10 +#define MMU_MODE8_SUFFIX _epl +#define MMU_MODE9_SUFFIX _eps +#define PPC_TLB_EPID_LOAD 8 +#define PPC_TLB_EPID_STORE 9#define PPC_CPU_OPCODES_LEN 0x40#define PPC_CPU_INDIRECT_OPCODES_LEN 0x20target/ppc/helper.h +4
-0@@ -29,7 +29,9 @@ 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, i32) +DEF_HELPER_FLAGS_3(dcbzep, TCG_CALL_NO_WG, void, env, tl, i32) DEF_HELPER_FLAGS_2(icbi, TCG_CALL_NO_WG, void, env, tl) +DEF_HELPER_FLAGS_2(icbiep, TCG_CALL_NO_WG, void, env, tl) DEF_HELPER_5(lscbx, tl, env, tl, i32, i32, i32)#if defined(TARGET_PPC64 )@@ -658,6 +660,8 @@ DEF_HELPER_2(booke206_tlbilx1, void, env, tl) DEF_HELPER_2(booke206_tlbilx3, void, env, tl) DEF_HELPER_2(booke206_tlbflush, void, env, tl) DEF_HELPER_3(booke_setpid, void, env, i32, tl) +DEF_HELPER_2(booke_set_eplc, void, env, tl) +DEF_HELPER_2(booke_set_epsc, void, env, tl) DEF_HELPER_2(6xx_tlbd, void, env, tl) DEF_HELPER_2(6xx_tlbi, void, env, tl) DEF_HELPER_2(74xx_tlbd, void, env, tl)target/ppc/mem_helper.c +22
-2@@ -141,7 +141,8 @@ void helper_stsw(CPUPPCState *env, target_ulong addr, uint32_t nb, } } -void helper_dcbz (CPUPPCState *env,target_ulong addr,uint32_t opcode) +static void helper_dcbz_common (CPUPPCState *env,target_ulong addr, +uint32_t opcode,int mmu_idx) {target_ulong mask, dcbz_size = env->dcache_line_size;uint32_t i;@@ -165,7 +166,7 @@ void helper_dcbz(CPUPPCState *env, target_ulong addr, uint32_t opcode) }/* Try fast path translate */ - haddr =tlb_vaddr_to_host (env, addr,MMU_DATA_STORE , env->dmmu_idx); + haddr =tlb_vaddr_to_host (env, addr,MMU_DATA_STORE , mmu_idx);if (haddr) {memset (haddr,0 , dcbz_size); }else {@@ -176,6 +177,16 @@ void helper_dcbz(CPUPPCState *env, target_ulong addr, uint32_t opcode) } } +void helper_dcbz (CPUPPCState *env,target_ulong addr,uint32_t opcode) +{ +helper_dcbz_common (env, addr, opcode, env->dmmu_idx); +} + +void helper_dcbzep (CPUPPCState *env,target_ulong addr,uint32_t opcode) +{ +helper_dcbz_common (env, addr, opcode,PPC_TLB_EPID_STORE ); +} +void helper_icbi (CPUPPCState *env,target_ulong addr) { addr &= ~(env->dcache_line_size -1 );@@ -187,6 +198,15 @@ void helper_icbi(CPUPPCState *env, target_ulong addr)cpu_ldl_data_ra (env, addr,GETPC ()); } +void helper_icbiep (CPUPPCState *env,target_ulong addr) +{ +#if !defined(CONFIG_USER_ONLY ) +/* See comments above */ + addr &= ~(env->dcache_line_size -1 ); +cpu_ldl_epl_ra (env, addr,GETPC ()); +#endif +} +/* XXX: to be tested */ target_ulong helper_lscbx (CPUPPCState *env,target_ulong addr,uint32_t reg,uint32_t ra,uint32_t rb)target/ppc/mmu_helper.c +133
-39@@ -924,29 +924,84 @@ static int ppcmas_tlb_check(CPUPPCState *env, ppcmas_tlb_t *tlb,return 0 ; } +static bool is_epid_mmu (int mmu_idx) +{ +return mmu_idx ==PPC_TLB_EPID_STORE || mmu_idx ==PPC_TLB_EPID_LOAD ; +} + +static uint32_t mmubooke206_esr (int mmu_idx,bool rw) +{ +uint32_t esr =0 ; +if (rw) { + esr |=ESR_ST ; + } +if (is_epid_mmu (mmu_idx)) { + esr |=ESR_EPID ; + } +return esr; +} + +/* Get EPID register given the mmu_idx. If this is regular load, +* construct the EPID access bits from current processor state */ + +/* Get the effective AS and PR bits and the PID. The PID is returned only if +* EPID load is requested, otherwise the caller must detect the correct EPID. +* Return true if valid EPID is returned. */ +static bool mmubooke206_get_as (CPUPPCState *env, +int mmu_idx,uint32_t *epid_out, +bool *as_out,bool *pr_out) +{ +if (is_epid_mmu (mmu_idx)) { +uint32_t epidr; +if (mmu_idx ==PPC_TLB_EPID_STORE ) { + epidr = env->spr[SPR_BOOKE_EPSC ]; + }else { + epidr = env->spr[SPR_BOOKE_EPLC ]; + } + *epid_out = (epidr &EPID_EPID ) >>EPID_EPID_SHIFT ; + *as_out = !!(epidr &EPID_EAS ); + *pr_out = !!(epidr &EPID_EPR ); +return true; + }else { + *as_out = msr_ds; + *pr_out = msr_pr; +return false; + } +} + +/* Check if the tlb found by hashing really matches */ static int mmubooke206_check_tlb (CPUPPCState *env,ppcmas_tlb_t *tlb,hwaddr *raddr,int *prot,target_ulong address,int rw, -int access_type) +int access_type,int mmu_idx) {int ret;int prot2 =0 ; +uint32_t epid; +bool as, pr; +bool use_epid =mmubooke206_get_as (env, mmu_idx, &epid, &as, &pr); -if (ppcmas_tlb_check (env, tlb, raddr, address, - env->spr[SPR_BOOKE_PID ]) >=0 ) { - goto found_tlb; - } +if (!use_epid) { +if (ppcmas_tlb_check (env, tlb, raddr, address, + env->spr[SPR_BOOKE_PID ]) >=0 ) { + goto found_tlb; + } -if (env->spr[SPR_BOOKE_PID1 ] && -ppcmas_tlb_check (env, tlb, raddr, address, - env->spr[SPR_BOOKE_PID1 ]) >=0 ) { - goto found_tlb; - } +if (env->spr[SPR_BOOKE_PID1 ] && +ppcmas_tlb_check (env, tlb, raddr, address, + env->spr[SPR_BOOKE_PID1 ]) >=0 ) { + goto found_tlb; + } -if (env->spr[SPR_BOOKE_PID2 ] && -ppcmas_tlb_check (env, tlb, raddr, address, - env->spr[SPR_BOOKE_PID2 ]) >=0 ) { - goto found_tlb; +if (env->spr[SPR_BOOKE_PID2 ] && +ppcmas_tlb_check (env, tlb, raddr, address, + env->spr[SPR_BOOKE_PID2 ]) >=0 ) { + goto found_tlb; + } + }else { +if (ppcmas_tlb_check (env, tlb, raddr, address, epid) >=0 ) { + goto found_tlb; + } }LOG_SWTLB ("%s: TLB entry not found\n" , __func__);@@ -954,7 +1009,7 @@ static int mmubooke206_check_tlb(CPUPPCState *env, ppcmas_tlb_t *tlb, found_tlb: -if (msr_pr !=0 ) { +if (pr) {if (tlb->mas7_3 &MAS3_UR ) { prot2 |=PAGE_READ ; }@@ -978,6 +1033,8 @@ found_tlb:/* Check the address space and permissions */ if (access_type ==ACCESS_CODE ) { +/* There is no way to fetch code using epid load */ +assert (!use_epid);if (msr_ir != ((tlb->mas1 &MAS1_TS ) >>MAS1_TS_SHIFT )) {LOG_SWTLB ("%s: AS doesn't match\n" , __func__);return -1 ;@@ -992,7 +1049,7 @@ found_tlb:LOG_SWTLB ("%s: no PAGE_EXEC: %x\n" , __func__, prot2); ret =-3 ; }else { -if (msr_dr != ((tlb->mas1 &MAS1_TS ) >>MAS1_TS_SHIFT )) { +if (as != ((tlb->mas1 &MAS1_TS ) >>MAS1_TS_SHIFT )) {LOG_SWTLB ("%s: AS doesn't match\n" , __func__);return -1 ; }@@ -1012,7 +1069,7 @@ found_tlb:static int mmubooke206_get_physical_address (CPUPPCState *env,mmu_ctx_t *ctx,target_ulong address,int rw, -int access_type) +int access_type,int mmu_idx) {ppcmas_tlb_t *tlb;hwaddr raddr;@@ -1030,7 +1087,7 @@ static int mmubooke206_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,continue ; } ret =mmubooke206_check_tlb (env, tlb, &raddr, &ctx->prot, address, - rw, access_type); + rw, access_type, mmu_idx);if (ret !=-1 ) { goto found_tlb; }@@ -1348,8 +1405,10 @@ static inline int check_physical(CPUPPCState *env, mmu_ctx_t *ctx,return ret; } -static int get_physical_address (CPUPPCState *env,mmu_ctx_t *ctx, -target_ulong eaddr,int rw,int access_type) +static int get_physical_address_wtlb ( +CPUPPCState *env,mmu_ctx_t *ctx, +target_ulong eaddr,int rw,int access_type, +int mmu_idx) {PowerPCCPU *cpu =ppc_env_get_cpu (env);int ret =-1 ;@@ -1392,7 +1451,7 @@ static int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,break ;case POWERPC_MMU_BOOKE206 : ret =mmubooke206_get_physical_address (env, ctx, eaddr, rw, - access_type); + access_type, mmu_idx);break ;case POWERPC_MMU_MPC8xx:/* XXX: TODO */ @@ -1417,6 +1476,13 @@ static int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,return ret; } +static int get_physical_address ( +CPUPPCState *env,mmu_ctx_t *ctx, +target_ulong eaddr,int rw,int access_type) +{ +return get_physical_address_wtlb (env, ctx, eaddr, rw, access_type,0 ); +} +hwaddr ppc_cpu_get_phys_page_debug (CPUState *cs,vaddr addr) {PowerPCCPU *cpu =POWERPC_CPU (cs);@@ -1463,8 +1529,15 @@ hwaddr ppc_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) }static void booke206_update_mas_tlb_miss (CPUPPCState *env,target_ulong address, -int rw) +int rw,int mmu_idx) { +uint32_t epid; +bool as, pr; +uint32_t missed_tid =0 ; +bool use_epid =mmubooke206_get_as (env, mmu_idx, &epid, &as, &pr); +if (rw ==2 ) { + as = msr_ir; + } env->spr[SPR_BOOKE_MAS0 ] = env->spr[SPR_BOOKE_MAS4 ] &MAS4_TLBSELD_MASK ; env->spr[SPR_BOOKE_MAS1 ] = env->spr[SPR_BOOKE_MAS4 ] &MAS4_TSIZED_MASK ; env->spr[SPR_BOOKE_MAS2 ] = env->spr[SPR_BOOKE_MAS4 ] &MAS4_WIMGED_MASK ;@@ -1473,7 +1546,7 @@ static void booke206_update_mas_tlb_miss(CPUPPCState *env, target_ulong address, env->spr[SPR_BOOKE_MAS7 ] =0 ;/* AS */ -if (((rw ==2 ) && msr_ir) || ((rw !=2 ) && msr_dr)) { +if (as) { env->spr[SPR_BOOKE_MAS1 ] |=MAS1_TS ; env->spr[SPR_BOOKE_MAS6 ] |=MAS6_SAS ; }@@ -1481,19 +1554,25 @@ static void booke206_update_mas_tlb_miss(CPUPPCState *env, target_ulong address, env->spr[SPR_BOOKE_MAS1 ] |=MAS1_VALID ; env->spr[SPR_BOOKE_MAS2 ] |= address &MAS2_EPN_MASK ; -switch (env->spr[SPR_BOOKE_MAS4 ] &MAS4_TIDSELD_PIDZ ) { -case MAS4_TIDSELD_PID0 : - env->spr[SPR_BOOKE_MAS1 ] |= env->spr[SPR_BOOKE_PID ] <<MAS1_TID_SHIFT ; -break ; -case MAS4_TIDSELD_PID1 : - env->spr[SPR_BOOKE_MAS1 ] |= env->spr[SPR_BOOKE_PID1 ] <<MAS1_TID_SHIFT ; -break ; -case MAS4_TIDSELD_PID2 : - env->spr[SPR_BOOKE_MAS1 ] |= env->spr[SPR_BOOKE_PID2 ] <<MAS1_TID_SHIFT ; -break ; +if (!use_epid) { +switch (env->spr[SPR_BOOKE_MAS4 ] &MAS4_TIDSELD_PIDZ ) { +case MAS4_TIDSELD_PID0 : + missed_tid = env->spr[SPR_BOOKE_PID ]; +break ; +case MAS4_TIDSELD_PID1 : + missed_tid = env->spr[SPR_BOOKE_PID1 ]; +break ; +case MAS4_TIDSELD_PID2 : + missed_tid = env->spr[SPR_BOOKE_PID2 ]; +break ; + } + env->spr[SPR_BOOKE_MAS6 ] |= env->spr[SPR_BOOKE_PID ] <<16 ; + }else { + missed_tid = epid; + env->spr[SPR_BOOKE_MAS6 ] |= missed_tid <<16 ; } + env->spr[SPR_BOOKE_MAS1 ] |= (missed_tid <<MAS1_TID_SHIFT ); - env->spr[SPR_BOOKE_MAS6 ] |= env->spr[SPR_BOOKE_PID ] <<16 ;/* next victim logic */ env->spr[SPR_BOOKE_MAS0 ] |= env->last_way <<MAS0_ESEL_SHIFT ;@@ -1520,7 +1599,8 @@ static int cpu_ppc_handle_mmu_fault(CPUPPCState *env, target_ulong address,/* data access */ access_type = env->access_type; } - ret =get_physical_address (env, &ctx, address, rw, access_type); + ret =get_physical_address_wtlb (env, &ctx, address, rw, + access_type, mmu_idx);if (ret ==0 ) { tlb_set_page(cs, address & TARGET_PAGE_MASK, ctx.raddr & TARGET_PAGE_MASK, ctx.prot,@@ -1550,12 +1630,13 @@ static int cpu_ppc_handle_mmu_fault(CPUPPCState *env, target_ulong address, env->spr[SPR_40x_ESR] =0x00000000 ;break ;case POWERPC_MMU_BOOKE206 : -booke206_update_mas_tlb_miss (env, address,2 ); +booke206_update_mas_tlb_miss (env, address,2 , mmu_idx);/* fall through */ case POWERPC_MMU_BOOKE : cs->exception_index =POWERPC_EXCP_ITLB ; env->error_code =0 ; env->spr[SPR_BOOKE_DEAR ] = address; + env->spr[SPR_BOOKE_ESR ] =mmubooke206_esr (mmu_idx,0 );return -1 ;case POWERPC_MMU_MPC8xx:/* XXX: TODO */ @@ -1642,13 +1723,13 @@ static int cpu_ppc_handle_mmu_fault(CPUPPCState *env, target_ulong address,cpu_abort (cs,"MPC8xx MMU model is not implemented\n" );break ;case POWERPC_MMU_BOOKE206 : -booke206_update_mas_tlb_miss (env, address, rw); +booke206_update_mas_tlb_miss (env, address, rw, mmu_idx);/* fall through */ case POWERPC_MMU_BOOKE : cs->exception_index =POWERPC_EXCP_DTLB ; env->error_code =0 ; env->spr[SPR_BOOKE_DEAR ] = address; - env->spr[SPR_BOOKE_ESR ] = rw ?ESR_ST :0 ; + env->spr[SPR_BOOKE_ESR ] =mmubooke206_esr (mmu_idx, rw);return -1 ;case POWERPC_MMU_REAL : cpu_abort(cs, "PowerPC in real mode should never raise "@@ -1672,7 +1753,7 @@ static int cpu_ppc_handle_mmu_fault(CPUPPCState *env, target_ulong address, }else if ((env->mmu_model ==POWERPC_MMU_BOOKE ) || (env->mmu_model ==POWERPC_MMU_BOOKE206 )) { env->spr[SPR_BOOKE_DEAR ] = address; - env->spr[SPR_BOOKE_ESR ] = rw ?ESR_ST :0 ; + env->spr[SPR_BOOKE_ESR ] =mmubooke206_esr (mmu_idx, rw); }else { env->spr[SPR_DAR ] = address;if (rw ==1 ) {@@ -2598,6 +2679,19 @@ void helper_booke_setpid(CPUPPCState *env, uint32_t pidn, target_ulong pid)tlb_flush (CPU (cpu)); } +void helper_booke_set_eplc (CPUPPCState *env,target_ulong val) +{ +PowerPCCPU *cpu =ppc_env_get_cpu (env); + env->spr[SPR_BOOKE_EPLC ] = val &EPID_MASK ; +tlb_flush_by_mmuidx (CPU (cpu),1 <<PPC_TLB_EPID_LOAD ); +} +void helper_booke_set_epsc (CPUPPCState *env,target_ulong val) +{ +PowerPCCPU *cpu =ppc_env_get_cpu (env); + env->spr[SPR_BOOKE_EPSC ] = val &EPID_MASK ; +tlb_flush_by_mmuidx (CPU (cpu),1 <<PPC_TLB_EPID_STORE ); +} +static inline void flush_page (CPUPPCState *env,ppcmas_tlb_t *tlb) {PowerPCCPU *cpu =ppc_env_get_cpu (env);target/ppc/translate.c +144
-1@@ -2578,6 +2578,26 @@ GEN_LDS(lha, ld16s, 0x0A, PPC_INTEGER);GEN_LDS (lhz, ld16u,0x08 ,PPC_INTEGER );/* lwz lwzu lwzux lwzx */ GEN_LDS (lwz, ld32u,0x00 ,PPC_INTEGER ); + +#define GEN_LDEPX (name, ldop, opc2, opc3) \ +static void glue(gen_, name##epx)(DisasContext *ctx) \ +{ \ + TCGv EA; \ + CHK_SV; \ + gen_set_access_type(ctx, ACCESS_INT); \ + EA = tcg_temp_new(); \ + gen_addr_reg_index(ctx, EA); \ + tcg_gen_qemu_ld_tl(cpu_gpr[rD(ctx->opcode)], EA, PPC_TLB_EPID_LOAD, ldop);\ + tcg_temp_free(EA); \ +} + +GEN_LDEPX(lb, DEF_MEMOP(MO_UB), 0x1F, 0x02) +GEN_LDEPX(lh, DEF_MEMOP(MO_UW), 0x1F, 0x08) +GEN_LDEPX(lw, DEF_MEMOP(MO_UL), 0x1F, 0x00) +#if defined(TARGET_PPC64 ) +GEN_LDEPX(ld, DEF_MEMOP(MO_Q), 0x1D, 0x00) +#endif +#if defined(TARGET_PPC64 )/* lwaux */ GEN_LDUX (lwa, ld32s,0x15 ,0x0B ,PPC_64B );@@ -2759,6 +2779,27 @@ GEN_STS(stb, st8, 0x06, PPC_INTEGER);GEN_STS (sth, st16,0x0C ,PPC_INTEGER );/* stw stwu stwux stwx */ GEN_STS (stw, st32,0x04 ,PPC_INTEGER ); + +#define GEN_STEPX (name, stop, opc2, opc3) \ +static void glue(gen_, name##epx)(DisasContext *ctx) \ +{ \ + TCGv EA; \ + CHK_SV; \ + gen_set_access_type(ctx, ACCESS_INT); \ + EA = tcg_temp_new(); \ + gen_addr_reg_index(ctx, EA); \ + tcg_gen_qemu_st_tl( \ + cpu_gpr[rD(ctx->opcode)], EA, PPC_TLB_EPID_STORE, stop); \ + tcg_temp_free(EA); \ +} + +GEN_STEPX(stb, DEF_MEMOP(MO_UB), 0x1F, 0x06) +GEN_STEPX(sth, DEF_MEMOP(MO_UW), 0x1F, 0x0C) +GEN_STEPX(stw, DEF_MEMOP(MO_UL), 0x1F, 0x04) +#if defined(TARGET_PPC64 ) +GEN_STEPX(std, DEF_MEMOP(MO_Q), 0x1d, 0x04) +#endif +#if defined(TARGET_PPC64 )GEN_STUX (std, st64_i64,0x15 ,0x05 ,PPC_64B );GEN_STX (std, st64_i64,0x15 ,0x04 ,PPC_64B );@@ -4389,6 +4430,19 @@ static void gen_dcbf(DisasContext *ctx)tcg_temp_free (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 ; +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 )); +tcg_temp_free (t0); +} +/* dcbi (Supervisor only) */ static void gen_dcbi (DisasContext *ctx) {@@ -4422,6 +4476,18 @@ static void gen_dcbst(DisasContext *ctx)tcg_temp_free (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 )); +tcg_temp_free (t0); +} +/* dcbt */ static void gen_dcbt (DisasContext *ctx) {@@ -4431,6 +4497,15 @@ static void gen_dcbt(DisasContext *ctx)*/ } +/* 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) {@@ -4440,6 +4515,15 @@ static void gen_dcbtst(DisasContext *ctx)*/ } +/* 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) {@@ -4466,6 +4550,21 @@ static void gen_dcbz(DisasContext *ctx)tcg_temp_free_i32 (tcgv_op); } +/* dcbzep */ +static void gen_dcbzep (DisasContext *ctx) +{ +TCGv tcgv_addr; +TCGv_i32 tcgv_op; + +gen_set_access_type (ctx,ACCESS_CACHE ); + tcgv_addr =tcg_temp_new (); + tcgv_op =tcg_const_i32 (ctx->opcode &0x03FF000 ); +gen_addr_reg_index (ctx, tcgv_addr); +gen_helper_dcbzep (cpu_env, tcgv_addr, tcgv_op); +tcg_temp_free (tcgv_addr); +tcg_temp_free_i32 (tcgv_op); +} +/* dst / dstt */ static void gen_dst (DisasContext *ctx) {@@ -4504,6 +4603,17 @@ static void gen_icbi(DisasContext *ctx)tcg_temp_free (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 (cpu_env, t0); +tcg_temp_free (t0); +} +/* Optional: */ /* dcba */ static void gen_dcba (DisasContext *ctx)@@ -6771,16 +6881,24 @@ GEN_HANDLER_E(mcrxrx, 0x1F, 0x00, 0x12, 0x007FF801, PPC_NONE, PPC2_ISA300),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_CACHE ,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_CACHE ,PPC2_BOOKE206 ),GEN_HANDLER (dcbt,0x1F ,0x16 ,0x08 ,0x00000001 ,PPC_CACHE ), -GEN_HANDLER (dcbtst,0x1F ,0x16 ,0x07 ,0x00000001 ,PPC_CACHE ), +GEN_HANDLER_E (dcbtep,0x1F ,0x1F ,0x09 ,0x00000001 ,PPC_CACHE ,PPC2_BOOKE206 ), +GEN_HANDLER (dcbtst,0x1F ,0x1F ,0x07 ,0x00000001 ,PPC_CACHE ), +GEN_HANDLER_E (dcbtstep,0x1F ,0x16 ,0x07 ,0x00000001 ,PPC_CACHE ,PPC2_BOOKE206 ),GEN_HANDLER_E (dcbtls,0x1F ,0x06 ,0x05 ,0x02000001 ,PPC_BOOKE ,PPC2_BOOKE206 ),GEN_HANDLER (dcbz,0x1F ,0x16 ,0x1F ,0x03C00001 ,PPC_CACHE_DCBZ ), +GEN_HANDLER_E (dcbzep,0x1F ,0x1F ,0x1F ,0x03C00001 , +PPC_CACHE_DCBZ ,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_CACHE_ICBI ,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),@@ -7083,6 +7201,19 @@ GEN_LDX_HVRM(lbzcix, ld8u, 0x15, 0x1a, PPC_CILDST) GEN_LDX(lhbr, ld16ur, 0x16, 0x18, PPC_INTEGER)GEN_LDX (lwbr, ld32ur,0x16 ,0x10 ,PPC_INTEGER ) +/* External PID based load */ +#undef GEN_LDEPX +#define GEN_LDEPX (name, ldop, opc2, opc3) \ +GEN_HANDLER_E(name##epx, 0x1F, opc2, opc3, \ + 0x00000001, PPC_INTEGER, PPC2_BOOKE206), + +GEN_LDEPX(lb, DEF_MEMOP(MO_UB), 0x1F, 0x02) +GEN_LDEPX(lh, DEF_MEMOP(MO_UW), 0x1F, 0x08) +GEN_LDEPX(lw, DEF_MEMOP(MO_UL), 0x1F, 0x00) +#if defined(TARGET_PPC64 ) +GEN_LDEPX(ld, DEF_MEMOP(MO_Q), 0x1D, 0x00) +#endif +#undef GEN_ST#undef GEN_STU#undef GEN_STUX@@ -7117,6 +7248,18 @@ GEN_STX_HVRM(stbcix, st8, 0x15, 0x1e, PPC_CILDST) GEN_STX(sthbr, st16r, 0x16, 0x1C, PPC_INTEGER) GEN_STX(stwbr, st32r, 0x16, 0x14, PPC_INTEGER) +#undef GEN_STEPX +#define GEN_STEPX (name, ldop, opc2, opc3) \ +GEN_HANDLER_E(name##epx, 0x1F, opc2, opc3, \ + 0x00000001, PPC_INTEGER, PPC2_BOOKE206), + +GEN_STEPX(stb, DEF_MEMOP(MO_UB), 0x1F, 0x06) +GEN_STEPX(sth, DEF_MEMOP(MO_UW), 0x1F, 0x0C) +GEN_STEPX(stw, DEF_MEMOP(MO_UL), 0x1F, 0x04) +#if defined(TARGET_PPC64 ) +GEN_STEPX(std, DEF_MEMOP(MO_Q), 0x1D, 0x04) +#endif +#undef GEN_CRLOGIC#define GEN_CRLOGIC (name, tcg_op, opc) \ GEN_HANDLER(name, 0x13, 0x01, opc, 0x00000001, PPC_INTEGER)target/ppc/translate/fp-impl.inc.c +34
-0@@ -673,6 +673,23 @@ GEN_LDFS(lfd, ld64_i64, 0x12, PPC_FLOAT);/* lfs lfsu lfsux lfsx */ GEN_LDFS (lfs, ld32fs,0x10 ,PPC_FLOAT ); +/* lfdepx (external PID lfdx) */ +static void gen_lfdepx (DisasContext *ctx) +{ +TCGv EA ; +CHK_SV ; +if (unlikely (!ctx->fpu_enabled)) { +gen_exception (ctx,POWERPC_EXCP_FPU ); +return ; + } +gen_set_access_type (ctx,ACCESS_FLOAT ); +EA =tcg_temp_new (); +gen_addr_reg_index (ctx,EA ); +tcg_gen_qemu_ld_i64 (cpu_fpr[rD (ctx->opcode)],EA ,PPC_TLB_EPID_LOAD , +DEF_MEMOP (MO_Q )); +tcg_temp_free (EA ); +} +/* lfdp */ static void gen_lfdp (DisasContext *ctx) {@@ -846,6 +863,23 @@ GEN_STFS(stfd, st64_i64, 0x16, PPC_FLOAT);/* stfs stfsu stfsux stfsx */ GEN_STFS (stfs, st32fs,0x14 ,PPC_FLOAT ); +/* stfdepx (external PID lfdx) */ +static void gen_stfdepx (DisasContext *ctx) +{ +TCGv EA ; +CHK_SV ; +if (unlikely (!ctx->fpu_enabled)) { +gen_exception (ctx,POWERPC_EXCP_FPU ); +return ; + } +gen_set_access_type (ctx,ACCESS_FLOAT ); +EA =tcg_temp_new (); +gen_addr_reg_index (ctx,EA ); +tcg_gen_qemu_st_i64 (cpu_fpr[rD (ctx->opcode)],EA ,PPC_TLB_EPID_STORE , +DEF_MEMOP (MO_Q )); +tcg_temp_free (EA ); +} +/* stfdp */ static void gen_stfdp (DisasContext *ctx) {target/ppc/translate/fp-ops.inc.c +2
-0@@ -66,6 +66,7 @@ GEN_LDXF(name, ldop, 0x17, op | 0x00, type) GEN_LDFS(lfd, ld64, 0x12, PPC_FLOAT) GEN_LDFS(lfs, ld32fs, 0x10, PPC_FLOAT) +GEN_HANDLER_E (lfdepx,0x1F ,0x1F ,0x12 ,0x00000001 ,PPC_NONE ,PPC2_BOOKE206 ),GEN_HANDLER_E (lfiwax,0x1f ,0x17 ,0x1a ,0x00000001 ,PPC_NONE ,PPC2_ISA205 ),GEN_HANDLER_E (lfiwzx,0x1f ,0x17 ,0x1b ,0x1 ,PPC_NONE ,PPC2_FP_CVT_ISA206 ), GEN_HANDLER_E(lfdpx, 0x1F, 0x17, 0x18, 0x00200001, PPC_NONE, PPC2_ISA205),@@ -87,6 +88,7 @@ GEN_STXF(name, stop, 0x17, op | 0x00, type) GEN_STFS(stfd, st64_i64, 0x16, PPC_FLOAT) GEN_STFS(stfs, st32fs, 0x14, PPC_FLOAT) GEN_STXF(stfiw, st32fiw, 0x17, 0x1E, PPC_FLOAT_STFIWX) +GEN_HANDLER_E (stfdepx,0x1F ,0x1F ,0x16 ,0x00000001 ,PPC_NONE ,PPC2_BOOKE206 ),GEN_HANDLER_E (stfdpx,0x1F ,0x17 ,0x1C ,0x00200001 ,PPC_NONE ,PPC2_ISA205 ), GEN_HANDLER(frsqrtes, 0x3B, 0x1A, 0xFF, 0x001F07C0, PPC_FLOAT_FRSQRTES),target/ppc/translate_init.inc.c +19
-2@@ -1653,6 +1653,15 @@ static void spr_write_booke_pid(DisasContext *ctx, int sprn, int gprn)gen_helper_booke_setpid (cpu_env, t0, cpu_gpr[gprn]); tcg_temp_free_i32(t0); } +static void spr_write_eplc (DisasContext *ctx,int sprn,int gprn) +{ +gen_helper_booke_set_eplc (cpu_env, cpu_gpr[gprn]); +} +static void spr_write_epsc (DisasContext *ctx,int sprn,int gprn) +{ +gen_helper_booke_set_epsc (cpu_env, cpu_gpr[gprn]); +} +#endif static void gen_spr_usprg3 (CPUPPCState *env)@@ -1912,6 +1921,16 @@ static void gen_spr_BookE206(CPUPPCState *env, uint32_t mas_mask, &spr_read_generic, &spr_write_booke_pid, 0x00000000); } + +spr_register (env,SPR_BOOKE_EPLC ,"EPLC" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_read_generic, &spr_write_eplc, +0x00000000 ); +spr_register (env,SPR_BOOKE_EPSC ,"EPSC" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_read_generic, &spr_write_epsc, +0x00000000 ); +/* XXX : not implemented */ spr_register(env, SPR_MMUCFG, "MMUCFG", SPR_NOACCESS, SPR_NOACCESS,@@ -2797,8 +2816,6 @@ static void gen_spr_8xx(CPUPPCState *env)* perf => 768-783 (Power 2.04) * perf => 784-799 (Power 2.04) * PPR => SPR 896 (Power 2.04) -* EPLC => SPR 947 (Power 2.04 emb) -* EPSC => SPR 948 (Power 2.04 emb) * DABRX => 1015 (Power 2.04 hypv) * FPECR => SPR 1022 (?) * ... and more (thermal management, performance counters, ...)
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson