target-*: dfilter support for in_asm

The arm target was handled by 06486077, but other targets
were ignored.  This handles all the rest which actually support
disassembly (that is, skipping moxie and tilegx).

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>

diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 76dab154eec09948944d554ed548d2922cf809ed..f9b2426636207f35ce8dca9e5f821d52a65dab40 100644 (file)
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -2994,7 +2994,8 @@ void gen_intermediate_code(CPUAlphaState *env, struct TranslationBlock *tb)
     tb->icount = num_insns;
 
 #ifdef DEBUG_DISAS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("IN: %s\n", lookup_symbol(pc_start));
         log_target_disas(cs, pc_start, ctx.pc - pc_start, 1);
         qemu_log("\n");

diff --git a/target-cris/translate.c b/target-cris/translate.c
index 2153ea7af6463432ee63f4cf2705bce98ad6e648..cc515690e17920f3d8b23ebf6f93d9f59d6a9c11 100644 (file)
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -3311,7 +3311,8 @@ void gen_intermediate_code(CPUCRISState *env, struct TranslationBlock *tb)
 
 #ifdef DEBUG_DISAS
 #if !DISAS_CRIS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         log_target_disas(cs, pc_start, dc->pc - pc_start,
                          env->pregs[PR_VR]);
         qemu_log("\nisize=%d osize=%d\n",

diff --git a/target-i386/translate.c b/target-i386/translate.c
index bf33e6b3536e38465ccc1e2a48c14c867f2e5a4e..f010022fcd75b1ce05a2bed59938b6090d82e438 100644 (file)
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -8354,7 +8354,8 @@ done_generating:
     gen_tb_end(tb, num_insns);
 
 #ifdef DEBUG_DISAS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         int disas_flags;
         qemu_log("----------------\n");
         qemu_log("IN: %s\n", lookup_symbol(pc_start));

diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index d09d81447b2dfeb1fe4ebcfc6420bb2b052c5eab..526b4374e69d16eff45f60ecaf4362a01dcbc0bc 100644 (file)
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -1147,7 +1147,8 @@ void gen_intermediate_code(CPULM32State *env, struct TranslationBlock *tb)
     tb->icount = num_insns;
 
 #ifdef DEBUG_DISAS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("\n");
         log_target_disas(cs, pc_start, dc->pc - pc_start, 0);
         qemu_log("\nisize=%d osize=%d\n",

diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index f90187ff96bfc796baa6dfa8275318d74e30bbc2..83db42a7d319311d81e68e3197909250a053baff 100644 (file)
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -3067,7 +3067,8 @@ void gen_intermediate_code(CPUM68KState *env, TranslationBlock *tb)
     gen_tb_end(tb, num_insns);
 
 #ifdef DEBUG_DISAS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("----------------\n");
         qemu_log("IN: %s\n", lookup_symbol(pc_start));
         log_target_disas(cs, pc_start, dc->pc - pc_start, 0);

diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index 513f390807a935e01dbf69f34b71720522105ffc..c54304aca5e345039462373dcf696d701520cb67 100644 (file)
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -1818,7 +1818,8 @@ void gen_intermediate_code(CPUMBState *env, struct TranslationBlock *tb)
 
 #ifdef DEBUG_DISAS
 #if !SIM_COMPAT
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("\n");
 #if DISAS_GNU
         log_target_disas(cs, pc_start, dc->pc - pc_start, 0);

diff --git a/target-mips/translate.c b/target-mips/translate.c
index 3bd96aae97125d9b441cfedfe60a6249174c9068..f420680d1fc3f7c71a582f2c13a7585f34cfdb1a 100644 (file)
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -19913,7 +19913,8 @@ done_generating:
 
 #ifdef DEBUG_DISAS
     LOG_DISAS("\n");
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("IN: %s\n", lookup_symbol(pc_start));
         log_target_disas(cs, pc_start, ctx.pc - pc_start, 0);
         qemu_log("\n");

diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c
index d4f1f260e4256d1d56d466298fc0ee7cf8704dd9..c08876b14aeaec0a700c093d2c6c4c2eb896f196 100644 (file)
--- a/target-openrisc/translate.c
+++ b/target-openrisc/translate.c
@@ -1751,7 +1751,8 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb)
     tb->icount = num_insns;
 
 #ifdef DEBUG_DISAS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("\n");
         log_target_disas(cs, pc_start, dc->pc - pc_start, 0);
         qemu_log("\nisize=%d osize=%d\n",

diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index fe10bf8774cbfef8b829914915e62e413c62dadd..123e42fe6b6f5fb758f2a77e7b4cb1b9a4908cc1 100644 (file)
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -11642,7 +11642,8 @@ void gen_intermediate_code(CPUPPCState *env, struct TranslationBlock *tb)
     tb->icount = num_insns;
 
 #if defined(DEBUG_DISAS)
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         int flags;
         flags = env->bfd_mach;
         flags |= ctx.le_mode << 16;

diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 2bbd1020c9d6f0f0943d799fd3b8ec729c0ee361..ce5db5dd46aa3848acc8151d861aafb7f483fde3 100644 (file)
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -5429,7 +5429,8 @@ void gen_intermediate_code(CPUS390XState *env, struct TranslationBlock *tb)
     tb->icount = num_insns;
 
 #if defined(S390X_DEBUG_DISAS)
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("IN: %s\n", lookup_symbol(pc_start));
         log_target_disas(cs, pc_start, dc.pc - pc_start, 1);
         qemu_log("\n");

diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index ff5222b04e89e1837dbaf0e9fae53d34dcfea57e..7518eb550845a0920e023e544ab223c33598c3f5 100644 (file)
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -1924,7 +1924,8 @@ void gen_intermediate_code(CPUSH4State * env, struct TranslationBlock *tb)
     tb->icount = num_insns;
 
 #ifdef DEBUG_DISAS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
        qemu_log("IN:\n");      /* , lookup_symbol(pc_start)); */
         log_target_disas(cs, pc_start, ctx.pc - pc_start, 0);
        qemu_log("\n");

diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 21760b9fea3e3fdf3dd21261aab4ff2ae8b87143..afd306fbab1cf1ecbb34ede4c384c63a63fce5fb 100644 (file)
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -5330,7 +5330,8 @@ void gen_intermediate_code(CPUSPARCState * env, TranslationBlock * tb)
     tb->icount = num_insns;
 
 #ifdef DEBUG_DISAS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("--------------\n");
         qemu_log("IN: %s\n", lookup_symbol(pc_start));
         log_target_disas(cs, pc_start, last_pc + 4 - pc_start, 0);

diff --git a/target-tricore/translate.c b/target-tricore/translate.c
index 83fa4fcd54b51f83e55e09dd99736a706595952b..eb3deac88909a2f4c3ff14e28bcb03d65361178a 100644 (file)
--- a/target-tricore/translate.c
+++ b/target-tricore/translate.c
@@ -8787,7 +8787,8 @@ void gen_intermediate_code(CPUTriCoreState *env, struct TranslationBlock *tb)
     }
 
 #ifdef DEBUG_DISAS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("IN: %s\n", lookup_symbol(pc_start));
         log_target_disas(cs, pc_start, ctx.pc - pc_start, 0);
         qemu_log("\n");

diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index b04d22c9fbc3df5bf0591fbdd44abd4f5adc8548..c4d45fa0f454fb59d90c96a9e78929945a8c4a9b 100644 (file)
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -2021,7 +2021,8 @@ done_generating:
     gen_tb_end(tb, num_insns);
 
 #ifdef DEBUG_DISAS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("----------------\n");
         qemu_log("IN: %s\n", lookup_symbol(pc_start));
         log_target_disas(cs, pc_start, dc->pc - pc_start, 0);

diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index 67efb32ef33aaf84388e7d458a02009a854e3fd6..2a8e5c5d9420cdf19064f25803c94abcd0189fd1 100644 (file)
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -3153,7 +3153,8 @@ void gen_intermediate_code(CPUXtensaState *env, TranslationBlock *tb)
     gen_tb_end(tb, insn_count);
 
 #ifdef DEBUG_DISAS
-    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
+    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
+        && qemu_log_in_addr_range(pc_start)) {
         qemu_log("----------------\n");
         qemu_log("IN: %s\n", lookup_symbol(pc_start));
         log_target_disas(cs, pc_start, dc.pc - pc_start, 0);