[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 9/9] target/m68k: Merge disas_m68k_insn into m68k_tr_
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 9/9] target/m68k: Merge disas_m68k_insn into m68k_tr_translate_insn |
Date: |
Mon, 11 Jun 2018 12:49:35 +0200 |
From: Richard Henderson <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
target/m68k/translate.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index ff3493d8ab..ae3651b867 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -6049,16 +6049,6 @@ void register_m68k_insns (CPUM68KState *env)
#undef INSN
}
-/* ??? Some of this implementation is not exception safe. We should always
- write back the result to memory before setting the condition codes. */
-static void disas_m68k_insn(CPUM68KState * env, DisasContext *s)
-{
- uint16_t insn = read_im16(env, s);
- opcode_table[insn](env, s, insn);
- do_writebacks(s);
- do_release(s);
-}
-
static void m68k_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu)
{
DisasContext *dc = container_of(dcbase, DisasContext, base);
@@ -6101,8 +6091,13 @@ static bool m68k_tr_breakpoint_check(DisasContextBase
*dcbase, CPUState *cpu,
static void m68k_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
{
DisasContext *dc = container_of(dcbase, DisasContext, base);
+ CPUM68KState *env = cpu->env_ptr;
+ uint16_t insn = read_im16(env, dc);
+
+ opcode_table[insn](env, dc, insn);
+ do_writebacks(dc);
+ do_release(dc);
- disas_m68k_insn(cpu->env_ptr, dc);
dc->base.pc_next = dc->pc;
if (dc->base.is_jmp == DISAS_NEXT) {
--
2.14.4
- [Qemu-devel] [PULL 0/9] M68k for 3.0 patches, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 1/9] target/m68k: Use DISAS_NORETURN for exceptions, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 5/9] target/m68k: Rename DISAS_UPDATE and gen_lookup_tb, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 2/9] target/m68k: Replace DISAS_TB_JUMP with DISAS_NORETURN, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 4/9] target/m68k: Use lookup_and_goto_tb for DISAS_JUMP, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 3/9] target/m68k: Remove DISAS_JUMP_NEXT as unused, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 8/9] target/m68k: Improve ending TB at page boundaries, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 7/9] target/m68k: Convert to TranslatorOps, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 6/9] target/m68k: Convert to DisasContextBase, Laurent Vivier, 2018/06/11
- [Qemu-devel] [PULL 9/9] target/m68k: Merge disas_m68k_insn into m68k_tr_translate_insn,
Laurent Vivier <=
- Re: [Qemu-devel] [PULL 0/9] M68k for 3.0 patches, Peter Maydell, 2018/06/11