From patchwork Tue Jan 7 16:51:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 22915 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AA477216DB for ; Tue, 7 Jan 2014 16:52:02 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id g10sf1485602pdj.9 for ; Tue, 07 Jan 2014 08:52:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=1GabiGbe0uzg8cggFg1GCd74YHHBtiNrNFkGpx6aYRc=; b=gg1/UwowG3ywM63VN9bVPrRDMPdCQydPkF48rkbz+jQ0994mNBKfTu5ieUWRXec2Wj /7yZdsTM/vhn1iyuPV7XxVCJukJK1JcDK8HlBvJOOXz/hN0ya6IEDiK/2ke+X3tz90ez bQY/RBk0gnTSnP7wE/hn4Xr/ydZZDJ9pitbYdm7E6gQMy5wiUgCJbj32HkpqX8E5edl/ OxQS61IJLe0WsDcI8jslCTZfo45XKng6ubupW/L6haWTRY2q0HnvWCR/n28+eL1MPfwH 8540AhhJslaHDu4VkF7LfQx7mCnpPE2y9DL5yoHeL+4rjYJ//fdqykVuuZ0jPnRK/io2 nz7A== X-Gm-Message-State: ALoCoQkP+Y/9tDNTHAV8KqHdUXGmMXrkeRlM8URtAnAnwkhJ1+GRaHYH0CEveiNH9xqn5wbZLgXu X-Received: by 10.68.133.164 with SMTP id pd4mr17548640pbb.1.1389113521855; Tue, 07 Jan 2014 08:52:01 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.110.8 with SMTP id hw8ls172924qeb.72.gmail; Tue, 07 Jan 2014 08:52:01 -0800 (PST) X-Received: by 10.52.117.176 with SMTP id kf16mr62315354vdb.6.1389113521706; Tue, 07 Jan 2014 08:52:01 -0800 (PST) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx.google.com with ESMTPS id sc7si12703393vdc.30.2014.01.07.08.52.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 Jan 2014 08:52:01 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.54; Received: by mail-vb0-f54.google.com with SMTP id g10so290678vbg.41 for ; Tue, 07 Jan 2014 08:52:01 -0800 (PST) X-Received: by 10.58.146.5 with SMTP id sy5mr3656071veb.43.1389113521410; Tue, 07 Jan 2014 08:52:01 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp171312ved; Tue, 7 Jan 2014 08:52:00 -0800 (PST) X-Received: by 10.15.82.8 with SMTP id z8mr95313208eey.25.1389113498013; Tue, 07 Jan 2014 08:51:38 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id s8si89588209eeh.227.2014.01.07.08.51.33 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 07 Jan 2014 08:51:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1W0ZsG-0004h8-TI; Tue, 07 Jan 2014 16:51:28 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , Claudio Fontana , kvmarm@lists.cs.columbia.edu, Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Christoffer Dall , Anthony Liguori , Aurelien Jarno , Blue Swirl , Stefan Weil Subject: [PATCH 4/4] disas: Implement disassembly output for A64 Date: Tue, 7 Jan 2014 16:51:28 +0000 Message-Id: <1389113488-18005-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1389113488-18005-1-git-send-email-peter.maydell@linaro.org> References: <1389113488-18005-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Claudio Fontana Use libvixl to implement disassembly output in debug logs for A64, for both AArch64 hosts and targets. Signed-off-by: Claudio Fontana [PMM: * added support for target disassembly * switched to custom QEMUDisassembler so the output format matches what QEMU expects * make sure we correctly fall back to "just print hex" if we didn't build the AArch64 disassembler because of lack of a C++ compiler * simplify the aarch64.c<->aarch64-cxx.cc interface] Signed-off-by: Peter Maydell --- configure | 4 +++ disas.c | 14 ++++++-- disas/Makefile.objs | 7 ++++ disas/aarch64-cxx.cc | 80 +++++++++++++++++++++++++++++++++++++++++++++ disas/aarch64.c | 39 ++++++++++++++++++++++ disas/libvixl/Makefile.objs | 6 ++++ include/disas/bfd.h | 1 + target-arm/translate-a64.c | 2 +- 8 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 disas/aarch64-cxx.cc create mode 100644 disas/aarch64.c create mode 100644 disas/libvixl/Makefile.objs diff --git a/configure b/configure index 07b6be3..ed615c5 100755 --- a/configure +++ b/configure @@ -4611,6 +4611,10 @@ for i in $ARCH $TARGET_BASE_ARCH ; do arm) echo "CONFIG_ARM_DIS=y" >> $config_target_mak echo "CONFIG_ARM_DIS=y" >> config-all-disas.mak + if test -n "${cxx}"; then + echo "CONFIG_AARCH64_DIS=y" >> $config_target_mak + echo "CONFIG_AARCH64_DIS=y" >> config-all-disas.mak + fi ;; cris) echo "CONFIG_CRIS_DIS=y" >> $config_target_mak diff --git a/disas.c b/disas.c index 0203ef2..fe2853b 100644 --- a/disas.c +++ b/disas.c @@ -190,7 +190,7 @@ static int print_insn_od_target(bfd_vma pc, disassemble_info *info) /* Disassemble this for me please... (debugging). 'flags' has the following values: i386 - 1 means 16 bit code, 2 means 64 bit code - arm - bit 0 = thumb, bit 1 = reverse endian + arm - bit 0 = thumb, bit 1 = reverse endian, bit 2 = AArch64 ppc - nonzero means little endian other targets - unused */ @@ -225,7 +225,15 @@ void target_disas(FILE *out, CPUArchState *env, target_ulong code, } print_insn = print_insn_i386; #elif defined(TARGET_ARM) - if (flags & 1) { + if (flags & 4) { + /* We might not be compiled with the AArch64 disassembler + * because it needs a C++ compiler; in that case we will + * fall through to the default print_insn_od case. + */ +#if defined(TARGET_AARCH64) && defined(CONFIG_AARCH64_DIS) + print_insn = print_insn_aarch64; +#endif + } else if (flags & 1) { print_insn = print_insn_thumb1; } else { print_insn = print_insn_arm; @@ -356,6 +364,8 @@ void disas(FILE *out, void *code, unsigned long size) #elif defined(_ARCH_PPC) s.info.disassembler_options = (char *)"any"; print_insn = print_insn_ppc; +#elif defined(__aarch64__) && defined(CONFIG_AARCH64_DIS) + print_insn = print_insn_aarch64; #elif defined(__alpha__) print_insn = print_insn_alpha; #elif defined(__sparc__) diff --git a/disas/Makefile.objs b/disas/Makefile.objs index 3b1e77a..f468c22 100644 --- a/disas/Makefile.objs +++ b/disas/Makefile.objs @@ -1,3 +1,10 @@ +ifeq ($(CONFIG_AARCH64_DIS),y) +libvixldir = $(SRC_PATH)/disas/libvixl/src +QEMU_CFLAGS += -I$(libvixldir) -Wno-undef +common-obj-$(CONFIG_AARCH64_DIS) += libvixl/ +common-obj-$(CONFIG_AARCH64_DIS) += aarch64.o aarch64-cxx.o +endif + common-obj-$(CONFIG_ALPHA_DIS) += alpha.o common-obj-$(CONFIG_ARM_DIS) += arm.o common-obj-$(CONFIG_CRIS_DIS) += cris.o diff --git a/disas/aarch64-cxx.cc b/disas/aarch64-cxx.cc new file mode 100644 index 0000000..6a7d0b3 --- /dev/null +++ b/disas/aarch64-cxx.cc @@ -0,0 +1,80 @@ +/* + * AArch64 disassembly output wrapper to libvixl - C++ part + * Copyright (c) 2013 Linaro Limited + * Written by Claudio Fontana + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* This is the C++ half of the interface between QEMU and libvixl; + * it's a separate file from aarch64.c so that we don't have to make + * the bfd.h header palatable to a C++ compiler. + */ + +#include "a64/simulator-a64.h" +#include "a64/macro-assembler-a64.h" + +extern "C" { + int vixl_decode_insn(FILE *stream, uint8_t *bytes); +} + +using namespace vixl; + +static Decoder *vixl_decoder = NULL; +static Disassembler *vixl_disasm = NULL; + +/* We don't use libvixl's PrintDisassembler because its output + * is a little unhelpful (trailing newlines, for example). + * Instead we use our own very similar variant so we have + * control over the format. + */ +class QEMUDisassembler : public Disassembler { +public: + explicit QEMUDisassembler(FILE *stream) : stream_(stream) { } + ~QEMUDisassembler() { } + +protected: + void ProcessOutput(Instruction *instr) { + fprintf(stream_, "%08" PRIx32 " %s", + instr->InstructionBits(), GetOutput()); + } + +private: + FILE *stream_; +}; + +static int vixl_is_initialized(void) +{ + return vixl_decoder != NULL; +} + +static void vixl_init(FILE *f) { + vixl_decoder = new Decoder(); + vixl_disasm = new QEMUDisassembler(f); + vixl_decoder->AppendVisitor(vixl_disasm); +} + +/* This is our only entry point from QEMU's C code */ +int vixl_decode_insn(FILE *stream, uint8_t *bytes) +{ + Instr instr; + + if (!vixl_is_initialized()) { + vixl_init(stream); + } + + instr = bytes[0] | bytes[1] << 8 | bytes[2] << 16 | bytes[3] << 24; + vixl_decoder->Decode(reinterpret_cast(&instr)); + return 1; +} diff --git a/disas/aarch64.c b/disas/aarch64.c new file mode 100644 index 0000000..a13b7b1 --- /dev/null +++ b/disas/aarch64.c @@ -0,0 +1,39 @@ +/* + * AArch64 disassembly output wrapper to libvixl - C part + * Copyright (c) 2013 Linaro Limited + * Written by Claudio Fontana + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "disas/bfd.h" +#define INSN_SIZE 4 + +extern int vixl_decode_insn(FILE *stream, uint8_t *); + +/* Disassemble Aarch64 bytecode. */ +int print_insn_aarch64(uint64_t addr, disassemble_info *info) +{ + uint8_t bytes[INSN_SIZE]; + int status; + + status = info->read_memory_func(addr, bytes, INSN_SIZE, info); + if (status != 0) { + info->memory_error_func(status, addr, info); + return -1; + } + + vixl_decode_insn(info->stream, bytes); + return INSN_SIZE; +} diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs new file mode 100644 index 0000000..43ba29c --- /dev/null +++ b/disas/libvixl/Makefile.objs @@ -0,0 +1,6 @@ +libvixl_OBJS = src/utils.o \ + src/a64/instructions-a64.o \ + src/a64/decoder-a64.o \ + src/a64/disasm-a64.o + +common-obj-$(CONFIG_AARCH64_DIS) += $(libvixl_OBJS) diff --git a/include/disas/bfd.h b/include/disas/bfd.h index 803b6ef..73017da 100644 --- a/include/disas/bfd.h +++ b/include/disas/bfd.h @@ -379,6 +379,7 @@ int print_insn_h8300 (bfd_vma, disassemble_info*); int print_insn_h8300h (bfd_vma, disassemble_info*); int print_insn_h8300s (bfd_vma, disassemble_info*); int print_insn_h8500 (bfd_vma, disassemble_info*); +int print_insn_aarch64 (bfd_vma, disassemble_info*); int print_insn_alpha (bfd_vma, disassemble_info*); disassembler_ftype arc_get_disassembler (int, int); int print_insn_arm (bfd_vma, disassemble_info*); diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index c9fbf0f..696708e 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -4029,7 +4029,7 @@ done_generating: qemu_log("----------------\n"); qemu_log("IN: %s\n", lookup_symbol(pc_start)); log_target_disas(env, pc_start, dc->pc - pc_start, - dc->thumb | (dc->bswap_code << 1)); + 4 | (dc->bswap_code << 1)); qemu_log("\n"); } #endif