SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/microblaze: Replace MSR_EE_FLAG with MSR_EE

Browse Source 
There's no reason to define MSR_EE_FLAG; we can just use the
original MSR_EE define.  Document the other flags copied into
tb_flags with iflag to reserve those bits.

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 16:12:12 -07:00
parent 3986c650a2
commit 2c32179f39
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/microblaze/cpu.h
View File

@ -254,7 +254,9 @@ struct CPUMBState {
/* Internal flags. */ /* Internal flags. */
#define IMM_FLAG 4 #define IMM_FLAG 4
#define MSR_EE_FLAG (1 << 8) /* MSR_EE (1 << 8) */
/* MSR_UM (1 << 11) */
/* MSR_VM (1 << 13) */
#define DRTI_FLAG (1 << 16) #define DRTI_FLAG (1 << 16)
#define DRTE_FLAG (1 << 17) #define DRTE_FLAG (1 << 17)
#define DRTB_FLAG (1 << 18) #define DRTB_FLAG (1 << 18)

4
target/microblaze/translate.c
View File

@ -162,7 +162,7 @@ static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest)
*/ */
static bool trap_illegal(DisasContext *dc, bool cond) static bool trap_illegal(DisasContext *dc, bool cond)
{ {
if (cond && (dc->tb_flags & MSR_EE_FLAG) if (cond && (dc->tb_flags & MSR_EE)
&& dc->cpu->cfg.illegal_opcode_exception) { && dc->cpu->cfg.illegal_opcode_exception) {
gen_raise_hw_excp(dc, ESR_EC_ILLEGAL_OP); gen_raise_hw_excp(dc, ESR_EC_ILLEGAL_OP);
} }
@ -178,7 +178,7 @@ static bool trap_userspace(DisasContext *dc, bool cond)
int mem_index = cpu_mmu_index(&dc->cpu->env, false); int mem_index = cpu_mmu_index(&dc->cpu->env, false);
bool cond_user = cond && mem_index == MMU_USER_IDX; bool cond_user = cond && mem_index == MMU_USER_IDX;
if (cond_user && (dc->tb_flags & MSR_EE_FLAG)) { if (cond_user && (dc->tb_flags & MSR_EE)) {
gen_raise_hw_excp(dc, ESR_EC_PRIVINSN); gen_raise_hw_excp(dc, ESR_EC_PRIVINSN);
} }
return cond_user; return cond_user;