diff options
Diffstat (limited to 'target-m68k/translate.c')
| -rw-r--r-- | target-m68k/translate.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 0e7f1fe2c7..9fc1e3102d 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -17,13 +17,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include "config.h" #include "cpu.h" #include "disas.h" #include "tcg-op.h" @@ -74,8 +68,8 @@ void m68k_tcg_init(void) char *p; int i; -#define DEFO32(name, offset) QREG_##name = tcg_global_mem_new_i32(TCG_AREG0, offsetof(CPUState, offset), #name); -#define DEFO64(name, offset) QREG_##name = tcg_global_mem_new_i64(TCG_AREG0, offsetof(CPUState, offset), #name); +#define DEFO32(name, offset) QREG_##name = tcg_global_mem_new_i32(TCG_AREG0, offsetof(CPUM68KState, offset), #name); +#define DEFO64(name, offset) QREG_##name = tcg_global_mem_new_i64(TCG_AREG0, offsetof(CPUM68KState, offset), #name); #define DEFF64(name, offset) DEFO64(name, offset) #include "qregs.def" #undef DEFO32 @@ -2943,7 +2937,7 @@ void register_m68k_insns (CPUM68KState *env) /* ??? 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(CPUState * env, DisasContext *s) +static void disas_m68k_insn(CPUM68KState * env, DisasContext *s) { uint16_t insn; @@ -2955,7 +2949,7 @@ static void disas_m68k_insn(CPUState * env, DisasContext *s) /* generate intermediate code for basic block 'tb'. */ static inline void -gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb, +gen_intermediate_code_internal(CPUM68KState *env, TranslationBlock *tb, int search_pc) { DisasContext dc1, *dc = &dc1; @@ -3078,17 +3072,17 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb, //expand_target_qops(); } -void gen_intermediate_code(CPUState *env, TranslationBlock *tb) +void gen_intermediate_code(CPUM68KState *env, TranslationBlock *tb) { gen_intermediate_code_internal(env, tb, 0); } -void gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb) +void gen_intermediate_code_pc(CPUM68KState *env, TranslationBlock *tb) { gen_intermediate_code_internal(env, tb, 1); } -void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf, +void cpu_dump_state(CPUM68KState *env, FILE *f, fprintf_function cpu_fprintf, int flags) { int i; @@ -3109,7 +3103,7 @@ void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf, cpu_fprintf (f, "FPRESULT = %12g\n", *(double *)&env->fp_result); } -void restore_state_to_opc(CPUState *env, TranslationBlock *tb, int pc_pos) +void restore_state_to_opc(CPUM68KState *env, TranslationBlock *tb, int pc_pos) { env->pc = gen_opc_pc[pc_pos]; } |