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

target/microblaze: Fix width of MSR 

The machine status register is only 32-bits wide.
Do not use a 64-bit type to represent it.

Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2020-08-19 22:33:37 -07:00
parent 0f96e96bd5
commit 3e0e16ae1e
4 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/microblaze/cpu.h
View File

@ -237,7 +237,7 @@ struct CPUMBState {
uint32_t imm; uint32_t imm;
uint32_t regs[32]; uint32_t regs[32];
uint32_t pc; uint32_t pc;
uint64_t msr; uint32_t msr;
uint64_t ear; uint64_t ear;
uint64_t esr; uint64_t esr;
uint64_t fsr; uint64_t fsr;

4
target/microblaze/helper.c
View File

@ -222,7 +222,7 @@ void mb_cpu_do_interrupt(CPUState *cs)
} }
#endif #endif
qemu_log_mask(CPU_LOG_INT, qemu_log_mask(CPU_LOG_INT,
"interrupt at pc=%x msr=%" PRIx64 " %x iflags=%x\n", "interrupt at pc=%x msr=%x %x iflags=%x\n",
env->pc, env->msr, t, env->iflags); env->pc, env->msr, t, env->iflags);
env->msr &= ~(MSR_VMS | MSR_UMS | MSR_VM | MSR_UM | MSR_IE); env->msr &= ~(MSR_VMS | MSR_UMS | MSR_VM | MSR_UM | MSR_IE);
@ -239,7 +239,7 @@ void mb_cpu_do_interrupt(CPUState *cs)
assert(!(env->iflags & D_FLAG)); assert(!(env->iflags & D_FLAG));
t = (env->msr & (MSR_VM | MSR_UM)) << 1; t = (env->msr & (MSR_VM | MSR_UM)) << 1;
qemu_log_mask(CPU_LOG_INT, qemu_log_mask(CPU_LOG_INT,
"break at pc=%x msr=%" PRIx64 " %x iflags=%x\n", "break at pc=%x msr=%x %x iflags=%x\n",
env->pc, env->msr, t, env->iflags); env->pc, env->msr, t, env->iflags);
log_cpu_state_mask(CPU_LOG_INT, cs, 0); log_cpu_state_mask(CPU_LOG_INT, cs, 0);
env->msr &= ~(MSR_VMS | MSR_UMS | MSR_VM | MSR_UM); env->msr &= ~(MSR_VMS | MSR_UMS | MSR_VM | MSR_UM);

2
target/microblaze/op_helper.c
View File

@ -76,7 +76,7 @@ void helper_debug(CPUMBState *env)
int i; int i;
qemu_log("PC=%08x\n", env->pc); qemu_log("PC=%08x\n", env->pc);
qemu_log("rmsr=%" PRIx64 " resr=%" PRIx64 " rear=%" PRIx64 " " qemu_log("rmsr=%x resr=%" PRIx64 " rear=%" PRIx64 " "
"debug[%x] imm=%x iflags=%x\n", "debug[%x] imm=%x iflags=%x\n",
env->msr, env->esr, env->ear, env->msr, env->esr, env->ear,
env->debug, env->imm, env->iflags); env->debug, env->imm, env->iflags);

38
target/microblaze/translate.c
View File

@ -56,7 +56,7 @@
static TCGv_i32 env_debug; static TCGv_i32 env_debug;
static TCGv_i32 cpu_R[32]; static TCGv_i32 cpu_R[32];
static TCGv_i32 cpu_pc; static TCGv_i32 cpu_pc;
static TCGv_i64 cpu_msr; static TCGv_i32 cpu_msr;
static TCGv_i64 cpu_ear; static TCGv_i64 cpu_ear;
static TCGv_i64 cpu_esr; static TCGv_i64 cpu_esr;
static TCGv_i64 cpu_fsr; static TCGv_i64 cpu_fsr;
@ -152,8 +152,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest)
static void read_carry(DisasContext *dc, TCGv_i32 d) static void read_carry(DisasContext *dc, TCGv_i32 d)
{ {
tcg_gen_extrl_i64_i32(d, cpu_msr); tcg_gen_shri_i32(d, cpu_msr, 31);
tcg_gen_shri_i32(d, d, 31);
} }
/* /*
@ -162,12 +161,9 @@ static void read_carry(DisasContext *dc, TCGv_i32 d)
*/ */
static void write_carry(DisasContext *dc, TCGv_i32 v) static void write_carry(DisasContext *dc, TCGv_i32 v)
{ {
TCGv_i64 t0 = tcg_temp_new_i64();
tcg_gen_extu_i32_i64(t0, v);
/* Deposit bit 0 into MSR_C and the alias MSR_CC. */ /* Deposit bit 0 into MSR_C and the alias MSR_CC. */
tcg_gen_deposit_i64(cpu_msr, cpu_msr, t0, 2, 1); tcg_gen_deposit_i32(cpu_msr, cpu_msr, v, 2, 1);
tcg_gen_deposit_i64(cpu_msr, cpu_msr, t0, 31, 1); tcg_gen_deposit_i32(cpu_msr, cpu_msr, v, 31, 1);
tcg_temp_free_i64(t0);
} }
static void write_carryi(DisasContext *dc, bool carry) static void write_carryi(DisasContext *dc, bool carry)
@ -437,21 +433,14 @@ static void dec_xor(DisasContext *dc)
static inline void msr_read(DisasContext *dc, TCGv_i32 d) static inline void msr_read(DisasContext *dc, TCGv_i32 d)
{ {
tcg_gen_extrl_i64_i32(d, cpu_msr); tcg_gen_mov_i32(d, cpu_msr);
} }
static inline void msr_write(DisasContext *dc, TCGv_i32 v) static inline void msr_write(DisasContext *dc, TCGv_i32 v)
{ {
TCGv_i64 t;
t = tcg_temp_new_i64();
dc->cpustate_changed = 1; dc->cpustate_changed = 1;
/* PVR bit is not writable. */ /* PVR bit is not writable, and is never set. */
tcg_gen_extu_i32_i64(t, v); tcg_gen_andi_i32(cpu_msr, v, ~MSR_PVR);
tcg_gen_andi_i64(t, t, ~MSR_PVR);
tcg_gen_andi_i64(cpu_msr, cpu_msr, MSR_PVR);
tcg_gen_or_i64(cpu_msr, cpu_msr, t);
tcg_temp_free_i64(t);
} }
static void dec_msr(DisasContext *dc) static void dec_msr(DisasContext *dc)
@ -773,8 +762,7 @@ static void dec_bit(DisasContext *dc)
t0 = tcg_temp_new_i32(); t0 = tcg_temp_new_i32();
LOG_DIS("src r%d r%d\n", dc->rd, dc->ra); LOG_DIS("src r%d r%d\n", dc->rd, dc->ra);
tcg_gen_extrl_i64_i32(t0, cpu_msr); tcg_gen_andi_i32(t0, cpu_msr, MSR_CC);
tcg_gen_andi_i32(t0, t0, MSR_CC);
write_carry(dc, cpu_R[dc->ra]); write_carry(dc, cpu_R[dc->ra]);
if (dc->rd) { if (dc->rd) {
tcg_gen_shri_i32(cpu_R[dc->rd], cpu_R[dc->ra], 1); tcg_gen_shri_i32(cpu_R[dc->rd], cpu_R[dc->ra], 1);
@ -1326,7 +1314,7 @@ static inline void do_rti(DisasContext *dc)
TCGv_i32 t0, t1; TCGv_i32 t0, t1;
t0 = tcg_temp_new_i32(); t0 = tcg_temp_new_i32();
t1 = tcg_temp_new_i32(); t1 = tcg_temp_new_i32();
tcg_gen_extrl_i64_i32(t1, cpu_msr); tcg_gen_mov_i32(t1, cpu_msr);
tcg_gen_shri_i32(t0, t1, 1); tcg_gen_shri_i32(t0, t1, 1);
tcg_gen_ori_i32(t1, t1, MSR_IE); tcg_gen_ori_i32(t1, t1, MSR_IE);
tcg_gen_andi_i32(t0, t0, (MSR_VM | MSR_UM)); tcg_gen_andi_i32(t0, t0, (MSR_VM | MSR_UM));
@ -1344,7 +1332,7 @@ static inline void do_rtb(DisasContext *dc)
TCGv_i32 t0, t1; TCGv_i32 t0, t1;
t0 = tcg_temp_new_i32(); t0 = tcg_temp_new_i32();
t1 = tcg_temp_new_i32(); t1 = tcg_temp_new_i32();
tcg_gen_extrl_i64_i32(t1, cpu_msr); tcg_gen_mov_i32(t1, cpu_msr);
tcg_gen_andi_i32(t1, t1, ~MSR_BIP); tcg_gen_andi_i32(t1, t1, ~MSR_BIP);
tcg_gen_shri_i32(t0, t1, 1); tcg_gen_shri_i32(t0, t1, 1);
tcg_gen_andi_i32(t0, t0, (MSR_VM | MSR_UM)); tcg_gen_andi_i32(t0, t0, (MSR_VM | MSR_UM));
@ -1363,7 +1351,7 @@ static inline void do_rte(DisasContext *dc)
t0 = tcg_temp_new_i32(); t0 = tcg_temp_new_i32();
t1 = tcg_temp_new_i32(); t1 = tcg_temp_new_i32();
tcg_gen_extrl_i64_i32(t1, cpu_msr); tcg_gen_mov_i32(t1, cpu_msr);
tcg_gen_ori_i32(t1, t1, MSR_EE); tcg_gen_ori_i32(t1, t1, MSR_EE);
tcg_gen_andi_i32(t1, t1, ~MSR_EIP); tcg_gen_andi_i32(t1, t1, ~MSR_EIP);
tcg_gen_shri_i32(t0, t1, 1); tcg_gen_shri_i32(t0, t1, 1);
@ -1809,7 +1797,7 @@ void mb_cpu_dump_state(CPUState *cs, FILE *f, int flags)
qemu_fprintf(f, "IN: PC=%x %s\n", qemu_fprintf(f, "IN: PC=%x %s\n",
env->pc, lookup_symbol(env->pc)); env->pc, lookup_symbol(env->pc));
qemu_fprintf(f, "rmsr=%" PRIx64 " resr=%" PRIx64 " rear=%" PRIx64 " " qemu_fprintf(f, "rmsr=%x resr=%" PRIx64 " rear=%" PRIx64 " "
"debug=%x imm=%x iflags=%x fsr=%" PRIx64 " " "debug=%x imm=%x iflags=%x fsr=%" PRIx64 " "
"rbtr=%" PRIx64 "\n", "rbtr=%" PRIx64 "\n",
env->msr, env->esr, env->ear, env->msr, env->esr, env->ear,
@ -1874,7 +1862,7 @@ void mb_tcg_init(void)
cpu_pc = cpu_pc =
tcg_global_mem_new_i32(cpu_env, offsetof(CPUMBState, pc), "rpc"); tcg_global_mem_new_i32(cpu_env, offsetof(CPUMBState, pc), "rpc");
cpu_msr = cpu_msr =
tcg_global_mem_new_i64(cpu_env, offsetof(CPUMBState, msr), "rmsr"); tcg_global_mem_new_i32(cpu_env, offsetof(CPUMBState, msr), "rmsr");
cpu_ear = cpu_ear =
tcg_global_mem_new_i64(cpu_env, offsetof(CPUMBState, ear), "rear"); tcg_global_mem_new_i64(cpu_env, offsetof(CPUMBState, ear), "rear");
cpu_esr = cpu_esr =