From patchwork Wed Aug 18 21:29:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 499018 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp1060021jab; Wed, 18 Aug 2021 14:39:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4OKYgH9Re9GuLF4aqvr0wmzveIRvKMVKZ/jXByOAsnua6LKpyP6DZjP19qGABB4NN17wJ X-Received: by 2002:a25:e0c2:: with SMTP id x185mr14288320ybg.69.1629322794163; Wed, 18 Aug 2021 14:39:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629322794; cv=none; d=google.com; s=arc-20160816; b=ZkZsubmL1klwIO8h7GqhjUEPd/Oae8LmfenOScKOC/UZQXq05aHlN5elJGxcA+rWqW iuNt36aPJmHcIP2AldZA2a/p1rDo5V8lAn3L7UtyF99KiXF1Gsh7KaPf97/GhT1PsJzq 8mp7Fo17y/9vov7pYV5JO5Cx7iSMxGbtjVDQDblfqaVKMSe2KjusnqKE3TobuTZnf28i 1JGU4HuUfWedYrkOS9+V8Lx686HBQxbtIOCgRT6J5+FGm7GLuC+MbWuFh+snYIpehoI+ xXMrD+kKyGlE/srhcYRs1m4EPct08vCOMF7MdKiF/ZSJMw6sdmb9uZ9KRsPEoZw65ML5 qniQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=4ML6y7H6wqkUViLdFf24+VFsSyj9FBO2oO9/0ZfWQE0=; b=W+Vk4SaPYeH5cLHjWszLnrp0fdUQ2qDd88+k70YE9NEQ5IvqciYRJNfnn3oxQQp95Y B09xUdCohZJm4Ltg2rkJKb/Vqu6tRUiMKV2m2Bgm5kWIwXEeWpdMhzH7WSoX6vr5fAcl W9yRiiAjSsFIPbwghdx6TTFM+VLGz0q3COrTFLtWcNszNHo3x5taTULuAAr+MVKYMWXq OAsfPhqWl12oTMRjvpKB4gxz4+0mcymWonxbBAh1MraYWHSIKBuZpoQFPVL1s8K9289Q cmT4yeMswJxsdbCnVQuHmAOpocQcGmxDJrjfEKXIfJNaHxJOpbCcTL0my4lqnTEjSe9X oU9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ac2g6rsx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z4si833277yba.72.2021.08.18.14.39.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Aug 2021 14:39:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ac2g6rsx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGTHt-0006D0-Jm for patch@linaro.org; Wed, 18 Aug 2021 17:39:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGT7q-0006DT-QX for qemu-devel@nongnu.org; Wed, 18 Aug 2021 17:29:30 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]:45775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGT7n-0005oF-1v for qemu-devel@nongnu.org; Wed, 18 Aug 2021 17:29:30 -0400 Received: by mail-pj1-x1036.google.com with SMTP id m24-20020a17090a7f98b0290178b1a81700so3300492pjl.4 for ; Wed, 18 Aug 2021 14:29:26 -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:mime-version :content-transfer-encoding; bh=4ML6y7H6wqkUViLdFf24+VFsSyj9FBO2oO9/0ZfWQE0=; b=ac2g6rsxNklpad1s9f7B8Zi8bght+mPkQWYW7m3C4wyfEto7kEVjRTUqWQm0PzYirA SXow364WxHig4aJV0wiLHsy/J9nN9KuFPgFqUxBf4PCG2Zn/0ebnYOi3ioydEkOMD3lm NyBhOwTlZtPHHsIOCcsvQBDQlq+mFFc7LgSnuOSWJ/+JXx/aOEAwlYpJjNc2zqXdlfy6 Er4tA/1+nY7bhOO0+BeJQrz7AG+tAj7+LpVxiyQyr0rJ/I/Sue4e3gqXij8VRFuE30Uu 5T9ugAbNvZIomPtCTsLSyF3xTFZ3RI29Sle5a8mMbTOw0ORzjgNw7G0raJo6gn9UsOgT 3b+Q== 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:mime-version:content-transfer-encoding; bh=4ML6y7H6wqkUViLdFf24+VFsSyj9FBO2oO9/0ZfWQE0=; b=RQuygiU/y7yG//rWLlJVBueFCQv6RnQhTRYPVL1Zgqy0+t1iixio7sUZeaijEvulXI tFFDT+0ktAPx1UubPaudGFP+jPmXsKcS2/DfDd/zBIqmzAzfEVcpi5cMO9WWn3lOMWJa bdHWV7ZOiJPS/MXGUcqybm9K4O5MN0c6e3cWEj+RYQoriQqHJHIsZBRkqPYi67KAvv8N X87mit8dCd8Bf65RGuUKUafcHaoG0Wn7UBLmE4nxRj120AWsuJA+xETPvWbp2hdhEWqb tT22+Mrd6ciP0xV8uvu8SMoGxMjTPXO/M5QjgW1t595Y4WuljtdVrXt3s+u98zJ3ycld tRvg== X-Gm-Message-State: AOAM533mp5/fP8kbIr9US3JIgxhjVHyWFoYIGdotj3z3ohjs6g8FsQzK mn3ZQ8+KraGwhdQjrzF3JgWjo3fhndJ+4w== X-Received: by 2002:a17:90a:6684:: with SMTP id m4mr11493738pjj.226.1629322165743; Wed, 18 Aug 2021 14:29:25 -0700 (PDT) Received: from localhost.localdomain ([173.197.107.15]) by smtp.gmail.com with ESMTPSA id y19sm751965pfe.71.2021.08.18.14.29.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 14:29:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 11/14] tcg/arm: More use of the ARMInsn enum Date: Wed, 18 Aug 2021 11:29:09 -1000 Message-Id: <20210818212912.396794-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210818212912.396794-1-richard.henderson@linaro.org> References: <20210818212912.396794-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1036.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.c.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 2.25.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index b20c313615..2f55b94ada 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -563,7 +563,7 @@ static void tcg_out_blx_imm(TCGContext *s, int32_t offset) (((offset - 8) >> 2) & 0x00ffffff)); } -static void tcg_out_dat_reg(TCGContext *s, ARMCond cond, int opc, int rd, +static void tcg_out_dat_reg(TCGContext *s, ARMCond cond, ARMInsn opc, int rd, int rn, int rm, int shift) { tcg_out32(s, (cond << 28) | (0 << 25) | opc | @@ -596,14 +596,14 @@ static void tcg_out_b_reg(TCGContext *s, ARMCond cond, TCGReg rn) } } -static void tcg_out_dat_imm(TCGContext *s, ARMCond cond, int opc, +static void tcg_out_dat_imm(TCGContext *s, ARMCond cond, ARMInsn opc, int rd, int rn, int im) { tcg_out32(s, (cond << 28) | (1 << 25) | opc | (rn << 16) | (rd << 12) | im); } -static void tcg_out_ldstm(TCGContext *s, ARMCond cond, int opc, +static void tcg_out_ldstm(TCGContext *s, ARMCond cond, ARMInsn opc, TCGReg rn, uint16_t mask) { tcg_out32(s, (cond << 28) | opc | (rn << 16) | mask); @@ -630,8 +630,8 @@ static void tcg_out_memop_8(TCGContext *s, ARMCond cond, ARMInsn opc, TCGReg rt, (rn << 16) | (rt << 12) | ((imm8 & 0xf0) << 4) | (imm8 & 0xf)); } -static void tcg_out_memop_12(TCGContext *s, ARMCond cond, ARMInsn opc, TCGReg rt, - TCGReg rn, int imm12, bool p, bool w) +static void tcg_out_memop_12(TCGContext *s, ARMCond cond, ARMInsn opc, + TCGReg rt, TCGReg rn, int imm12, bool p, bool w) { bool u = 1; if (imm12 < 0) { @@ -866,7 +866,7 @@ static void tcg_out_movi32(TCGContext *s, ARMCond cond, int rd, uint32_t arg) * Emit either the reg,imm or reg,reg form of a data-processing insn. * rhs must satisfy the "rI" constraint. */ -static void tcg_out_dat_rI(TCGContext *s, ARMCond cond, int opc, TCGArg dst, +static void tcg_out_dat_rI(TCGContext *s, ARMCond cond, ARMInsn opc, TCGArg dst, TCGArg lhs, TCGArg rhs, int rhs_is_const) { if (rhs_is_const) { @@ -880,8 +880,8 @@ static void tcg_out_dat_rI(TCGContext *s, ARMCond cond, int opc, TCGArg dst, * Emit either the reg,imm or reg,reg form of a data-processing insn. * rhs must satisfy the "rIK" constraint. */ -static void tcg_out_dat_rIK(TCGContext *s, ARMCond cond, int opc, int opinv, - TCGReg dst, TCGReg lhs, TCGArg rhs, +static void tcg_out_dat_rIK(TCGContext *s, ARMCond cond, ARMInsn opc, + ARMInsn opinv, TCGReg dst, TCGReg lhs, TCGArg rhs, bool rhs_is_const) { if (rhs_is_const) { @@ -896,8 +896,8 @@ static void tcg_out_dat_rIK(TCGContext *s, ARMCond cond, int opc, int opinv, } } -static void tcg_out_dat_rIN(TCGContext *s, ARMCond cond, int opc, int opneg, - TCGArg dst, TCGArg lhs, TCGArg rhs, +static void tcg_out_dat_rIN(TCGContext *s, ARMCond cond, ARMInsn opc, + ARMInsn opneg, TCGArg dst, TCGArg lhs, TCGArg rhs, bool rhs_is_const) { /* Emit either the reg,imm or reg,reg form of a data-processing insn.