From patchwork Sun Oct 22 00:46:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 116616 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3187695qgn; Sat, 21 Oct 2017 17:51:10 -0700 (PDT) X-Received: by 10.55.87.199 with SMTP id l190mr12961359qkb.30.1508633470353; Sat, 21 Oct 2017 17:51:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508633470; cv=none; d=google.com; s=arc-20160816; b=j2WWyGYWr90M0zQNsAz1MDMSVpBQ2sA3jgL2h57W37vimAWjiffnTOI6q4bLs3saR1 G5+lcmlCgME6f/VEQUjMxHOHzx9HN4WCC4Hxo8XNBKkIdsQu9vkpS9OAd5GmbjETxfkr VFJoAE/48V0VcCKWiGF29fKDux7cs9N03qdmcvU2hk6bHYdvkXDfBRjCZnwRfzd30IZ/ /uLS2j5hgkC0WfE7IPumTCgug9bqGD9jJiospfcZFu7TDaOA/YuyKi8QDxrZLq10UrHf rlK1cijWBCr9raqx7dsaJPtQ7GJnKApnYKeV2UWmcgzhmMNfuD5dkOY8Io7+iN27NCc6 Dv/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=3cRCPwJbjSlpKKvbJpiNRwCc9ag14Tc1JWpw8JTCZLI=; b=WqEBVSeM7M6Xv8rIsFnhXzjd6jU/HwN+3MwO8iNo+4Je3R48MHLIuG//pmtqMPYYgK TtGk1gK6HJ3xFzQ976yqDbFW7vMAreWQyXwT6yBMZwcr8QMhFhjbvZc1n15Ha+6O/lOA ByJwtauSFJS6peL8OwbTnhxRa21lOu9VNQXbdJ5uNyj60MONZ+VT8xjc+KuCqd6a9UQ8 lfJi4LAZg5DLimqJPO/qyPdHmug7GiOn6rflPxmLi5E7JFbCu6yP/hki1H15qGvhS8ss KU0lL5U2Nfusc+yrJGJ1D/7BINDM5PbLIOVAH3EnQDEkcDN4y72x4qwtsz/unLglx4JX bh+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LNKamPJu; 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 q11si299669qtg.56.2017.10.21.17.51.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 21 Oct 2017 17:51:10 -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=LNKamPJu; 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]:59640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e64Ts-0005AF-5M for patch@linaro.org; Sat, 21 Oct 2017 20:51:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e64PQ-0002CR-4b for qemu-devel@nongnu.org; Sat, 21 Oct 2017 20:46:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e64PP-0008Eq-0w for qemu-devel@nongnu.org; Sat, 21 Oct 2017 20:46:32 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:48323) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e64PO-0008Dw-O3 for qemu-devel@nongnu.org; Sat, 21 Oct 2017 20:46:30 -0400 Received: by mail-pg0-x242.google.com with SMTP id v78so9203667pgb.5 for ; Sat, 21 Oct 2017 17:46:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=3cRCPwJbjSlpKKvbJpiNRwCc9ag14Tc1JWpw8JTCZLI=; b=LNKamPJur6fo7ZqbhG2dY4TFii4VboeBFMxLbMv5BlQ2af+7EvrkqH4hlAWhToUbdF G9S271wi6zq838jM4MbxC6pFbNemQ89i35z1bLzKyaBRH7qq4REUWPxpdOOLLVNC/WeM nznpRJP7JpmE85NhjVf+v127FZ8t3hdYYHi1M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3cRCPwJbjSlpKKvbJpiNRwCc9ag14Tc1JWpw8JTCZLI=; b=J4su7szAtOcCFQB9/6ON6hachweh+dpshtxZg5UnAaDGHlpgF+hAo7fyFzBr2yD/yq oSlw+8sXKYaYbDwgtzckBwl+IUQdq1k0E3Kh/VdHBwgMUCnle1OVwCvpDpCq9dIN9c9G etykGbc/KTaiu1/wSBJr8dBS7ob2YMzNK7xeCf59QKCzLjk7pDVpI7Jg06NMq48IeIHj 5WqDn3J4LRR8lVUL2o/TQUtmvm/iIhREn5/zW3S92qqk55Qkl0p9Oa2VIhafVnjo3dri pASBQnJNcQGNvcXAXazTV+2FIhvGjqx2ioCa7RU9/9btijuY2RqYtD9uLJGkO3KNWnoX LkGQ== X-Gm-Message-State: AMCzsaW0QCVFN/Qs/2/qqT0dRXwQWVpogdtN3afI979hnyPyxqamEnbg i0+4z/MXtLfBPWGXG9IgPlyGI2fbOPA= X-Google-Smtp-Source: ABhQp+RRf+itYQ0PYkac6ofyVWvKQ55FGZUQ1aWukwupy4UujdPKimqacit9Lzn0xmgPyAdceBfDuA== X-Received: by 10.99.119.3 with SMTP id s3mr8117309pgc.172.1508633189334; Sat, 21 Oct 2017 17:46:29 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-158.tukw.qwest.net. [174.21.9.158]) by smtp.gmail.com with ESMTPSA id j12sm5766728pgs.35.2017.10.21.17.46.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Oct 2017 17:46:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 21 Oct 2017 17:46:13 -0700 Message-Id: <20171022004621.28372-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171022004621.28372-1-richard.henderson@linaro.org> References: <20171022004621.28372-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:c05::242 Subject: [Qemu-devel] [PATCH v7 03/11] 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: , 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/include/disas/bfd.h b/include/disas/bfd.h index d99da68267..2852f80ed6 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 @@ -479,7 +473,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 88578f360e..82dad0b721 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -473,21 +473,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); @@ -513,10 +498,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;