[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 3/7] disas: arm-a64: Make printfer and stream var
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH v3 3/7] disas: arm-a64: Make printfer and stream variable |
Date: |
Sun, 24 May 2015 15:47:16 -0700 |
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 printfer function and target stream settable in the
QEMUDisassmbler class. Remove the stream_ initialisation from the
constructor as it will now runtime vary (and an initial value won't
mean very much).
Reviewed-by: Claudio Fontana <address@hidden>
Tested-by: Claudio Fontana <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
---
Changed since v2:
Changed styling of NULL variable construction
Changed since v1:
Drop explicit from constructor
Keep NULL stream_ initialiser
Initialise printf_ to NULL
---
disas/arm-a64.cc | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/disas/arm-a64.cc b/disas/arm-a64.cc
index e04f946..be5a733 100644
--- a/disas/arm-a64.cc
+++ b/disas/arm-a64.cc
@@ -35,16 +35,25 @@ static Disassembler *vixl_disasm = NULL;
*/
class QEMUDisassembler : public Disassembler {
public:
- explicit QEMUDisassembler(FILE *stream) : stream_(stream) { }
+ QEMUDisassembler() : stream_(NULL), printf_(NULL) { }
~QEMUDisassembler() { }
+ void SetStream(FILE *stream) {
+ stream_ = stream;
+ }
+
+ void SetPrintf(int (*printf_fn)(FILE *, const char *, ...)) {
+ printf_ = printf_fn;
+ }
+
protected:
virtual void ProcessOutput(const Instruction *instr) {
- fprintf(stream_, "%08" PRIx32 " %s",
+ printf_(stream_, "%08" PRIx32 " %s",
instr->InstructionBits(), GetOutput());
}
private:
+ int (*printf_)(FILE *, const char *, ...);
FILE *stream_;
};
@@ -53,9 +62,9 @@ static int vixl_is_initialized(void)
return vixl_decoder != NULL;
}
-static void vixl_init(FILE *f) {
+static void vixl_init() {
vixl_decoder = new Decoder();
- vixl_disasm = new QEMUDisassembler(f);
+ vixl_disasm = new QEMUDisassembler();
vixl_decoder->AppendVisitor(vixl_disasm);
}
@@ -78,9 +87,12 @@ int print_insn_arm_a64(uint64_t addr, disassemble_info *info)
}
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;
instr = reinterpret_cast<const Instruction *>(&instrval);
vixl_disasm->MapCodeAddress(addr, instr);
--
1.9.1
- [Qemu-devel] [PATCH v3 0/7] Unify and QOMify (target|monitor)_disas, Peter Crosthwaite, 2015/05/24
- [Qemu-devel] [PATCH v3 1/7] disas: Add print_insn to disassemble info, Peter Crosthwaite, 2015/05/24
- [Qemu-devel] [PATCH v3 2/7] disas: QOMify target specific setup, Peter Crosthwaite, 2015/05/24
- [Qemu-devel] [PATCH v3 3/7] disas: arm-a64: Make printfer and stream variable,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH v3 4/7] disas: arm: QOMify target specific disas setup, Peter Crosthwaite, 2015/05/24
- [Qemu-devel] [PATCH v3 5/7] disas: microblaze: QOMify target specific disas setup, Peter Crosthwaite, 2015/05/24
- [Qemu-devel] [PATCH v3 6/7] disas: cris: Fix 0 buffer length case, Peter Crosthwaite, 2015/05/24
- [Qemu-devel] [PATCH v3 7/7] disas: cris: QOMify target specific disas setup, Peter Crosthwaite, 2015/05/24