ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/tricore: Refactor PCXI/ICR register fields 

starting from ISA version 1.6.1 (previously known as 1.6P/E), some
bitfields in PCXI and ICR have changed. We also refactor these
registers using the register fields API.

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1453
Message-Id: <20230526061946.54514-5-kbastian@mail.uni-paderborn.de>
This commit is contained in:
Bastian Koppelmann 2023-05-26 08:19:44 +02:00
parent 0e45f7beca
commit 343cdf2c9a
4 changed files with 123 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
target/tricore/cpu.h
View File

@ -21,6 +21,7 @@
#define TRICORE_CPU_H #define TRICORE_CPU_H
#include "cpu-qom.h" #include "cpu-qom.h"
#include "hw/registerfields.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "qemu/cpu-float.h" #include "qemu/cpu-float.h"
#include "tricore-defs.h" #include "tricore-defs.h"
@ -199,13 +200,33 @@ struct ArchCPU {
hwaddr tricore_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); hwaddr tricore_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
void tricore_cpu_dump_state(CPUState *cpu, FILE *f, int flags); void tricore_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
FIELD(PCXI, PCPN_13, 24, 8)
FIELD(PCXI, PCPN_161, 22, 8)
FIELD(PCXI, PIE_13, 23, 1)
FIELD(PCXI, PIE_161, 21, 1)
FIELD(PCXI, UL_13, 22, 1)
FIELD(PCXI, UL_161, 20, 1)
FIELD(PCXI, PCXS, 16, 4)
FIELD(PCXI, PCXO, 0, 16)
uint32_t pcxi_get_ul(CPUTriCoreState *env);
uint32_t pcxi_get_pie(CPUTriCoreState *env);
uint32_t pcxi_get_pcpn(CPUTriCoreState *env);
uint32_t pcxi_get_pcxs(CPUTriCoreState *env);
uint32_t pcxi_get_pcxo(CPUTriCoreState *env);
void pcxi_set_ul(CPUTriCoreState *env, uint32_t val);
void pcxi_set_pie(CPUTriCoreState *env, uint32_t val);
void pcxi_set_pcpn(CPUTriCoreState *env, uint32_t val);
#define MASK_PCXI_PCPN 0xff000000 FIELD(ICR, IE_161, 15, 1)
#define MASK_PCXI_PIE_1_3 0x00800000 FIELD(ICR, IE_13, 8, 1)
#define MASK_PCXI_PIE_1_6 0x00200000 FIELD(ICR, PIPN, 16, 8)
#define MASK_PCXI_UL 0x00400000 FIELD(ICR, CCPN, 0, 8)
#define MASK_PCXI_PCXS 0x000f0000
#define MASK_PCXI_PCXO 0x0000ffff uint32_t icr_get_ie(CPUTriCoreState *env);
uint32_t icr_get_ccpn(CPUTriCoreState *env);
void icr_set_ccpn(CPUTriCoreState *env, uint32_t val);
void icr_set_ie(CPUTriCoreState *env, uint32_t val);
#define MASK_PSW_USB 0xff000000 #define MASK_PSW_USB 0xff000000
#define MASK_USB_C 0x80000000 #define MASK_USB_C 0x80000000
@ -228,10 +249,6 @@ void tricore_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
#define MASK_CPUID_MOD_32B 0x0000ff00 #define MASK_CPUID_MOD_32B 0x0000ff00
#define MASK_CPUID_REV 0x000000ff #define MASK_CPUID_REV 0x000000ff
#define MASK_ICR_PIPN 0x00ff0000
#define MASK_ICR_IE_1_3 0x00000100
#define MASK_ICR_IE_1_6 0x00008000
#define MASK_ICR_CCPN 0x000000ff
#define MASK_FCX_FCXS 0x000f0000 #define MASK_FCX_FCXS 0x000f0000
#define MASK_FCX_FCXO 0x0000ffff #define MASK_FCX_FCXO 0x0000ffff

45
target/tricore/helper.c
View File

@ -17,6 +17,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "hw/registerfields.h"
#include "cpu.h" #include "cpu.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "fpu/softfloat-helpers.h" #include "fpu/softfloat-helpers.h"
@ -152,3 +153,47 @@ void psw_write(CPUTriCoreState *env, uint32_t val)
fpu_set_state(env); fpu_set_state(env);
} }
#define FIELD_GETTER_WITH_FEATURE(NAME, REG, FIELD, FEATURE) \
uint32_t NAME(CPUTriCoreState *env) \
{ \
if (tricore_feature(env, TRICORE_FEATURE_##FEATURE)) { \
return FIELD_EX32(env->REG, REG, FIELD ## _ ## FEATURE); \
} \
return FIELD_EX32(env->REG, REG, FIELD ## _13); \
}
#define FIELD_GETTER(NAME, REG, FIELD) \
uint32_t NAME(CPUTriCoreState *env) \
{ \
return FIELD_EX32(env->REG, REG, FIELD); \
}
#define FIELD_SETTER_WITH_FEATURE(NAME, REG, FIELD, FEATURE) \
void NAME(CPUTriCoreState *env, uint32_t val) \
{ \
if (tricore_feature(env, TRICORE_FEATURE_##FEATURE)) { \
env->REG = FIELD_DP32(env->REG, REG, FIELD ## _ ## FEATURE, val); \
} \
env->REG = FIELD_DP32(env->REG, REG, FIELD ## _13, val); \
}
#define FIELD_SETTER(NAME, REG, FIELD) \
void NAME(CPUTriCoreState *env, uint32_t val) \
{ \
env->REG = FIELD_DP32(env->REG, REG, FIELD, val); \
}
FIELD_GETTER_WITH_FEATURE(pcxi_get_pcpn, PCXI, PCPN, 161)
FIELD_SETTER_WITH_FEATURE(pcxi_set_pcpn, PCXI, PCPN, 161)
FIELD_GETTER_WITH_FEATURE(pcxi_get_pie, PCXI, PIE, 161)
FIELD_SETTER_WITH_FEATURE(pcxi_set_pie, PCXI, PIE, 161)
FIELD_GETTER_WITH_FEATURE(pcxi_get_ul, PCXI, UL, 161)
FIELD_SETTER_WITH_FEATURE(pcxi_set_ul, PCXI, UL, 161)
FIELD_GETTER(pcxi_get_pcxs, PCXI, PCXS)
FIELD_GETTER(pcxi_get_pcxo, PCXI, PCXO)
FIELD_GETTER_WITH_FEATURE(icr_get_ie, ICR, IE, 161)
FIELD_SETTER_WITH_FEATURE(icr_set_ie, ICR, IE, 161)
FIELD_GETTER(icr_get_ccpn, ICR, CCPN)
FIELD_SETTER(icr_set_ccpn, ICR, CCPN)

87
target/tricore/op_helper.c
View File

@ -84,11 +84,10 @@ void raise_exception_sync_internal(CPUTriCoreState *env, uint32_t class, int tin
ICR.IE and ICR.CCPN are saved */ ICR.IE and ICR.CCPN are saved */
/* PCXI.PIE = ICR.IE */ /* PCXI.PIE = ICR.IE */
env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE_1_3) + pcxi_set_pie(env, icr_get_ie(env));
((env->ICR & MASK_ICR_IE_1_3) << 15));
/* PCXI.PCPN = ICR.CCPN */ /* PCXI.PCPN = ICR.CCPN */
env->PCXI = (env->PCXI & 0xffffff) + pcxi_set_pcpn(env, icr_get_ccpn(env));
((env->ICR & MASK_ICR_CCPN) << 24);
/* Update PC using the trap vector table */ /* Update PC using the trap vector table */
env->PC = env->BTV | (class << 5); env->PC = env->BTV | (class << 5);
@ -2461,13 +2460,11 @@ void helper_call(CPUTriCoreState *env, uint32_t next_pc)
save_context_upper(env, ea); save_context_upper(env, ea);
/* PCXI.PCPN = ICR.CCPN; */ /* PCXI.PCPN = ICR.CCPN; */
env->PCXI = (env->PCXI & 0xffffff) + pcxi_set_pcpn(env, icr_get_ccpn(env));
((env->ICR & MASK_ICR_CCPN) << 24);
/* PCXI.PIE = ICR.IE; */ /* PCXI.PIE = ICR.IE; */
env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE_1_3) + pcxi_set_pie(env, icr_get_ie(env));
((env->ICR & MASK_ICR_IE_1_3) << 15));
/* PCXI.UL = 1; */ /* PCXI.UL = 1; */
env->PCXI |= MASK_PCXI_UL; pcxi_set_ul(env, 1);
/* PCXI[19: 0] = FCX[19: 0]; */ /* PCXI[19: 0] = FCX[19: 0]; */
env->PCXI = (env->PCXI & 0xfff00000) + (env->FCX & 0xfffff); env->PCXI = (env->PCXI & 0xfff00000) + (env->FCX & 0xfffff);
@ -2506,7 +2503,7 @@ void helper_ret(CPUTriCoreState *env)
raise_exception_sync_helper(env, TRAPC_CTX_MNG, TIN3_CSU, GETPC()); raise_exception_sync_helper(env, TRAPC_CTX_MNG, TIN3_CSU, GETPC());
} }
/* if (PCXI.UL == 0) then trap(CTYP); */ /* if (PCXI.UL == 0) then trap(CTYP); */
if ((env->PCXI & MASK_PCXI_UL) == 0) { if (pcxi_get_ul(env) == 0) {
/* CTYP trap */ /* CTYP trap */
cdc_increment(&psw); /* restore to the start of helper */ cdc_increment(&psw); /* restore to the start of helper */
psw_write(env, psw); psw_write(env, psw);
@ -2516,8 +2513,8 @@ void helper_ret(CPUTriCoreState *env)
env->PC = env->gpr_a[11] & 0xfffffffe; env->PC = env->gpr_a[11] & 0xfffffffe;
/* EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0}; */ /* EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0}; */
ea = ((env->PCXI & MASK_PCXI_PCXS) << 12) + ea = (pcxi_get_pcxs(env) << 28) |
((env->PCXI & MASK_PCXI_PCXO) << 6); (pcxi_get_pcxo(env) << 6);
/* {new_PCXI, new_PSW, A[10], A[11], D[8], D[9], D[10], D[11], A[12], /* {new_PCXI, new_PSW, A[10], A[11], D[8], D[9], D[10], D[11], A[12],
A[13], A[14], A[15], D[12], D[13], D[14], D[15]} = M(EA, 16 * word); */ A[13], A[14], A[15], D[12], D[13], D[14], D[15]} = M(EA, 16 * word); */
restore_context_upper(env, ea, &new_PCXI, &new_PSW); restore_context_upper(env, ea, &new_PCXI, &new_PSW);
@ -2559,21 +2556,21 @@ void helper_bisr(CPUTriCoreState *env, uint32_t const9)
/* PCXI.PCPN = ICR.CCPN */ /* PCXI.PCPN = ICR.CCPN */
env->PCXI = (env->PCXI & 0xffffff) + pcxi_set_pcpn(env, icr_get_ccpn(env));
((env->ICR & MASK_ICR_CCPN) << 24);
/* PCXI.PIE = ICR.IE */ /* PCXI.PIE = ICR.IE */
env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE_1_3) + pcxi_set_pie(env, icr_get_ie(env));
((env->ICR & MASK_ICR_IE_1_3) << 15));
/* PCXI.UL = 0 */ /* PCXI.UL = 0 */
env->PCXI &= ~(MASK_PCXI_UL); pcxi_set_ul(env, 0);
/* PCXI[19: 0] = FCX[19: 0] */ /* PCXI[19: 0] = FCX[19: 0] */
env->PCXI = (env->PCXI & 0xfff00000) + (env->FCX & 0xfffff); env->PCXI = (env->PCXI & 0xfff00000) + (env->FCX & 0xfffff);
/* FXC[19: 0] = new_FCX[19: 0] */ /* FXC[19: 0] = new_FCX[19: 0] */
env->FCX = (env->FCX & 0xfff00000) + (new_FCX & 0xfffff); env->FCX = (env->FCX & 0xfff00000) + (new_FCX & 0xfffff);
/* ICR.IE = 1 */
env->ICR |= MASK_ICR_IE_1_3;
env->ICR |= const9; /* ICR.CCPN = const9[7: 0];*/ /* ICR.IE = 1 */
icr_set_ie(env, 1);
icr_set_ccpn(env, const9);
if (tmp_FCX == env->LCX) { if (tmp_FCX == env->LCX) {
/* FCD trap */ /* FCD trap */
@ -2592,7 +2589,7 @@ void helper_rfe(CPUTriCoreState *env)
raise_exception_sync_helper(env, TRAPC_CTX_MNG, TIN3_CSU, GETPC()); raise_exception_sync_helper(env, TRAPC_CTX_MNG, TIN3_CSU, GETPC());
} }
/* if (PCXI.UL == 0) then trap(CTYP); */ /* if (PCXI.UL == 0) then trap(CTYP); */
if ((env->PCXI & MASK_PCXI_UL) == 0) { if (pcxi_get_ul(env) == 0) {
/* raise CTYP trap */ /* raise CTYP trap */
raise_exception_sync_helper(env, TRAPC_CTX_MNG, TIN3_CTYP, GETPC()); raise_exception_sync_helper(env, TRAPC_CTX_MNG, TIN3_CTYP, GETPC());
} }
@ -2603,14 +2600,15 @@ void helper_rfe(CPUTriCoreState *env)
} }
env->PC = env->gpr_a[11] & ~0x1; env->PC = env->gpr_a[11] & ~0x1;
/* ICR.IE = PCXI.PIE; */ /* ICR.IE = PCXI.PIE; */
env->ICR = (env->ICR & ~MASK_ICR_IE_1_3) icr_set_ie(env, pcxi_get_pie(env));
+ ((env->PCXI & MASK_PCXI_PIE_1_3) >> 15);
/* ICR.CCPN = PCXI.PCPN; */ /* ICR.CCPN = PCXI.PCPN; */
env->ICR = (env->ICR & ~MASK_ICR_CCPN) + icr_set_ccpn(env, pcxi_get_pcpn(env));
((env->PCXI & MASK_PCXI_PCPN) >> 24);
/*EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0};*/ /*EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0};*/
ea = ((env->PCXI & MASK_PCXI_PCXS) << 12) + ea = (pcxi_get_pcxs(env) << 28) |
((env->PCXI & MASK_PCXI_PCXO) << 6); (pcxi_get_pcxo(env) << 6);
/*{new_PCXI, PSW, A[10], A[11], D[8], D[9], D[10], D[11], A[12], /*{new_PCXI, PSW, A[10], A[11], D[8], D[9], D[10], D[11], A[12],
A[13], A[14], A[15], D[12], D[13], D[14], D[15]} = M(EA, 16 * word); */ A[13], A[14], A[15], D[12], D[13], D[14], D[15]} = M(EA, 16 * word); */
restore_context_upper(env, ea, &new_PCXI, &new_PSW); restore_context_upper(env, ea, &new_PCXI, &new_PSW);
@ -2628,11 +2626,10 @@ void helper_rfm(CPUTriCoreState *env)
{ {
env->PC = (env->gpr_a[11] & ~0x1); env->PC = (env->gpr_a[11] & ~0x1);
/* ICR.IE = PCXI.PIE; */ /* ICR.IE = PCXI.PIE; */
env->ICR = (env->ICR & ~MASK_ICR_IE_1_3) icr_set_ie(env, pcxi_get_pie(env));
| ((env->PCXI & MASK_PCXI_PIE_1_3) >> 15);
/* ICR.CCPN = PCXI.PCPN; */ /* ICR.CCPN = PCXI.PCPN; */
env->ICR = (env->ICR & ~MASK_ICR_CCPN) | icr_set_ccpn(env, pcxi_get_pcpn(env));
((env->PCXI & MASK_PCXI_PCPN) >> 24);
/* {PCXI, PSW, A[10], A[11]} = M(DCX, 4 * word); */ /* {PCXI, PSW, A[10], A[11]} = M(DCX, 4 * word); */
env->PCXI = cpu_ldl_data(env, env->DCX); env->PCXI = cpu_ldl_data(env, env->DCX);
psw_write(env, cpu_ldl_data(env, env->DCX+4)); psw_write(env, cpu_ldl_data(env, env->DCX+4));
@ -2691,13 +2688,13 @@ void helper_svlcx(CPUTriCoreState *env)
save_context_lower(env, ea); save_context_lower(env, ea);
/* PCXI.PCPN = ICR.CCPN; */ /* PCXI.PCPN = ICR.CCPN; */
env->PCXI = (env->PCXI & 0xffffff) + pcxi_set_pcpn(env, icr_get_ccpn(env));
((env->ICR & MASK_ICR_CCPN) << 24);
/* PCXI.PIE = ICR.IE; */ /* PCXI.PIE = ICR.IE; */
env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE_1_3) + pcxi_set_pie(env, icr_get_ie(env));
((env->ICR & MASK_ICR_IE_1_3) << 15));
/* PCXI.UL = 0; */ /* PCXI.UL = 0; */
env->PCXI &= ~MASK_PCXI_UL; pcxi_set_ul(env, 0);
/* PCXI[19: 0] = FCX[19: 0]; */ /* PCXI[19: 0] = FCX[19: 0]; */
env->PCXI = (env->PCXI & 0xfff00000) + (env->FCX & 0xfffff); env->PCXI = (env->PCXI & 0xfff00000) + (env->FCX & 0xfffff);
@ -2734,13 +2731,13 @@ void helper_svucx(CPUTriCoreState *env)
save_context_upper(env, ea); save_context_upper(env, ea);
/* PCXI.PCPN = ICR.CCPN; */ /* PCXI.PCPN = ICR.CCPN; */
env->PCXI = (env->PCXI & 0xffffff) + pcxi_set_pcpn(env, icr_get_ccpn(env));
((env->ICR & MASK_ICR_CCPN) << 24);
/* PCXI.PIE = ICR.IE; */ /* PCXI.PIE = ICR.IE; */
env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE_1_3) + pcxi_set_pie(env, icr_get_ie(env));
((env->ICR & MASK_ICR_IE_1_3) << 15));
/* PCXI.UL = 1; */ /* PCXI.UL = 1; */
env->PCXI |= MASK_PCXI_UL; pcxi_set_ul(env, 1);
/* PCXI[19: 0] = FCX[19: 0]; */ /* PCXI[19: 0] = FCX[19: 0]; */
env->PCXI = (env->PCXI & 0xfff00000) + (env->FCX & 0xfffff); env->PCXI = (env->PCXI & 0xfff00000) + (env->FCX & 0xfffff);
@ -2764,13 +2761,15 @@ void helper_rslcx(CPUTriCoreState *env)
raise_exception_sync_helper(env, TRAPC_CTX_MNG, TIN3_CSU, GETPC()); raise_exception_sync_helper(env, TRAPC_CTX_MNG, TIN3_CSU, GETPC());
} }
/* if (PCXI.UL == 1) then trap(CTYP); */ /* if (PCXI.UL == 1) then trap(CTYP); */
if ((env->PCXI & MASK_PCXI_UL) != 0) { if (pcxi_get_ul(env) == 1) {
/* CTYP trap */ /* CTYP trap */
raise_exception_sync_helper(env, TRAPC_CTX_MNG, TIN3_CTYP, GETPC()); raise_exception_sync_helper(env, TRAPC_CTX_MNG, TIN3_CTYP, GETPC());
} }
/* EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0}; */ /* EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0}; */
ea = ((env->PCXI & MASK_PCXI_PCXS) << 12) + /* EA = {PCXI.PCXS, 6'b0, PCXI.PCXO, 6'b0}; */
((env->PCXI & MASK_PCXI_PCXO) << 6); ea = (pcxi_get_pcxs(env) << 28) |
(pcxi_get_pcxo(env) << 6);
/* {new_PCXI, A[11], A[10], A[11], D[8], D[9], D[10], D[11], A[12], /* {new_PCXI, A[11], A[10], A[11], D[8], D[9], D[10], D[11], A[12],
A[13], A[14], A[15], D[12], D[13], D[14], D[15]} = M(EA, 16 * word); */ A[13], A[14], A[15], D[12], D[13], D[14], D[15]} = M(EA, 16 * word); */
restore_context_lower(env, ea, &env->gpr_a[11], &new_PCXI); restore_context_lower(env, ea, &env->gpr_a[11], &new_PCXI);

10
target/tricore/translate.c
View File

@ -75,6 +75,7 @@ typedef struct DisasContext {
int mem_idx; int mem_idx;
uint32_t hflags, saved_hflags; uint32_t hflags, saved_hflags;
uint64_t features; uint64_t features;
uint32_t icr_ie_mask;
} DisasContext; } DisasContext;
static int has_feature(DisasContext *ctx, int feature) static int has_feature(DisasContext *ctx, int feature)
@ -7850,12 +7851,12 @@ static void decode_sys_interrupts(DisasContext *ctx)
/* raise EXCP_DEBUG */ /* raise EXCP_DEBUG */
break; break;
case OPC2_32_SYS_DISABLE: case OPC2_32_SYS_DISABLE:
tcg_gen_andi_tl(cpu_ICR, cpu_ICR, ~MASK_ICR_IE_1_3); tcg_gen_andi_tl(cpu_ICR, cpu_ICR, ~ctx->icr_ie_mask);
break; break;
case OPC2_32_SYS_DSYNC: case OPC2_32_SYS_DSYNC:
break; break;
case OPC2_32_SYS_ENABLE: case OPC2_32_SYS_ENABLE:
tcg_gen_ori_tl(cpu_ICR, cpu_ICR, MASK_ICR_IE_1_3); tcg_gen_ori_tl(cpu_ICR, cpu_ICR, ctx->icr_ie_mask);
break; break;
case OPC2_32_SYS_ISYNC: case OPC2_32_SYS_ISYNC:
break; break;
@ -8259,6 +8260,11 @@ static void tricore_tr_init_disas_context(DisasContextBase *dcbase,
ctx->mem_idx = cpu_mmu_index(env, false); ctx->mem_idx = cpu_mmu_index(env, false);
ctx->hflags = (uint32_t)ctx->base.tb->flags; ctx->hflags = (uint32_t)ctx->base.tb->flags;
ctx->features = env->features; ctx->features = env->features;
if (has_feature(ctx, TRICORE_FEATURE_161)) {
ctx->icr_ie_mask = R_ICR_IE_161_MASK;
} else {
ctx->icr_ie_mask = R_ICR_IE_13_MASK;
}
} }
static void tricore_tr_tb_start(DisasContextBase *db, CPUState *cpu) static void tricore_tr_tb_start(DisasContextBase *db, CPUState *cpu)