Commit b8d87208 authored by Richard Henderson's avatar Richard Henderson
Browse files

disas: Remove monitor_disas_is_physical 



Even though there is only one monitor, and thus no race on this
global data object, there is also no point in having it.  We can
just as well record the decision in the read_memory_function that
we select.

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 ac226899

disas.c

+4 −12
Original line number Diff line number Diff line
@@ -512,19 +512,11 @@ const char *lookup_symbol(target_ulong orig_addr) 


#include "monitor/monitor.h"



static int monitor_disas_is_physical;



static int

monitor_read_memory (bfd_vma memaddr, bfd_byte *myaddr, int length,

physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length,

                     struct disassemble_info *info)

{

    CPUDebug *s = container_of(info, CPUDebug, info);



    if (monitor_disas_is_physical) {

    cpu_physical_memory_read(memaddr, myaddr, length);

    } else {

        cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0);

    }

    return 0;

}
@@ -539,8 +531,8 @@ void monitor_disas(Monitor *mon, CPUState *cpu, 
    INIT_DISASSEMBLE_INFO(s.info, (FILE *)mon, monitor_fprintf);



    s.cpu = cpu;

    monitor_disas_is_physical = is_physical;

    s.info.read_memory_func = monitor_read_memory;

    s.info.read_memory_func

        = (is_physical ? physical_read_memory : target_read_memory);

    s.info.print_address_func = generic_print_address;

    s.info.buffer_vma = pc;

    s.info.cap_arch = -1;