From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ype2F-0000Zi-Cl for qemu-devel@nongnu.org; Tue, 05 May 2015 10:41:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ype29-0007d1-Oi for qemu-devel@nongnu.org; Tue, 05 May 2015 10:41:23 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:8448) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ype29-0007ch-H2 for qemu-devel@nongnu.org; Tue, 05 May 2015 10:41:17 -0400 Message-ID: <5548D67D.90603@huawei.com> Date: Tue, 5 May 2015 16:41:01 +0200 From: Claudio Fontana MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 5/7] disas: arm-a64: Make printfer and stream variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, claudio.fontana@gmail.com, Peter Crosthwaite , agraf@suse.de, edgari@xilinx.com, edgar.iglesias@gmail.com, rth@twiddle.net On 05.05.2015 06:45, Peter Crosthwaite 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). > > Signed-off-by: Peter Crosthwaite > --- > 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..d725e75 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) { } > + explicit QEMUDisassembler() { } > ~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(&instrval); > vixl_disasm->MapCodeAddress(addr, instr); > Reviewed-by: Claudio Fontana Tested-by: Claudio Fontana