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

target-microblaze: Break out trap_userspace() 

Break out trap_userspace() to avoid open coding it everywhere.
For privileged insns, we now always stop translation of the
current insn for cores without exceptions.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
This commit is contained in:
Edgar E. Iglesias 2018-04-13 23:02:41 +02:00
parent 0031eef23a
commit bdfc1e8869
1 changed files with 27 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
target/microblaze/translate.c
View File

@ -179,6 +179,22 @@ static void write_carryi(DisasContext *dc, bool carry)
tcg_temp_free_i32(t0); tcg_temp_free_i32(t0);
} }
/*
* Returns true if the insn is illegal in userspace.
* If exceptions are enabled, an exception is raised.
*/
static bool trap_userspace(DisasContext *dc, bool cond)
{
int mem_index = cpu_mmu_index(&dc->cpu->env, false);
bool cond_user = cond && mem_index == MMU_USER_IDX;
if (cond_user && (dc->tb_flags & MSR_EE_FLAG)) {
tcg_gen_movi_i32(cpu_SR[SR_ESR], ESR_EC_PRIVINSN);
t_gen_raise_exception(dc, EXCP_HW_EXCP);
}
return cond_user;
}
/* True if ALU operand b is a small immediate that may deserve /* True if ALU operand b is a small immediate that may deserve
faster treatment. */ faster treatment. */
static inline int dec_alu_op_b_is_small_imm(DisasContext *dc) static inline int dec_alu_op_b_is_small_imm(DisasContext *dc)
@ -432,7 +448,6 @@ static void dec_msr(DisasContext *dc)
CPUState *cs = CPU(dc->cpu); CPUState *cs = CPU(dc->cpu);
TCGv_i32 t0, t1; TCGv_i32 t0, t1;
unsigned int sr, to, rn; unsigned int sr, to, rn;
int mem_index = cpu_mmu_index(&dc->cpu->env, false);
sr = dc->imm & ((1 << 14) - 1); sr = dc->imm & ((1 << 14) - 1);
to = dc->imm & (1 << 14); to = dc->imm & (1 << 14);
@ -452,10 +467,7 @@ static void dec_msr(DisasContext *dc)
return; return;
} }
if ((dc->tb_flags & MSR_EE_FLAG) if (trap_userspace(dc, dc->imm != 4 && dc->imm != 0)) {
&& mem_index == MMU_USER_IDX && (dc->imm != 4 && dc->imm != 0)) {
tcg_gen_movi_i32(cpu_SR[SR_ESR], ESR_EC_PRIVINSN);
t_gen_raise_exception(dc, EXCP_HW_EXCP);
return; return;
} }
@ -480,13 +492,8 @@ static void dec_msr(DisasContext *dc)
return; return;
} }
if (to) { if (trap_userspace(dc, to)) {
if ((dc->tb_flags & MSR_EE_FLAG) return;
&& mem_index == MMU_USER_IDX) {
tcg_gen_movi_i32(cpu_SR[SR_ESR], ESR_EC_PRIVINSN);
t_gen_raise_exception(dc, EXCP_HW_EXCP);
return;
}
} }
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
@ -738,7 +745,6 @@ static void dec_bit(DisasContext *dc)
CPUState *cs = CPU(dc->cpu); CPUState *cs = CPU(dc->cpu);
TCGv_i32 t0; TCGv_i32 t0;
unsigned int op; unsigned int op;
int mem_index = cpu_mmu_index(&dc->cpu->env, false);
op = dc->ir & ((1 << 9) - 1); op = dc->ir & ((1 << 9) - 1);
switch (op) { switch (op) {
@ -784,22 +790,12 @@ static void dec_bit(DisasContext *dc)
case 0x76: case 0x76:
/* wdc. */ /* wdc. */
LOG_DIS("wdc r%d\n", dc->ra); LOG_DIS("wdc r%d\n", dc->ra);
if ((dc->tb_flags & MSR_EE_FLAG) trap_userspace(dc, true);
&& mem_index == MMU_USER_IDX) {
tcg_gen_movi_i32(cpu_SR[SR_ESR], ESR_EC_PRIVINSN);
t_gen_raise_exception(dc, EXCP_HW_EXCP);
return;
}
break; break;
case 0x68: case 0x68:
/* wic. */ /* wic. */
LOG_DIS("wic r%d\n", dc->ra); LOG_DIS("wic r%d\n", dc->ra);
if ((dc->tb_flags & MSR_EE_FLAG) trap_userspace(dc, true);
&& mem_index == MMU_USER_IDX) {
tcg_gen_movi_i32(cpu_SR[SR_ESR], ESR_EC_PRIVINSN);
t_gen_raise_exception(dc, EXCP_HW_EXCP);
return;
}
break; break;
case 0xe0: case 0xe0:
if ((dc->tb_flags & MSR_EE_FLAG) if ((dc->tb_flags & MSR_EE_FLAG)
@ -1199,7 +1195,6 @@ static void dec_bcc(DisasContext *dc)
static void dec_br(DisasContext *dc) static void dec_br(DisasContext *dc)
{ {
unsigned int dslot, link, abs, mbar; unsigned int dslot, link, abs, mbar;
int mem_index = cpu_mmu_index(&dc->cpu->env, false);
dslot = dc->ir & (1 << 20); dslot = dc->ir & (1 << 20);
abs = dc->ir & (1 << 19); abs = dc->ir & (1 << 19);
@ -1254,9 +1249,7 @@ static void dec_br(DisasContext *dc)
if (!(dc->tb_flags & IMM_FLAG) && (dc->imm == 8 || dc->imm == 0x18)) if (!(dc->tb_flags & IMM_FLAG) && (dc->imm == 8 || dc->imm == 0x18))
t_gen_raise_exception(dc, EXCP_BREAK); t_gen_raise_exception(dc, EXCP_BREAK);
if (dc->imm == 0) { if (dc->imm == 0) {
if ((dc->tb_flags & MSR_EE_FLAG) && mem_index == MMU_USER_IDX) { if (trap_userspace(dc, true)) {
tcg_gen_movi_i32(cpu_SR[SR_ESR], ESR_EC_PRIVINSN);
t_gen_raise_exception(dc, EXCP_HW_EXCP);
return; return;
} }
@ -1331,12 +1324,15 @@ static inline void do_rte(DisasContext *dc)
static void dec_rts(DisasContext *dc) static void dec_rts(DisasContext *dc)
{ {
unsigned int b_bit, i_bit, e_bit; unsigned int b_bit, i_bit, e_bit;
int mem_index = cpu_mmu_index(&dc->cpu->env, false);
i_bit = dc->ir & (1 << 21); i_bit = dc->ir & (1 << 21);
b_bit = dc->ir & (1 << 22); b_bit = dc->ir & (1 << 22);
e_bit = dc->ir & (1 << 23); e_bit = dc->ir & (1 << 23);
if (trap_userspace(dc, i_bit || b_bit || e_bit)) {
return;
}
dc->delayed_branch = 2; dc->delayed_branch = 2;
dc->tb_flags |= D_FLAG; dc->tb_flags |= D_FLAG;
tcg_gen_st_i32(tcg_const_i32(dc->type_b && (dc->tb_flags & IMM_FLAG)), tcg_gen_st_i32(tcg_const_i32(dc->type_b && (dc->tb_flags & IMM_FLAG)),
@ -1344,27 +1340,12 @@ static void dec_rts(DisasContext *dc)
if (i_bit) { if (i_bit) {
LOG_DIS("rtid ir=%x\n", dc->ir); LOG_DIS("rtid ir=%x\n", dc->ir);
if ((dc->tb_flags & MSR_EE_FLAG)
&& mem_index == MMU_USER_IDX) {
tcg_gen_movi_i32(cpu_SR[SR_ESR], ESR_EC_PRIVINSN);
t_gen_raise_exception(dc, EXCP_HW_EXCP);
}
dc->tb_flags |= DRTI_FLAG; dc->tb_flags |= DRTI_FLAG;
} else if (b_bit) { } else if (b_bit) {
LOG_DIS("rtbd ir=%x\n", dc->ir); LOG_DIS("rtbd ir=%x\n", dc->ir);
if ((dc->tb_flags & MSR_EE_FLAG)
&& mem_index == MMU_USER_IDX) {
tcg_gen_movi_i32(cpu_SR[SR_ESR], ESR_EC_PRIVINSN);
t_gen_raise_exception(dc, EXCP_HW_EXCP);
}
dc->tb_flags |= DRTB_FLAG; dc->tb_flags |= DRTB_FLAG;
} else if (e_bit) { } else if (e_bit) {
LOG_DIS("rted ir=%x\n", dc->ir); LOG_DIS("rted ir=%x\n", dc->ir);
if ((dc->tb_flags & MSR_EE_FLAG)
&& mem_index == MMU_USER_IDX) {
tcg_gen_movi_i32(cpu_SR[SR_ESR], ESR_EC_PRIVINSN);
t_gen_raise_exception(dc, EXCP_HW_EXCP);
}
dc->tb_flags |= DRTE_FLAG; dc->tb_flags |= DRTE_FLAG;
} else } else
LOG_DIS("rts ir=%x\n", dc->ir); LOG_DIS("rts ir=%x\n", dc->ir);
@ -1503,16 +1484,13 @@ static void dec_null(DisasContext *dc)
/* Insns connected to FSL or AXI stream attached devices. */ /* Insns connected to FSL or AXI stream attached devices. */
static void dec_stream(DisasContext *dc) static void dec_stream(DisasContext *dc)
{ {
int mem_index = cpu_mmu_index(&dc->cpu->env, false);
TCGv_i32 t_id, t_ctrl; TCGv_i32 t_id, t_ctrl;
int ctrl; int ctrl;
LOG_DIS("%s%s imm=%x\n", dc->rd ? "get" : "put", LOG_DIS("%s%s imm=%x\n", dc->rd ? "get" : "put",
dc->type_b ? "" : "d", dc->imm); dc->type_b ? "" : "d", dc->imm);
if ((dc->tb_flags & MSR_EE_FLAG) && (mem_index == MMU_USER_IDX)) { if (trap_userspace(dc, true)) {
tcg_gen_movi_i32(cpu_SR[SR_ESR], ESR_EC_PRIVINSN);
t_gen_raise_exception(dc, EXCP_HW_EXCP);
return; return;
} }