| Message ID | 1476311708-14792-2-git-send-email-michael@walle.cc |
|---|---|
| State | New |
| Headers | show |
On 12 October 2016 at 23:35, Michael Walle <michael@walle.cc> wrote: > The lm32 target already has a disassembler which logs the assembly > instructions with "-d in_asm". Therefore, turn of the LOG_DIS() macro to > prevent logging the assembly instructions twice. Also turn the macro in a > one which is always compiled to catch any errors while the macro is turned > off. > > Signed-off-by: Michael Walle <michael@walle.cc> > --- > target-lm32/translate.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/target-lm32/translate.c b/target-lm32/translate.c > index fa8416a..792637f 100644 > --- a/target-lm32/translate.c > +++ b/target-lm32/translate.c > @@ -33,12 +33,14 @@ > #include "exec/log.h" > > > -#define DISAS_LM32 1 > -#if DISAS_LM32 > -# define LOG_DIS(...) qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__) > -#else > -# define LOG_DIS(...) do { } while (0) > -#endif > +#define DISAS_LM32 0 > + > +#define LOG_DIS(...) \ > + do { \ > + if (DISAS_LM32) { \ > + qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__); \ > + } \ > + } while (0) > > #define EXTRACT_FIELD(src, start, end) \ > (((src) >> start) & ((1 << (end - start + 1)) - 1)) > -- > 2.1.4 Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/target-lm32/translate.c b/target-lm32/translate.c index fa8416a..792637f 100644 --- a/target-lm32/translate.c +++ b/target-lm32/translate.c @@ -33,12 +33,14 @@ #include "exec/log.h" -#define DISAS_LM32 1 -#if DISAS_LM32 -# define LOG_DIS(...) qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__) -#else -# define LOG_DIS(...) do { } while (0) -#endif +#define DISAS_LM32 0 + +#define LOG_DIS(...) \ + do { \ + if (DISAS_LM32) { \ + qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__); \ + } \ + } while (0) #define EXTRACT_FIELD(src, start, end) \ (((src) >> start) & ((1 << (end - start + 1)) - 1))
The lm32 target already has a disassembler which logs the assembly instructions with "-d in_asm". Therefore, turn of the LOG_DIS() macro to prevent logging the assembly instructions twice. Also turn the macro in a one which is always compiled to catch any errors while the macro is turned off. Signed-off-by: Michael Walle <michael@walle.cc> --- target-lm32/translate.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)