Commit e5ef4ec2 authored by Alex Bennée's avatar Alex Bennée
Browse files

disas: include an optional note for the start of disassembly 



This will become useful shortly for providing more information about
output assembly inline. While there fix up the indenting and code
formatting in disas().

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>

Message-Id: <20200513175134.19619-9-alex.bennee@linaro.org>
parent 6a7aa856

accel/tcg/translate-all.c

+2 −2
Original line number Diff line number Diff line
@@ -1800,7 +1800,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, 
            size_t data_size = gen_code_size - code_size;

            size_t i;



            log_disas(tb->tc.ptr, code_size);

            log_disas(tb->tc.ptr, code_size, NULL);



            for (i = 0; i < data_size; i += sizeof(tcg_target_ulong)) {

                if (sizeof(tcg_target_ulong) == 8) {
@@ -1814,7 +1814,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, 
                }

            }

        } else {

            log_disas(tb->tc.ptr, gen_code_size);

            log_disas(tb->tc.ptr, gen_code_size, NULL);

        }

        qemu_log("\n");

        qemu_log_flush();

disas.c

+10 −4
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size) 
}



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

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

void disas(FILE *out, void *code, unsigned long size, const char *note)

{

    uintptr_t pc;

    int count;
@@ -674,12 +674,18 @@ void disas(FILE *out, void *code, unsigned long size) 
    for (pc = (uintptr_t)code; size > 0; pc += count, size -= count) {

        fprintf(out, "0x%08" PRIxPTR ":  ", pc);

        count = print_insn(pc, &s.info);

        if (note) {

            fprintf(out, "\t\t%s", note);

            note = NULL;

        }

        fprintf(out, "\n");

	if (count < 0)

        if (count < 0) {

            break;

        }

    }



}



/* Look up symbol for debugging purpose.  Returns "" if unknown. */

const char *lookup_symbol(target_ulong orig_addr)

{

include/disas/disas.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include "cpu.h"



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

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

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

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

                  target_ulong size);

include/exec/log.h

+2 −2
Original line number Diff line number Diff line
@@ -56,13 +56,13 @@ static inline void log_target_disas(CPUState *cpu, target_ulong start, 
    rcu_read_unlock();

}



static inline void log_disas(void *code, unsigned long size)

static inline void log_disas(void *code, unsigned long size, const char *note)

{

    QemuLogFile *logfile;

    rcu_read_lock();

    logfile = atomic_rcu_read(&qemu_logfile);

    if (logfile) {

        disas(logfile->fd, code, size);

        disas(logfile->fd, code, size, note);

    }

    rcu_read_unlock();

}

tcg/tcg.c

+2 −2
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ void tcg_prologue_init(TCGContext *s) 
            size_t data_size = prologue_size - code_size;

            size_t i;



            log_disas(buf0, code_size);

            log_disas(buf0, code_size, NULL);



            for (i = 0; i < data_size; i += sizeof(tcg_target_ulong)) {

                if (sizeof(tcg_target_ulong) == 8) {
@@ -1106,7 +1106,7 @@ void tcg_prologue_init(TCGContext *s) 
                }

            }

        } else {

            log_disas(buf0, prologue_size);

            log_disas(buf0, prologue_size, NULL);

        }

        qemu_log("\n");

        qemu_log_flush();