OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/microblaze: Split out EAR from env->sregs

Browse Source 
Continue eliminating the sregs array in favor of individual members.

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 21:46:10 -07:00
parent 2e5282caa8
commit b2e80a3c19
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/microblaze/cpu.h
View File

@ -238,6 +238,7 @@ struct CPUMBState {
uint32_t regs[32]; uint32_t regs[32];
uint64_t pc; uint64_t pc;
uint64_t msr; uint64_t msr;
uint64_t ear;
uint64_t sregs[14]; uint64_t sregs[14];
float_status fp_status; float_status fp_status;
/* Stack protectors. Yes, it's a hw feature. */ /* Stack protectors. Yes, it's a hw feature. */

4
target/microblaze/gdbstub.c
View File

@ -65,7 +65,7 @@ int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
val = env->msr; val = env->msr;
break; break;
case GDB_EAR: case GDB_EAR:
val = env->sregs[SR_EAR]; val = env->ear;
break; break;
case GDB_ESR: case GDB_ESR:
val = env->sregs[SR_ESR]; val = env->sregs[SR_ESR];
@ -121,7 +121,7 @@ int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
env->msr = tmp; env->msr = tmp;
break; break;
case GDB_EAR: case GDB_EAR:
env->sregs[SR_EAR] = tmp; env->ear = tmp;
break; break;
case GDB_ESR: case GDB_ESR:
env->sregs[SR_ESR] = tmp; env->sregs[SR_ESR] = tmp;

6
target/microblaze/helper.c
View File

@ -85,7 +85,7 @@ bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
qemu_log_mask(CPU_LOG_MMU, "mmu=%d miss v=%" VADDR_PRIx "\n", qemu_log_mask(CPU_LOG_MMU, "mmu=%d miss v=%" VADDR_PRIx "\n",
mmu_idx, address); mmu_idx, address);
env->sregs[SR_EAR] = address; env->ear = address;
switch (lu.err) { switch (lu.err) {
case ERR_PROT: case ERR_PROT:
env->sregs[SR_ESR] = access_type == MMU_INST_FETCH ? 17 : 16; env->sregs[SR_ESR] = access_type == MMU_INST_FETCH ? 17 : 16;
@ -145,7 +145,7 @@ void mb_cpu_do_interrupt(CPUState *cs)
qemu_log_mask(CPU_LOG_INT, qemu_log_mask(CPU_LOG_INT,
"hw exception at pc=%" PRIx64 " ear=%" PRIx64 " " "hw exception at pc=%" PRIx64 " ear=%" PRIx64 " "
"esr=%" PRIx64 " iflags=%x\n", "esr=%" PRIx64 " iflags=%x\n",
env->pc, env->sregs[SR_EAR], env->pc, env->ear,
env->sregs[SR_ESR], env->iflags); env->sregs[SR_ESR], env->iflags);
log_cpu_state_mask(CPU_LOG_INT, cs, 0); log_cpu_state_mask(CPU_LOG_INT, cs, 0);
env->iflags &= ~(IMM_FLAG | D_FLAG); env->iflags &= ~(IMM_FLAG | D_FLAG);
@ -188,7 +188,7 @@ void mb_cpu_do_interrupt(CPUState *cs)
qemu_log_mask(CPU_LOG_INT, qemu_log_mask(CPU_LOG_INT,
"exception at pc=%" PRIx64 " ear=%" PRIx64 " " "exception at pc=%" PRIx64 " ear=%" PRIx64 " "
"iflags=%x\n", "iflags=%x\n",
env->pc, env->sregs[SR_EAR], env->iflags); env->pc, env->ear, env->iflags);
log_cpu_state_mask(CPU_LOG_INT, cs, 0); log_cpu_state_mask(CPU_LOG_INT, cs, 0);
env->iflags &= ~(IMM_FLAG | D_FLAG); env->iflags &= ~(IMM_FLAG | D_FLAG);
env->pc = cpu->cfg.base_vectors + 0x20; env->pc = cpu->cfg.base_vectors + 0x20;

8
target/microblaze/op_helper.c
View File

@ -78,7 +78,7 @@ void helper_debug(CPUMBState *env)
qemu_log("PC=%" PRIx64 "\n", env->pc); qemu_log("PC=%" PRIx64 "\n", env->pc);
qemu_log("rmsr=%" PRIx64 " resr=%" PRIx64 " rear=%" PRIx64 " " qemu_log("rmsr=%" PRIx64 " resr=%" PRIx64 " rear=%" PRIx64 " "
"debug[%x] imm=%x iflags=%x\n", "debug[%x] imm=%x iflags=%x\n",
env->msr, env->sregs[SR_ESR], env->sregs[SR_EAR], env->msr, env->sregs[SR_ESR], env->ear,
env->debug, env->imm, env->iflags); env->debug, env->imm, env->iflags);
qemu_log("btaken=%d btarget=%" PRIx64 " mode=%s(saved=%s) eip=%d ie=%d\n", qemu_log("btaken=%d btarget=%" PRIx64 " mode=%s(saved=%s) eip=%d ie=%d\n",
env->btaken, env->btarget, env->btaken, env->btarget,
@ -431,7 +431,7 @@ void helper_memalign(CPUMBState *env, target_ulong addr,
"unaligned access addr=" TARGET_FMT_lx "unaligned access addr=" TARGET_FMT_lx
" mask=%x, wr=%d dr=r%d\n", " mask=%x, wr=%d dr=r%d\n",
addr, mask, wr, dr); addr, mask, wr, dr);
env->sregs[SR_EAR] = addr; env->ear = addr;
env->sregs[SR_ESR] = ESR_EC_UNALIGNED_DATA | (wr << 10) \ env->sregs[SR_ESR] = ESR_EC_UNALIGNED_DATA | (wr << 10) \
| (dr & 31) << 5; | (dr & 31) << 5;
if (mask == 3) { if (mask == 3) {
@ -450,7 +450,7 @@ void helper_stackprot(CPUMBState *env, target_ulong addr)
qemu_log_mask(CPU_LOG_INT, "Stack protector violation at " qemu_log_mask(CPU_LOG_INT, "Stack protector violation at "
TARGET_FMT_lx " %x %x\n", TARGET_FMT_lx " %x %x\n",
addr, env->slr, env->shr); addr, env->slr, env->shr);
env->sregs[SR_EAR] = addr; env->ear = addr;
env->sregs[SR_ESR] = ESR_EC_STACKPROT; env->sregs[SR_ESR] = ESR_EC_STACKPROT;
helper_raise_exception(env, EXCP_HW_EXCP); helper_raise_exception(env, EXCP_HW_EXCP);
} }
@ -488,7 +488,7 @@ void mb_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr,
return; return;
} }
env->sregs[SR_EAR] = addr; env->ear = addr;
if (access_type == MMU_INST_FETCH) { if (access_type == MMU_INST_FETCH) {
if ((env->pvr.regs[2] & PVR2_IOPB_BUS_EXC_MASK)) { if ((env->pvr.regs[2] & PVR2_IOPB_BUS_EXC_MASK)) {
env->sregs[SR_ESR] = ESR_EC_INSN_BUS; env->sregs[SR_ESR] = ESR_EC_INSN_BUS;

6
target/microblaze/translate.c
View File

@ -1809,7 +1809,7 @@ void mb_cpu_dump_state(CPUState *cs, FILE *f, int flags)
qemu_fprintf(f, "rmsr=%" PRIx64 " resr=%" PRIx64 " rear=%" PRIx64 " " qemu_fprintf(f, "rmsr=%" PRIx64 " 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->sregs[SR_ESR], env->sregs[SR_EAR], env->msr, env->sregs[SR_ESR], env->ear,
env->debug, env->imm, env->iflags, env->sregs[SR_FSR], env->debug, env->imm, env->iflags, env->sregs[SR_FSR],
env->sregs[SR_BTR]); env->sregs[SR_BTR]);
qemu_fprintf(f, "btaken=%d btarget=%" PRIx64 " mode=%s(saved=%s) " qemu_fprintf(f, "btaken=%d btarget=%" PRIx64 " mode=%s(saved=%s) "
@ -1873,8 +1873,10 @@ void mb_tcg_init(void)
tcg_global_mem_new_i64(cpu_env, offsetof(CPUMBState, pc), "rpc"); tcg_global_mem_new_i64(cpu_env, offsetof(CPUMBState, pc), "rpc");
cpu_SR[SR_MSR] = cpu_SR[SR_MSR] =
tcg_global_mem_new_i64(cpu_env, offsetof(CPUMBState, msr), "rmsr"); tcg_global_mem_new_i64(cpu_env, offsetof(CPUMBState, msr), "rmsr");
cpu_SR[SR_EAR] =
tcg_global_mem_new_i64(cpu_env, offsetof(CPUMBState, ear), "rear");
for (i = SR_MSR + 1; i < ARRAY_SIZE(cpu_SR); i++) { for (i = SR_EAR + 1; i < ARRAY_SIZE(cpu_SR); i++) {
cpu_SR[i] = tcg_global_mem_new_i64(cpu_env, cpu_SR[i] = tcg_global_mem_new_i64(cpu_env,
offsetof(CPUMBState, sregs[i]), offsetof(CPUMBState, sregs[i]),
special_regnames[i]); special_regnames[i]);