On Sun, May 24, 2015 at 3:47 PM, Peter Crosthwaite
<crosthwaitepe...@gmail.com> wrote:
> 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).
>
This sentence is stale from a previous version. Removed.
> Reviewed-by: Claudio Fontana <claudio.font...@huawei.com>
> Tested-by: Claudio Fontana <claudio.font...@huawei.com>
> Reviewed-by: Richard Henderson <r...@twiddle.net>
> Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com>
> ---
> 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) { }
Constructor args need to be reversed to avoid compile warning (doh).
Both fixed in v4.
Regards,
Peter
> ~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
>
>
