From f069762b613a414c2e39a63da5f94ac6854570be Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Tue, 27 Feb 2018 08:37:23 -0500 Subject: [PATCH] target-m68k: REG() macro cleanup Backports commit bcc098b0c23b4dd902ff56987d769bd839677331 from qemu --- qemu/target-m68k/translate.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qemu/target-m68k/translate.c b/qemu/target-m68k/translate.c index cce5b0fc..ae2c125f 100644 --- a/qemu/target-m68k/translate.c +++ b/qemu/target-m68k/translate.c @@ -37,9 +37,10 @@ #define tcg_gen_qemu_ldf64 tcg_gen_qemu_ld64 #define tcg_gen_qemu_stf64 tcg_gen_qemu_st64 -#define DREG(insn, pos) tcg_ctx->cpu_dregs[((insn) >> (pos)) & 7] -#define AREG(insn, pos) tcg_ctx->cpu_aregs[((insn) >> (pos)) & 7] -#define FREG(insn, pos) tcg_ctx->cpu_fregs[((insn) >> (pos)) & 7] +#define REG(insn, pos) (((insn) >> (pos)) & 7) +#define DREG(insn, pos) tcg_ctx->cpu_dregs[REG(insn, pos)] +#define AREG(insn, pos) tcg_ctx->cpu_aregs[REG(insn, pos)] +#define FREG(insn, pos) tcg_ctx->cpu_fregs[REG(insn, pos)] #define MACREG(acc) tcg_ctx->cpu_macc[acc] #define QREG_SP tcg_ctx->cpu_aregs[7]