[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 32/76] target/microblaze: Remove empty D macros
From: |
Richard Henderson |
Subject: |
[PULL 32/76] target/microblaze: Remove empty D macros |
Date: |
Mon, 31 Aug 2020 09:05:17 -0700 |
This is never used in op_helper.c and translate.c. There are
two trivial uses in helper.c which can be improved by always
logging MMU_EXCP to CPU_LOG_INT.
Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/microblaze/helper.c | 11 ++++-------
target/microblaze/op_helper.c | 2 --
target/microblaze/translate.c | 2 --
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c
index 9a95456401..f8e2ca12a9 100644
--- a/target/microblaze/helper.c
+++ b/target/microblaze/helper.c
@@ -24,8 +24,6 @@
#include "qemu/host-utils.h"
#include "exec/log.h"
-#define D(x)
-
#if defined(CONFIG_USER_ONLY)
void mb_cpu_do_interrupt(CPUState *cs)
@@ -155,10 +153,13 @@ void mb_cpu_do_interrupt(CPUState *cs)
case EXCP_MMU:
env->regs[17] = env->pc;
+ qemu_log_mask(CPU_LOG_INT,
+ "MMU exception at pc=%x iflags=%x ear=%" PRIx64 "\n",
+ env->pc, env->iflags, env->ear);
+
env->esr &= ~(1 << 12);
/* Exception breaks branch + dslot sequence? */
if (env->iflags & D_FLAG) {
- D(qemu_log("D_FLAG set at exception bimm=%d\n", env->bimm));
env->esr |= 1 << 12 ;
env->btr = env->btarget;
@@ -166,14 +167,10 @@ void mb_cpu_do_interrupt(CPUState *cs)
env->regs[17] -= 4;
/* was the branch immprefixed?. */
if (env->bimm) {
- qemu_log_mask(CPU_LOG_INT,
- "bimm exception at pc=%x iflags=%x\n",
- env->pc, env->iflags);
env->regs[17] -= 4;
log_cpu_state_mask(CPU_LOG_INT, cs, 0);
}
} else if (env->iflags & IMM_FLAG) {
- D(qemu_log("IMM_FLAG set at exception\n"));
env->regs[17] -= 4;
}
diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c
index d79202c3f8..decdca0fd8 100644
--- a/target/microblaze/op_helper.c
+++ b/target/microblaze/op_helper.c
@@ -26,8 +26,6 @@
#include "exec/cpu_ldst.h"
#include "fpu/softfloat.h"
-#define D(x)
-
void helper_put(uint32_t id, uint32_t ctrl, uint32_t data)
{
int test = ctrl & STREAM_TEST;
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index 6757720776..860859324a 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -41,8 +41,6 @@
# define LOG_DIS(...) do { } while (0)
#endif
-#define D(x)
-
#define EXTRACT_FIELD(src, start, end) \
(((src) >> start) & ((1 << (end - start + 1)) - 1))
--
2.25.1
- [PULL 22/76] target/microblaze: Remove helper_debug and env->debug, (continued)
- [PULL 22/76] target/microblaze: Remove helper_debug and env->debug, Richard Henderson, 2020/08/31
- [PULL 23/76] target/microblaze: Rename env_* tcg variables to cpu_*, Richard Henderson, 2020/08/31
- [PULL 24/76] target/microblaze: Tidy mb_tcg_init, Richard Henderson, 2020/08/31
- [PULL 25/76] target/microblaze: Split out MSR[C] to its own variable, Richard Henderson, 2020/08/31
- [PULL 26/76] target/microblaze: Use DISAS_NORETURN, Richard Henderson, 2020/08/31
- [PULL 28/76] target/microblaze: Convert to DisasContextBase, Richard Henderson, 2020/08/31
- [PULL 27/76] target/microblaze: Check singlestep_enabled in gen_goto_tb, Richard Henderson, 2020/08/31
- [PULL 30/76] target/microblaze: Remove SIM_COMPAT, Richard Henderson, 2020/08/31
- [PULL 29/76] target/microblaze: Convert to translator_loop, Richard Henderson, 2020/08/31
- [PULL 31/76] target/microblaze: Remove DISAS_GNU, Richard Henderson, 2020/08/31
- [PULL 32/76] target/microblaze: Remove empty D macros,
Richard Henderson <=
- [PULL 33/76] target/microblaze: Remove LOG_DIS, Richard Henderson, 2020/08/31
- [PULL 34/76] target/microblaze: Ensure imm constant is always available, Richard Henderson, 2020/08/31
- [PULL 35/76] target/microblaze: Add decodetree infrastructure, Richard Henderson, 2020/08/31
- [PULL 36/76] target/microblaze: Convert dec_add to decodetree, Richard Henderson, 2020/08/31
- [PULL 37/76] target/microblaze: Convert dec_sub to decodetree, Richard Henderson, 2020/08/31
- [PULL 38/76] target/microblaze: Implement cmp and cmpu inline, Richard Henderson, 2020/08/31
- [PULL 39/76] target/microblaze: Convert dec_pattern to decodetree, Richard Henderson, 2020/08/31
- [PULL 40/76] target/microblaze: Convert dec_and, dec_or, dec_xor to decodetree, Richard Henderson, 2020/08/31
- [PULL 41/76] target/microblaze: Convert dec_mul to decodetree, Richard Henderson, 2020/08/31
- [PULL 42/76] target/microblaze: Convert dec_div to decodetree, Richard Henderson, 2020/08/31