Commit 1d48474d authored by Richard Henderson's avatar Richard Henderson
Browse files

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: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 7bcdbf51

disas.c

+4 −11
Original line number Diff line number Diff line
@@ -171,15 +171,9 @@ static int print_insn_od_target(bfd_vma pc, disassemble_info *info) 
    return print_insn_objdump(pc, info, "OBJD-T");

}



/* Disassemble this for me please... (debugging). 'flags' has the following

   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

 */

/* Disassemble this for me please... (debugging).  */

void target_disas(FILE *out, CPUState *cpu, target_ulong code,

                  target_ulong size, int flags)

                  target_ulong size)

{

    CPUClass *cc = CPU_GET_CLASS(cpu);

    target_ulong pc;
@@ -335,10 +329,9 @@ monitor_read_memory (bfd_vma memaddr, bfd_byte *myaddr, int length, 
    return 0;

}



/* Disassembler for the monitor.

   See target_disas for a description of flags. */

/* Disassembler for the monitor.  */

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);

    int count, i;

include/disas/disas.h

+2 −2
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 
/* Disassemble this for me please... (debugging). */

void disas(FILE *out, void *code, unsigned long size);

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,

                   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. */

const char *lookup_symbol(target_ulong orig_addr);

include/exec/log.h

+2 −2
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ static inline void log_cpu_state_mask(int mask, CPUState *cpu, int flags) 
#ifdef NEED_CPU_H

/* disas() and target_disas() to qemu_logfile: */

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)

monitor.c

+1 −2
Original line number Diff line number Diff line
@@ -1309,8 +1309,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, 
    }



    if (format == 'i') {

        int flags = 0;

        monitor_disas(mon, cs, addr, count, is_physical, flags);

        monitor_disas(mon, cs, addr, count, is_physical);

        return;

    }

target/alpha/translate.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

    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 = {