From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E16BC3A5A1 for ; Wed, 28 Aug 2019 20:04:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C894720828 for ; Wed, 28 Aug 2019 20:04:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UJ9snoqA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C894720828 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i34B9-0003J5-Gp for qemu-devel@archiver.kernel.org; Wed, 28 Aug 2019 16:04:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38535) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33Gg-0003sa-O6 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33Ge-0000Xe-TF for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:06 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:33090) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33Gc-0000Vf-K0 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:03 -0400 Received: by mail-pf1-x442.google.com with SMTP id g2so411419pfq.0 for ; Wed, 28 Aug 2019 12:06:01 -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=G4RFBC/bjFBDl9Ozu5vssYifGaa+CV/ji6uZKewPJ78=; b=UJ9snoqAXyCXoSI+hR4I1xLL8HHu491cpDZ0V7rRC1766NyduW4amydZzNQD/WZILx FGeoYJYerNcWhKRl/mB5QfVjgMBVEW8HamoSLnq5II2G165oegubS1PcsayCw+GHrgTa L/QPQZX9/vQzBSfkKjREFAg6XTiVOJWH4z00l+QChSrpLOyLvCN1pjCrm2D/eHHQEpZV itCOox16LC3B6dzqjSyq+3yI1fxVwHFaY3zdzA/vkrpX41x9FTOwBR7gdJUIYBm8KO+j MFMFdh6PBiawV3W7qbOinHoazG3XZ3OQqijEcx5qkVO5T8dzYJSnlyNEpIzXONcNIeAU q4eQ== 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=G4RFBC/bjFBDl9Ozu5vssYifGaa+CV/ji6uZKewPJ78=; b=IxvPrf26kK1eusJ7b+v0K5htrGTzdnZVXyteYn/YqyHr/lzr7nyG2UGV4nbqaASO8B 7EjGsPFak44Y3feKtbgsdUo18G3A/ZBwSyskwWBYWj0qJOiMHq93e/yz3hFERwVW8jnX g6YF7cr5X+rwJPNyQQ4voxBC4ogcKVHe/X+tH5oca/20OK8gKmv08RRyyrPSdYWuTqDY Qgx0Hdke/hfFRps7H8ShdJRF6kgmytY0w7WVz7/9XEjwnxDuymrtISX+r3RWdtouum76 3hUe05RTMgLvwj2pu+oSd3Xx/FMMuRXRvxNl/3yiwZp+ZBDc4DGwlpSQpBheZtxO6Py9 yELg== X-Gm-Message-State: APjAAAXIAN4pWufiGGvcZKeyoELIM5M3caRj2xZAAOvtlKEvany2busz i3hgC8SkoiMlYNSewTWDFyfxf5Zf44E= X-Google-Smtp-Source: APXvYqyj0N6Efrf0HrdXvWJBabifhJI4wuJpeF4qdi/zyFXub/3//9B2znG2NMusnxORftybDlivUA== X-Received: by 2002:a62:ed10:: with SMTP id u16mr6442673pfh.179.1567019159891; Wed, 28 Aug 2019 12:05:59 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id f27sm2967944pgm.60.2019.08.28.12.05.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:05:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:04:34 -0700 Message-Id: <20190828190456.30315-48-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828190456.30315-1-richard.henderson@linaro.org> References: <20190828190456.30315-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 Subject: [Qemu-devel] [PATCH v3 47/69] target/arm: Convert T16 load/store (register offset) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/translate.c | 51 ++---------------------------------------- target/arm/t16.decode | 15 +++++++++++++ 2 files changed, 17 insertions(+), 49 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index 6e841c346f..73b4ac8efb 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10841,55 +10841,8 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) goto illegal_op; case 5: - /* load/store register offset. */ - rd = insn & 7; - rn = (insn >> 3) & 7; - rm = (insn >> 6) & 7; - op = (insn >> 9) & 7; - addr = load_reg(s, rn); - tmp = load_reg(s, rm); - tcg_gen_add_i32(addr, addr, tmp); - tcg_temp_free_i32(tmp); - - if (op < 3) { /* store */ - tmp = load_reg(s, rd); - } else { - tmp = tcg_temp_new_i32(); - } - - switch (op) { - case 0: /* str */ - gen_aa32_st32_iss(s, tmp, addr, get_mem_index(s), rd | ISSIs16Bit); - break; - case 1: /* strh */ - gen_aa32_st16_iss(s, tmp, addr, get_mem_index(s), rd | ISSIs16Bit); - break; - case 2: /* strb */ - gen_aa32_st8_iss(s, tmp, addr, get_mem_index(s), rd | ISSIs16Bit); - break; - case 3: /* ldrsb */ - gen_aa32_ld8s_iss(s, tmp, addr, get_mem_index(s), rd | ISSIs16Bit); - break; - case 4: /* ldr */ - gen_aa32_ld32u_iss(s, tmp, addr, get_mem_index(s), rd | ISSIs16Bit); - break; - case 5: /* ldrh */ - gen_aa32_ld16u_iss(s, tmp, addr, get_mem_index(s), rd | ISSIs16Bit); - break; - case 6: /* ldrb */ - gen_aa32_ld8u_iss(s, tmp, addr, get_mem_index(s), rd | ISSIs16Bit); - break; - case 7: /* ldrsh */ - gen_aa32_ld16s_iss(s, tmp, addr, get_mem_index(s), rd | ISSIs16Bit); - break; - } - if (op >= 3) { /* load */ - store_reg(s, rd, tmp); - } else { - tcg_temp_free_i32(tmp); - } - tcg_temp_free_i32(addr); - break; + /* load/store register offset, in decodetree */ + goto illegal_op; case 6: /* load/store word immediate offset */ diff --git a/target/arm/t16.decode b/target/arm/t16.decode index 44e7250c55..83fe4363c7 100644 --- a/target/arm/t16.decode +++ b/target/arm/t16.decode @@ -23,6 +23,7 @@ &s_rrr_shr !extern s rn rd rm rs shty &s_rri_rot !extern s rn rd imm rot &s_rrrr !extern s rd rn rm ra +&ldst_rr !extern p w u rn rt rm shimm shtype # Set S if the instruction is outside of an IT block. %s !function=t16_setflags @@ -54,3 +55,17 @@ ORR_rrri 010000 1100 ... ... @lll_noshr MUL 010000 1101 rn:3 rd:3 &s_rrrr %s rm=%reg_0 ra=0 BIC_rrri 010000 1110 ... ... @lll_noshr MVN_rxri 010000 1111 ... ... @lll_noshr + +# Load/store (register offset) + +@ldst_rr ....... rm:3 rn:3 rt:3 \ + &ldst_rr p=1 w=0 u=1 shimm=0 shtype=0 + +STR_rr 0101 000 ... ... ... @ldst_rr +STRH_rr 0101 001 ... ... ... @ldst_rr +STRB_rr 0101 010 ... ... ... @ldst_rr +LDRSB_rr 0101 011 ... ... ... @ldst_rr +LDR_rr 0101 100 ... ... ... @ldst_rr +LDRH_rr 0101 101 ... ... ... @ldst_rr +LDRB_rr 0101 110 ... ... ... @ldst_rr +LDRSH_rr 0101 111 ... ... ... @ldst_rr -- 2.17.1