mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 23:13:30 +00:00
disas: arm-a64: Make printfer and stream variable
In a normal disassembly flow, the printf() and stream being used varies from disas job to job. In particular it varies if mixing monitor_disas and target_disas. Make both the printf() function and target stream settable in the QEMUDisassmbler class. Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com> Tested-by: Claudio Fontana <claudio.fontana@huawei.com> Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
37b9de463b
commit
fb200d5f00
|
@ -35,16 +35,25 @@ static Disassembler *vixl_disasm = NULL;
|
||||||
*/
|
*/
|
||||||
class QEMUDisassembler : public Disassembler {
|
class QEMUDisassembler : public Disassembler {
|
||||||
public:
|
public:
|
||||||
explicit QEMUDisassembler(FILE *stream) : stream_(stream) { }
|
QEMUDisassembler() : printf_(NULL), stream_(NULL) { }
|
||||||
~QEMUDisassembler() { }
|
~QEMUDisassembler() { }
|
||||||
|
|
||||||
|
void SetStream(FILE *stream) {
|
||||||
|
stream_ = stream;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SetPrintf(int (*printf_fn)(FILE *, const char *, ...)) {
|
||||||
|
printf_ = printf_fn;
|
||||||
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void ProcessOutput(const Instruction *instr) {
|
virtual void ProcessOutput(const Instruction *instr) {
|
||||||
fprintf(stream_, "%08" PRIx32 " %s",
|
printf_(stream_, "%08" PRIx32 " %s",
|
||||||
instr->InstructionBits(), GetOutput());
|
instr->InstructionBits(), GetOutput());
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
int (*printf_)(FILE *, const char *, ...);
|
||||||
FILE *stream_;
|
FILE *stream_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -53,9 +62,9 @@ static int vixl_is_initialized(void)
|
||||||
return vixl_decoder != NULL;
|
return vixl_decoder != NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void vixl_init(FILE *f) {
|
static void vixl_init() {
|
||||||
vixl_decoder = new Decoder();
|
vixl_decoder = new Decoder();
|
||||||
vixl_disasm = new QEMUDisassembler(f);
|
vixl_disasm = new QEMUDisassembler();
|
||||||
vixl_decoder->AppendVisitor(vixl_disasm);
|
vixl_decoder->AppendVisitor(vixl_disasm);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,9 +87,12 @@ int print_insn_arm_a64(uint64_t addr, disassemble_info *info)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!vixl_is_initialized()) {
|
if (!vixl_is_initialized()) {
|
||||||
vixl_init(info->stream);
|
vixl_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
((QEMUDisassembler *)vixl_disasm)->SetPrintf(info->fprintf_func);
|
||||||
|
((QEMUDisassembler *)vixl_disasm)->SetStream(info->stream);
|
||||||
|
|
||||||
instrval = bytes[0] | bytes[1] << 8 | bytes[2] << 16 | bytes[3] << 24;
|
instrval = bytes[0] | bytes[1] << 8 | bytes[2] << 16 | bytes[3] << 24;
|
||||||
instr = reinterpret_cast<const Instruction *>(&instrval);
|
instr = reinterpret_cast<const Instruction *>(&instrval);
|
||||||
vixl_disasm->MapCodeAddress(addr, instr);
|
vixl_disasm->MapCodeAddress(addr, instr);
|
||||||
|
|
Loading…
Reference in a new issue