ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

disas: Remove unused flags arguments 

Now that every target is using the disas_set_info hook,
the flags argument is unused.  Remove it.

Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2017-09-14 08:38:35 -07:00
parent 7bcdbf51ee
commit 1d48474d8e
23 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
disas.c
View File

@ -171,15 +171,9 @@ static int print_insn_od_target(bfd_vma pc, disassemble_info *info)
return print_insn_objdump(pc, info, "OBJD-T"); return print_insn_objdump(pc, info, "OBJD-T");
} }
/* Disassemble this for me please... (debugging). 'flags' has the following /* Disassemble this for me please... (debugging). */
values:
i386 - 1 means 16 bit code, 2 means 64 bit code
ppc - bits 0:15 specify (optionally) the machine instruction set;
bit 16 indicates little endian.
other targets - unused
*/
void target_disas(FILE *out, CPUState *cpu, target_ulong code, void target_disas(FILE *out, CPUState *cpu, target_ulong code,
target_ulong size, int flags) target_ulong size)
{ {
CPUClass *cc = CPU_GET_CLASS(cpu); CPUClass *cc = CPU_GET_CLASS(cpu);
target_ulong pc; target_ulong pc;
@ -335,10 +329,9 @@ monitor_read_memory (bfd_vma memaddr, bfd_byte *myaddr, int length,
return 0; return 0;
} }
/* Disassembler for the monitor. /* Disassembler for the monitor. */
See target_disas for a description of flags. */
void monitor_disas(Monitor *mon, CPUState *cpu, void monitor_disas(Monitor *mon, CPUState *cpu,
target_ulong pc, int nb_insn, int is_physical, int flags) target_ulong pc, int nb_insn, int is_physical)
{ {
CPUClass *cc = CPU_GET_CLASS(cpu); CPUClass *cc = CPU_GET_CLASS(cpu);
int count, i; int count, i;

4
include/disas/disas.h
View File

@ -9,10 +9,10 @@
/* Disassemble this for me please... (debugging). */ /* Disassemble this for me please... (debugging). */
void disas(FILE *out, void *code, unsigned long size); void disas(FILE *out, void *code, unsigned long size);
void target_disas(FILE *out, CPUState *cpu, target_ulong code, void target_disas(FILE *out, CPUState *cpu, target_ulong code,
target_ulong size, int flags); target_ulong size);
void monitor_disas(Monitor *mon, CPUState *cpu, void monitor_disas(Monitor *mon, CPUState *cpu,
target_ulong pc, int nb_insn, int is_physical, int flags); target_ulong pc, int nb_insn, int is_physical);
/* Look up symbol for debugging purpose. Returns "" if unknown. */ /* Look up symbol for debugging purpose. Returns "" if unknown. */
const char *lookup_symbol(target_ulong orig_addr); const char *lookup_symbol(target_ulong orig_addr);

4
include/exec/log.h
View File

@ -38,9 +38,9 @@ static inline void log_cpu_state_mask(int mask, CPUState *cpu, int flags)
#ifdef NEED_CPU_H #ifdef NEED_CPU_H
/* disas() and target_disas() to qemu_logfile: */ /* disas() and target_disas() to qemu_logfile: */
static inline void log_target_disas(CPUState *cpu, target_ulong start, static inline void log_target_disas(CPUState *cpu, target_ulong start,
target_ulong len, int flags) target_ulong len)
{ {
target_disas(qemu_logfile, cpu, start, len, flags); target_disas(qemu_logfile, cpu, start, len);
} }
static inline void log_disas(void *code, unsigned long size) static inline void log_disas(void *code, unsigned long size)

3
monitor.c
View File

@ -1309,8 +1309,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize,
} }
if (format == 'i') { if (format == 'i') {
int flags = 0; monitor_disas(mon, cs, addr, count, is_physical);
monitor_disas(mon, cs, addr, count, is_physical, flags);
return; return;
} }

2
target/alpha/translate.c
View File

@ -3048,7 +3048,7 @@ static void alpha_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
static void alpha_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu) static void alpha_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu)
{ {
qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first));
log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size, 1); log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size);
} }
static const TranslatorOps alpha_tr_ops = { static const TranslatorOps alpha_tr_ops = {

3
target/arm/translate-a64.c
View File

@ -11403,8 +11403,7 @@ static void aarch64_tr_disas_log(const DisasContextBase *dcbase,
DisasContext *dc = container_of(dcbase, DisasContext, base); DisasContext *dc = container_of(dcbase, DisasContext, base);
qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));
log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size);
4 | (bswap_code(dc->sctlr_b) ? 2 : 0));
} }
const TranslatorOps aarch64_translator_ops = { const TranslatorOps aarch64_translator_ops = {

3
target/arm/translate.c
View File

@ -12371,8 +12371,7 @@ static void arm_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu)
DisasContext *dc = container_of(dcbase, DisasContext, base); DisasContext *dc = container_of(dcbase, DisasContext, base);
qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));
log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size);
dc->thumb | (dc->sctlr_b << 1));
} }
static const TranslatorOps arm_translator_ops = { static const TranslatorOps arm_translator_ops = {

3
target/cris/translate.c
View File

@ -3297,8 +3297,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
qemu_log_lock(); qemu_log_lock();
qemu_log("--------------\n"); qemu_log("--------------\n");
qemu_log("IN: %s\n", lookup_symbol(pc_start)); qemu_log("IN: %s\n", lookup_symbol(pc_start));
log_target_disas(cs, pc_start, dc->pc - pc_start, log_target_disas(cs, pc_start, dc->pc - pc_start);
env->pregs[PR_VR]);
qemu_log("\nisize=%d osize=%d\n", qemu_log("\nisize=%d osize=%d\n",
dc->pc - pc_start, tcg_op_buf_count()); dc->pc - pc_start, tcg_op_buf_count());
qemu_log_unlock(); qemu_log_unlock();

2
target/hppa/translate.c
View File

@ -3904,7 +3904,7 @@ static void hppa_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs)
break; break;
default: default:
qemu_log("IN: %s\n", lookup_symbol(tb->pc)); qemu_log("IN: %s\n", lookup_symbol(tb->pc));
log_target_disas(cs, tb->pc, tb->size, 1); log_target_disas(cs, tb->pc, tb->size);
break; break;
} }
} }

2
target/i386/translate.c
View File

@ -8559,7 +8559,7 @@ static void i386_tr_disas_log(const DisasContextBase *dcbase,
DisasContext *dc = container_of(dcbase, DisasContext, base); DisasContext *dc = container_of(dcbase, DisasContext, base);
qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));
log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, 0); log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size);
} }
static const TranslatorOps i386_tr_ops = { static const TranslatorOps i386_tr_ops = {

2
target/lm32/translate.c
View File

@ -1156,7 +1156,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
&& qemu_log_in_addr_range(pc_start)) { && qemu_log_in_addr_range(pc_start)) {
qemu_log_lock(); qemu_log_lock();
qemu_log("\n"); qemu_log("\n");
log_target_disas(cs, pc_start, dc->pc - pc_start, 0); log_target_disas(cs, pc_start, dc->pc - pc_start);
qemu_log("\nisize=%d osize=%d\n", qemu_log("\nisize=%d osize=%d\n",
dc->pc - pc_start, tcg_op_buf_count()); dc->pc - pc_start, tcg_op_buf_count());
qemu_log_unlock(); qemu_log_unlock();

2
target/m68k/translate.c
View File

@ -5620,7 +5620,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
qemu_log_lock(); qemu_log_lock();
qemu_log("----------------\n"); qemu_log("----------------\n");
qemu_log("IN: %s\n", lookup_symbol(pc_start)); qemu_log("IN: %s\n", lookup_symbol(pc_start));
log_target_disas(cs, pc_start, dc->pc - pc_start, 0); log_target_disas(cs, pc_start, dc->pc - pc_start);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }

2
target/microblaze/translate.c
View File

@ -1810,7 +1810,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
qemu_log_lock(); qemu_log_lock();
qemu_log("--------------\n"); qemu_log("--------------\n");
#if DISAS_GNU #if DISAS_GNU
log_target_disas(cs, pc_start, dc->pc - pc_start, 0); log_target_disas(cs, pc_start, dc->pc - pc_start);
#endif #endif
qemu_log("\nisize=%d osize=%d\n", qemu_log("\nisize=%d osize=%d\n",
dc->pc - pc_start, tcg_op_buf_count()); dc->pc - pc_start, tcg_op_buf_count());

2
target/mips/translate.c
View File

@ -20370,7 +20370,7 @@ done_generating:
&& qemu_log_in_addr_range(pc_start)) { && qemu_log_in_addr_range(pc_start)) {
qemu_log_lock(); qemu_log_lock();
qemu_log("IN: %s\n", lookup_symbol(pc_start)); qemu_log("IN: %s\n", lookup_symbol(pc_start));
log_target_disas(cs, pc_start, ctx.pc - pc_start, 0); log_target_disas(cs, pc_start, ctx.pc - pc_start);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }

2
target/nios2/translate.c
View File

@ -907,7 +907,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
&& qemu_log_in_addr_range(tb->pc)) { && qemu_log_in_addr_range(tb->pc)) {
qemu_log_lock(); qemu_log_lock();
qemu_log("IN: %s\n", lookup_symbol(tb->pc)); qemu_log("IN: %s\n", lookup_symbol(tb->pc));
log_target_disas(cs, tb->pc, dc->pc - tb->pc, 0); log_target_disas(cs, tb->pc, dc->pc - tb->pc);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }

2
target/openrisc/translate.c
View File

@ -1653,7 +1653,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
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_addr_range(pc_start)) {
log_target_disas(cs, pc_start, tb->size, 0); log_target_disas(cs, pc_start, tb->size);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }

2
target/ppc/translate.c
View File

@ -7409,7 +7409,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
&& qemu_log_in_addr_range(pc_start)) { && qemu_log_in_addr_range(pc_start)) {
qemu_log_lock(); qemu_log_lock();
qemu_log("IN: %s\n", lookup_symbol(pc_start)); qemu_log("IN: %s\n", lookup_symbol(pc_start));
log_target_disas(cs, pc_start, ctx.nip - pc_start, 0); log_target_disas(cs, pc_start, ctx.nip - pc_start);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }

2
target/s390x/translate.c
View File

@ -5972,7 +5972,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
qemu_log("IN: EXECUTE %016" PRIx64 "\n", dc.ex_value); qemu_log("IN: EXECUTE %016" PRIx64 "\n", dc.ex_value);
} else { } else {
qemu_log("IN: %s\n", lookup_symbol(pc_start)); qemu_log("IN: %s\n", lookup_symbol(pc_start));
log_target_disas(cs, pc_start, dc.pc - pc_start, 1); log_target_disas(cs, pc_start, dc.pc - pc_start);
qemu_log("\n"); qemu_log("\n");
} }
qemu_log_unlock(); qemu_log_unlock();

2
target/sh4/translate.c
View File

@ -2347,7 +2347,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
&& qemu_log_in_addr_range(pc_start)) { && qemu_log_in_addr_range(pc_start)) {
qemu_log_lock(); qemu_log_lock();
qemu_log("IN:\n"); /* , lookup_symbol(pc_start)); */ qemu_log("IN:\n"); /* , lookup_symbol(pc_start)); */
log_target_disas(cs, pc_start, ctx.pc - pc_start, 0); log_target_disas(cs, pc_start, ctx.pc - pc_start);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }

2
target/sparc/translate.c
View File

@ -5855,7 +5855,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock * tb)
qemu_log_lock(); qemu_log_lock();
qemu_log("--------------\n"); qemu_log("--------------\n");
qemu_log("IN: %s\n", lookup_symbol(pc_start)); qemu_log("IN: %s\n", lookup_symbol(pc_start));
log_target_disas(cs, pc_start, last_pc + 4 - pc_start, 0); log_target_disas(cs, pc_start, last_pc + 4 - pc_start);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }

2
target/tricore/translate.c
View File

@ -8839,7 +8839,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
&& qemu_log_in_addr_range(pc_start)) { && qemu_log_in_addr_range(pc_start)) {
qemu_log_lock(); qemu_log_lock();
qemu_log("IN: %s\n", lookup_symbol(pc_start)); qemu_log("IN: %s\n", lookup_symbol(pc_start));
log_target_disas(cs, pc_start, ctx.pc - pc_start, 0); log_target_disas(cs, pc_start, ctx.pc - pc_start);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }

2
target/unicore32/translate.c
View File

@ -2031,7 +2031,7 @@ done_generating:
qemu_log_lock(); qemu_log_lock();
qemu_log("----------------\n"); qemu_log("----------------\n");
qemu_log("IN: %s\n", lookup_symbol(pc_start)); qemu_log("IN: %s\n", lookup_symbol(pc_start));
log_target_disas(cs, pc_start, dc->pc - pc_start, 0); log_target_disas(cs, pc_start, dc->pc - pc_start);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }

2
target/xtensa/translate.c
View File

@ -3250,7 +3250,7 @@ done:
qemu_log_lock(); qemu_log_lock();
qemu_log("----------------\n"); qemu_log("----------------\n");
qemu_log("IN: %s\n", lookup_symbol(pc_start)); qemu_log("IN: %s\n", lookup_symbol(pc_start));
log_target_disas(cs, pc_start, dc.pc - pc_start, 0); log_target_disas(cs, pc_start, dc.pc - pc_start);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }