From patchwork Thu Oct 19 21:21:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 116442 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp954051qgn; Thu, 19 Oct 2017 14:24:17 -0700 (PDT) X-Received: by 10.55.122.193 with SMTP id v184mr3698618qkc.317.1508448257735; Thu, 19 Oct 2017 14:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508448257; cv=none; d=google.com; s=arc-20160816; b=RHldjIvyu7Mv2KBZerJ6NYhwhxFDRwGnrKWmkDHP4U5EtfFt87o2jkAYjG1ksO0ILm KX1XSBlTaTlFowTSkdzYCqd8f0aXjBuTW8UR0Iig8+H8dE46mNkjZDTSWuSnUWS+jpEX +TAN7doNCMyCbShmLYSVnn4RnRbXULmyjyW9m+zH7L8KK2BwQyT+ZlDxdnCBpRPTBs/O HaYxB9gIAcy6lKSVDQdMpuGjiV5DbwpqKjZ8hZ4UM+XN64TXR2XMZjAKIIPKSsAFId5I LYq8AiEmze0uGYSUHTQhtRyulz6lpMSsoIlQAi7akiwwxI15PBgnN55B05pUv+KhbuCu 0qmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=/NEIM0B2s4cMjB5LDnTWIKVEaFdJ5/nFzSV3JZkIDck=; b=1FahupZRFe2vmxP84rapKaTS9W8U2F4mnreBNkewW8SoKBd9nljni/jhoncWiWbN1Q iJf0P4egQgFqepqUtWmN39ZYP4OziSBmwwQktJ9ALNxK3qd+65YL27cCnqtM7/PXkxg0 +OhhYVFskACRRJQX4JzTF4PUGwmrmBr6V4NdjQb4vAPoqb8HViMDEt47t9Zua2LOTyiB UbO7IvJP18Djdwsqo4D4AFNmAh/Rvv9kAGEgIpxLW5hnkBvjp5b/VrATHpeJvWtESZVq m3VXhcc/K+SxXoTPmoiaBI4tHWWOX/qhYsEr/5nOSZaH0r6izwqQsdcgwe949OMpVLVU 4rxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KZYrEtFf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l75si8065728qke.356.2017.10.19.14.24.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 19 Oct 2017 14:24:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KZYrEtFf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5IIZ-0001MO-L0 for patch@linaro.org; Thu, 19 Oct 2017 17:24:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5IFh-0007gr-D0 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 17:21:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5IFf-00089k-8a for qemu-devel@nongnu.org; Thu, 19 Oct 2017 17:21:17 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:56412) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e5IFf-00088q-04 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 17:21:15 -0400 Received: by mail-pf0-x243.google.com with SMTP id b85so7807158pfj.13 for ; Thu, 19 Oct 2017 14:21:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/NEIM0B2s4cMjB5LDnTWIKVEaFdJ5/nFzSV3JZkIDck=; b=KZYrEtFfEgYmc0MAugqWPAEykep3bz2DdehLKqtBCIz7qq+JXs3HNY6TL/5vxFYmPS xk89lJPqWR0IR66IcQ9ExPgeE8KPQ7Jclgaz7mEp7aPyjDluayPrUV23s8fAzd0cYC+h K5R1nG9RTbonn9p45wiHM7TLFiYuP6vJOlhgQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/NEIM0B2s4cMjB5LDnTWIKVEaFdJ5/nFzSV3JZkIDck=; b=dOrCNWmE5q5AZiUwK70+JQcJjzHVMvJwKKTPy2T8Ab8hd3n+RiPD+SBF4Q0sTw8Uo9 Tlp5BMyNQ49PZq7Qi+InSNqCB/v0JGyiaKsj+53WMOJNgSjQde2icrN3I23iwCQnQIFq O2v2vEcDbB7sVBTY56P62GkcBXdT09o9DNIgu/3Nwei3e48X76CnZ0g5uvmx4/QLVuQS 2wKqhLD3DSASQD4X+4nQp+6N8uPZlsFrrNeIgyZff6bm2A3TH5A1q89RXWPpBcyzvFPS KiAjZFlYL4UYGTw0pXm/VkoqvKVKvZE5jbaXiVZ8BMQKON+JhP/1qCtERBFOD0MIyhRf ILxg== X-Gm-Message-State: AMCzsaW/7LaZ39A4iKN/bEyXve5536yDM8IXtk2wfG4cI8s3Mw64tXLu 3hzYd6d8Cm19QfA9CVKuQzCXLJjFv+M= X-Google-Smtp-Source: ABhQp+S/8ft7TZtQod/8msHFyYOHEan/dqjzmh6bIQVNBP69ovQae9ITmF2FGmK8HEVURYUGc3wMAg== X-Received: by 10.84.232.7 with SMTP id h7mr2446820plk.274.1508448073678; Thu, 19 Oct 2017 14:21:13 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-165-104.tukw.qwest.net. [97.113.165.104]) by smtp.gmail.com with ESMTPSA id 2sm29839688pfn.185.2017.10.19.14.21.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Oct 2017 14:21:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 19 Oct 2017 14:21:08 -0700 Message-Id: <20171019212109.11341-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019212109.11341-1-richard.henderson@linaro.org> References: <20171019212109.11341-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH 1/2] target/arm: Move BE32 disassembler fixup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The Capstone disassembler has its own big-endian fixup. Doing this twice does not work, of course. Move our current fixup from target/arm/cpu.c to disas/arm.c. This makes read_memory_inner_func unused and can be removed. Signed-off-by: Richard Henderson --- include/disas/bfd.h | 7 ------- disas/arm.c | 21 ++++++++++++++++----- target/arm/cpu.c | 19 ------------------- 3 files changed, 16 insertions(+), 31 deletions(-) -- 2.13.6 diff --git a/include/disas/bfd.h b/include/disas/bfd.h index 9b0657cfa9..1f88c9e9d5 100644 --- a/include/disas/bfd.h +++ b/include/disas/bfd.h @@ -307,12 +307,6 @@ typedef struct disassemble_info { (bfd_vma memaddr, bfd_byte *myaddr, int length, struct disassemble_info *info); - /* A place to stash the real read_memory_func if read_memory_func wants to - do some funky address arithmetic or similar (e.g. for ARM BE32 mode). */ - int (*read_memory_inner_func) - (bfd_vma memaddr, bfd_byte *myaddr, int length, - struct disassemble_info *info); - /* Function which should be called if we get an error that we can't recover from. STATUS is the errno value from read_memory_func and MEMADDR is the address that we were trying to read. INFO is a @@ -483,7 +477,6 @@ int generic_symbol_at_address(bfd_vma, struct disassemble_info *); (INFO).buffer_vma = 0, \ (INFO).buffer_length = 0, \ (INFO).read_memory_func = buffer_read_memory, \ - (INFO).read_memory_inner_func = NULL, \ (INFO).memory_error_func = perror_memory, \ (INFO).print_address_func = generic_print_address, \ (INFO).print_insn = NULL, \ diff --git a/disas/arm.c b/disas/arm.c index 27396dd3e1..9967c45990 100644 --- a/disas/arm.c +++ b/disas/arm.c @@ -70,6 +70,17 @@ static void floatformat_to_double (unsigned char *data, double *dest) *dest = u.f; } +static int arm_read_memory(bfd_vma memaddr, bfd_byte *b, int length, + struct disassemble_info *info) +{ + assert((info->flags & INSN_ARM_BE32) == 0 || length == 2 || length == 4); + + if ((info->flags & INSN_ARM_BE32) != 0 && length == 2) { + memaddr ^= 2; + } + return info->read_memory_func(memaddr, b, length, info); +} + /* End of qemu specific additions. */ struct opcode32 @@ -3810,7 +3821,7 @@ find_ifthen_state (bfd_vma pc, struct disassemble_info *info, return; } addr -= 2; - status = info->read_memory_func (addr, (bfd_byte *)b, 2, info); + status = arm_read_memory (addr, (bfd_byte *)b, 2, info); if (status) return; @@ -3882,7 +3893,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) info->bytes_per_chunk = size; printer = print_insn_data; - status = info->read_memory_func (pc, (bfd_byte *)b, size, info); + status = arm_read_memory (pc, (bfd_byte *)b, size, info); given = 0; if (little) for (i = size - 1; i >= 0; i--) @@ -3899,7 +3910,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) info->bytes_per_chunk = 4; size = 4; - status = info->read_memory_func (pc, (bfd_byte *)b, 4, info); + status = arm_read_memory (pc, (bfd_byte *)b, 4, info); if (little) given = (b[0]) | (b[1] << 8) | (b[2] << 16) | ((unsigned)b[3] << 24); else @@ -3915,7 +3926,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) info->bytes_per_chunk = 2; size = 2; - status = info->read_memory_func (pc, (bfd_byte *)b, 2, info); + status = arm_read_memory (pc, (bfd_byte *)b, 2, info); if (little) given = (b[0]) | (b[1] << 8); else @@ -3929,7 +3940,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) || (given & 0xF800) == 0xF000 || (given & 0xF800) == 0xE800) { - status = info->read_memory_func (pc + 2, (bfd_byte *)b, 2, info); + status = arm_read_memory (pc + 2, (bfd_byte *)b, 2, info); if (little) given = (b[0]) | (b[1] << 8) | (given << 16); else diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 1576a6d372..bc9d70df04 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -474,21 +474,6 @@ print_insn_thumb1(bfd_vma pc, disassemble_info *info) return print_insn_arm(pc | 1, info); } -static int arm_read_memory_func(bfd_vma memaddr, bfd_byte *b, - int length, struct disassemble_info *info) -{ - assert(info->read_memory_inner_func); - assert((info->flags & INSN_ARM_BE32) == 0 || length == 2 || length == 4); - - if ((info->flags & INSN_ARM_BE32) != 0 && length == 2) { - assert(info->endian == BFD_ENDIAN_LITTLE); - return info->read_memory_inner_func(memaddr ^ 2, (bfd_byte *)b, 2, - info); - } else { - return info->read_memory_inner_func(memaddr, b, length, info); - } -} - static void arm_disas_set_info(CPUState *cpu, disassemble_info *info) { ARMCPU *ac = ARM_CPU(cpu); @@ -528,10 +513,6 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info) info->endian = BFD_ENDIAN_BIG; #endif } - if (info->read_memory_inner_func == NULL) { - info->read_memory_inner_func = info->read_memory_func; - info->read_memory_func = arm_read_memory_func; - } info->flags &= ~INSN_ARM_BE32; if (arm_sctlr_b(env)) { info->flags |= INSN_ARM_BE32;