[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/13] target/openrisc: Merge disas_openrisc_insn
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 13/13] target/openrisc: Merge disas_openrisc_insn |
Date: |
Thu, 3 May 2018 22:40:30 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target/openrisc/translate.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c
index 66e493220e..3866106bf6 100644
--- a/target/openrisc/translate.c
+++ b/target/openrisc/translate.c
@@ -1373,14 +1373,6 @@ static bool trans_lf_sfle_s(DisasContext *dc, arg_ab *a,
uint32_t insn)
return true;
}
-static void disas_openrisc_insn(DisasContext *dc, OpenRISCCPU *cpu)
-{
- uint32_t insn = cpu_ldl_code(&cpu->env, dc->pc);
- if (!decode(dc, insn)) {
- gen_illegal_exception(dc);
- }
-}
-
void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
{
CPUOpenRISCState *env = cs->env_ptr;
@@ -1388,6 +1380,7 @@ void gen_intermediate_code(CPUState *cs, struct
TranslationBlock *tb)
struct DisasContext ctx, *dc = &ctx;
uint32_t pc_start;
uint32_t next_page_start;
+ uint32_t insn;
int num_insns;
int max_insns;
@@ -1449,7 +1442,11 @@ void gen_intermediate_code(CPUState *cs, struct
TranslationBlock *tb)
if (num_insns == max_insns && (tb_cflags(tb) & CF_LAST_IO)) {
gen_io_start();
}
- disas_openrisc_insn(dc, cpu);
+
+ insn = cpu_ldl_code(&cpu->env, dc->pc);
+ if (!decode(dc, insn)) {
+ gen_illegal_exception(dc);
+ }
dc->pc = dc->pc + 4;
/* delay slot */
--
2.14.3
- [Qemu-devel] [PATCH 08/13] target/openrisc: Convert dec_logic, (continued)
- [Qemu-devel] [PATCH 08/13] target/openrisc: Convert dec_logic, Richard Henderson, 2018/05/04
- [Qemu-devel] [PATCH 06/13] target/openrisc: Convert dec_calc, Richard Henderson, 2018/05/04
- [Qemu-devel] [PATCH 09/13] target/openrisc: Convert dec_M, Richard Henderson, 2018/05/04
- [Qemu-devel] [PATCH 07/13] target/openrisc: Convert dec_mac, Richard Henderson, 2018/05/04
- [Qemu-devel] [PATCH 11/13] target/openrisc: Convert dec_compi, Richard Henderson, 2018/05/04
- [Qemu-devel] [PATCH 13/13] target/openrisc: Merge disas_openrisc_insn,
Richard Henderson <=
- [Qemu-devel] [PATCH 10/13] target/openrisc: Convert dec_comp, Richard Henderson, 2018/05/04
- [Qemu-devel] [PATCH 12/13] target/openrisc: Convert dec_float, Richard Henderson, 2018/05/04
- Re: [Qemu-devel] [PATCH 00/13] target/openrisc: Convert to decodetree.py, Stafford Horne, 2018/05/05