From afde79b8f9142bbf46c7f566eb1944cd04af0abf Mon Sep 17 00:00:00 2001 From: Aleksandar Markovic Date: Fri, 25 Jan 2019 12:40:37 -0500 Subject: [PATCH] target/mips: nanoMIPS: Remove duplicate macro definitions Several macros were defined twice, with identical values, so remove duplicates. Previously added in 80845edf37b. This reverts commit 6bfa9f4c9cf24d6cfaaa227722e9cdcca1ad6fe9. Backports commit 362d2e72546923f8f410733cc286ae5528c7811a from qemu --- qemu/target/mips/translate.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/qemu/target/mips/translate.c b/qemu/target/mips/translate.c index 8b45a949..3aaf915c 100644 --- a/qemu/target/mips/translate.c +++ b/qemu/target/mips/translate.c @@ -18615,16 +18615,6 @@ static inline int decode_gpr_gpr4_zero(int r) } -/* extraction utilities */ - -#define NANOMIPS_EXTRACT_RD(op) ((op >> 7) & 0x7) -#define NANOMIPS_EXTRACT_RS(op) ((op >> 4) & 0x7) -#define NANOMIPS_EXTRACT_RS2(op) uMIPS_RS(op) -#define NANOMIPS_EXTRACT_RS1(op) ((op >> 1) & 0x7) -#define NANOMIPS_EXTRACT_RD5(op) ((op >> 5) & 0x1f) -#define NANOMIPS_EXTRACT_RS5(op) (op & 0x1f) - - static void gen_adjust_sp(DisasContext *ctx, int u) { TCGContext *tcg_ctx = ctx->uc->tcg_ctx;