From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660176; cv=none; d=zohomail.com; s=zohoarc; b=CUy4rNEErpevKhjy2cvy4lqFQ6+T8Lvjw894M+ByEzP+1nOm+SnAMHArRU0XGGWRlAaBntPGQfkxJsTZ6QVtZTqInSqEmEncUYPKEp5n9WhIUo3cCrZQhzFbTEO4SC3oyIak7AiEJFBVeonKjkfP83Q2iIy/OTc+s/R2J4yUZBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660176; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iqNyuQcVQISsWNDc33MXpnTn2txRGHf9DOqpB2Sl+J8=; b=cELj2t8oL0ko0j1KgCdNoDdjstPJa/PdimAfp3gmGrsbIibrm7sqKlpFJZtizRdtAMZCXkMHrJ8TsNo9Hq/O2ojZjL99hp4+OHjdJk3kA0cSiaIr15cRWweCN8tIiJQ8XYc19ZOgf5p8Px2x4r3XZYPLjFoLGhXZglzGUjolaL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660176600668.9736696844798; Mon, 14 Jun 2021 01:42:56 -0700 (PDT) Received: from localhost ([::1]:50984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiBL-00028M-Co for importer@patchew.org; Mon, 14 Jun 2021 04:42:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6h-000249-Bn for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:07 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:42785) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6d-0003Tx-MD for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:07 -0400 Received: by mail-pf1-x431.google.com with SMTP id s14so10005628pfd.9 for ; Mon, 14 Jun 2021 01:38:03 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:01 -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=iqNyuQcVQISsWNDc33MXpnTn2txRGHf9DOqpB2Sl+J8=; b=xEXUF6qSou5HkYhjhFaDapam0OTmKI8ofnVuhucNEO3T8fo/wvK/uYxWzPF0TWZvC7 9DUGXYwfRTQ2xDP87ZwLNZLd6/TzaUKUV47RqPkDjCKS2FbA+Yxk502TezGSG+15bOhE AUQdvOhA8JI8kcCXyWn/U4RXoONpkwMKMWLnjzNpPs4EuyyZYlTAnpbmUsX4WdEQzDSt zZnZmVJXCpqOJ11GtptZQqmxqPZmvqTZDqMw6QPyoIqrDTLbErgW5cDIXofUm85p0dMv RihygSafGqAX8xGZVeEg/Hnb4ehbR6SJ1dQGw00dr6aPcGtXjk6UzZzeLSPBmqzaR8oV 4EfQ== 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=iqNyuQcVQISsWNDc33MXpnTn2txRGHf9DOqpB2Sl+J8=; b=hC6af4aWKJaFsfnae4wdRTt4HnuqMT79M6gihnKuJtdirpi4MQzaVABYxoWPgbodvc A0DwRY7oK5fZ+NQwcSqtIJAZz/1HMu8ACPdpmCZZRUUOUfy7HtYsDQd31oAXI+m4L0pr Kh53CymHGgQus32nQv9qJDmeNDsKCnGYKmy9xuIeYquPPD31D9WRv0vDcmARdqiCIz35 Z3FhAlo/QlBSFdLxC+TPEuLSqWk+fzRSRmiK7qGTt+BGjVzMJkv7fKs+OHv66hgaHCaN uwfZkw5GdU7WMg4o41Pth9j/VDl0ExmivC0JUpkbcOANAcCJ5dpnwYb4LcJedSfxvTTK YjnA== X-Gm-Message-State: AOAM533aQqGJYcawPJDzt75pcEhxdtrr8hpbrPQIItkJPzcqTT8dfL6g OOFCqmtSWeKVv1sOK+tz9ISEQongrAKtNg== X-Google-Smtp-Source: ABdhPJw5earLDI+AxaAwQPw1a/3HrsMgRcl7w4xND5vOSruJhLFPJ2b1/5Eug9pEZk728zLXq1e1Cw== X-Received: by 2002:a63:e205:: with SMTP id q5mr15993024pgh.404.1623659882195; Mon, 14 Jun 2021 01:38:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 01/28] tcg: Add flags argument to bswap opcodes Date: Mon, 14 Jun 2021 01:37:33 -0700 Message-Id: <20210614083800.1166166-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" This will eventually simplify front-end usage, and will allow backends to unset TCG_TARGET_HAS_MEMORY_BSWAP without loss of optimization. The argument is added during expansion, not currently exposed to the front end translators. Non-zero values are not yet supported by any backends. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/tcg/tcg-opc.h | 10 +++++----- include/tcg/tcg.h | 12 ++++++++++++ tcg/tcg-op.c | 13 ++++++++----- tcg/README | 18 ++++++++++-------- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h index bbb0884af8..fddcc42cbd 100644 --- a/include/tcg/tcg-opc.h +++ b/include/tcg/tcg-opc.h @@ -96,8 +96,8 @@ DEF(ext8s_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_ext8s_i32)) DEF(ext16s_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_ext16s_i32)) DEF(ext8u_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_ext8u_i32)) DEF(ext16u_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_ext16u_i32)) -DEF(bswap16_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_bswap16_i32)) -DEF(bswap32_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_bswap32_i32)) +DEF(bswap16_i32, 1, 1, 1, IMPL(TCG_TARGET_HAS_bswap16_i32)) +DEF(bswap32_i32, 1, 1, 1, IMPL(TCG_TARGET_HAS_bswap32_i32)) DEF(not_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_not_i32)) DEF(neg_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_neg_i32)) DEF(andc_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_andc_i32)) @@ -165,9 +165,9 @@ DEF(ext32s_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_e= xt32s_i64)) DEF(ext8u_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_ext8u_i64)) DEF(ext16u_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_ext16u_i64)) DEF(ext32u_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_ext32u_i64)) -DEF(bswap16_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_bswap16_i64)) -DEF(bswap32_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_bswap32_i64)) -DEF(bswap64_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_bswap64_i64)) +DEF(bswap16_i64, 1, 1, 1, IMPL64 | IMPL(TCG_TARGET_HAS_bswap16_i64)) +DEF(bswap32_i64, 1, 1, 1, IMPL64 | IMPL(TCG_TARGET_HAS_bswap32_i64)) +DEF(bswap64_i64, 1, 1, 1, IMPL64 | IMPL(TCG_TARGET_HAS_bswap64_i64)) DEF(not_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_not_i64)) DEF(neg_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_neg_i64)) DEF(andc_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_andc_i64)) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 064dab383b..7a060e532d 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -430,6 +430,18 @@ typedef enum { TCG_COND_GTU =3D 8 | 4 | 0 | 1, } TCGCond; =20 +/* + * Flags for the bswap opcodes. + * If IZ, the input is zero-extended, otherwise unknown. + * If OZ or OS, the output is zero- or sign-extended respectively, + * otherwise the high bits are undefined. + */ +enum { + TCG_BSWAP_IZ =3D 1, + TCG_BSWAP_OZ =3D 2, + TCG_BSWAP_OS =3D 4, +}; + /* Invert the sense of the comparison. */ static inline TCGCond tcg_invert_cond(TCGCond c) { diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index dcc2ed0bbc..dc65577e2f 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -1005,7 +1005,8 @@ void tcg_gen_ext16u_i32(TCGv_i32 ret, TCGv_i32 arg) void tcg_gen_bswap16_i32(TCGv_i32 ret, TCGv_i32 arg) { if (TCG_TARGET_HAS_bswap16_i32) { - tcg_gen_op2_i32(INDEX_op_bswap16_i32, ret, arg); + tcg_gen_op3i_i32(INDEX_op_bswap16_i32, ret, arg, + TCG_BSWAP_IZ | TCG_BSWAP_OZ); } else { TCGv_i32 t0 =3D tcg_temp_new_i32(); =20 @@ -1020,7 +1021,7 @@ void tcg_gen_bswap16_i32(TCGv_i32 ret, TCGv_i32 arg) void tcg_gen_bswap32_i32(TCGv_i32 ret, TCGv_i32 arg) { if (TCG_TARGET_HAS_bswap32_i32) { - tcg_gen_op2_i32(INDEX_op_bswap32_i32, ret, arg); + tcg_gen_op3i_i32(INDEX_op_bswap32_i32, ret, arg, 0); } else { TCGv_i32 t0 =3D tcg_temp_new_i32(); TCGv_i32 t1 =3D tcg_temp_new_i32(); @@ -1661,7 +1662,8 @@ void tcg_gen_bswap16_i64(TCGv_i64 ret, TCGv_i64 arg) tcg_gen_bswap16_i32(TCGV_LOW(ret), TCGV_LOW(arg)); tcg_gen_movi_i32(TCGV_HIGH(ret), 0); } else if (TCG_TARGET_HAS_bswap16_i64) { - tcg_gen_op2_i64(INDEX_op_bswap16_i64, ret, arg); + tcg_gen_op3i_i64(INDEX_op_bswap16_i64, ret, arg, + TCG_BSWAP_IZ | TCG_BSWAP_OZ); } else { TCGv_i64 t0 =3D tcg_temp_new_i64(); =20 @@ -1680,7 +1682,8 @@ void tcg_gen_bswap32_i64(TCGv_i64 ret, TCGv_i64 arg) tcg_gen_bswap32_i32(TCGV_LOW(ret), TCGV_LOW(arg)); tcg_gen_movi_i32(TCGV_HIGH(ret), 0); } else if (TCG_TARGET_HAS_bswap32_i64) { - tcg_gen_op2_i64(INDEX_op_bswap32_i64, ret, arg); + tcg_gen_op3i_i64(INDEX_op_bswap32_i64, ret, arg, + TCG_BSWAP_IZ | TCG_BSWAP_OZ); } else { TCGv_i64 t0 =3D tcg_temp_new_i64(); TCGv_i64 t1 =3D tcg_temp_new_i64(); @@ -1717,7 +1720,7 @@ void tcg_gen_bswap64_i64(TCGv_i64 ret, TCGv_i64 arg) tcg_temp_free_i32(t0); tcg_temp_free_i32(t1); } else if (TCG_TARGET_HAS_bswap64_i64) { - tcg_gen_op2_i64(INDEX_op_bswap64_i64, ret, arg); + tcg_gen_op3i_i64(INDEX_op_bswap64_i64, ret, arg, 0); } else { TCGv_i64 t0 =3D tcg_temp_new_i64(); TCGv_i64 t1 =3D tcg_temp_new_i64(); diff --git a/tcg/README b/tcg/README index 8510d823e3..19fbf6ca52 100644 --- a/tcg/README +++ b/tcg/README @@ -295,19 +295,21 @@ ext32u_i64 t0, t1 =20 8, 16 or 32 bit sign/zero extension (both operands must have the same type) =20 -* bswap16_i32/i64 t0, t1 +* bswap16_i32/i64 t0, t1, flags =20 -16 bit byte swap on a 32/64 bit value. It assumes that the two/six high or= der -bytes are set to zero. +16 bit byte swap on a 32/64 bit value. The flags values control how +the input and output sign- or zero-extension is treated. =20 -* bswap32_i32/i64 t0, t1 +* bswap32_i32/i64 t0, t1, flags =20 -32 bit byte swap on a 32/64 bit value. With a 64 bit value, it assumes that -the four high order bytes are set to zero. +32 bit byte swap on a 32/64 bit value. For 32-bit value, the flags +are ignored; for a 64-bit value the flags values control how the +input and output sign- or zero-extension is treated. =20 -* bswap64_i64 t0, t1 +* bswap64_i64 t0, t1, flags =20 -64 bit byte swap +64 bit byte swap. The flags are ignored -- the argument is present +for consistency with the smaller bswaps. =20 * discard_i32/i64 t0 =20 --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660298; cv=none; d=zohomail.com; s=zohoarc; b=iX4KvwK6dUkbYvWYC2OWMidY5IUaAJPlUFz/EIR+VhBLHC+fciFiMnIUF4cgW49ToB14ABc3rA10TjJfjOFfvh0spHfTeJdeDrJMjFRjn1oGsP8l/XWpAY5kZ7ACkWSPS+z7fqZ2qZOxaQTdVxi9LicS2M2OWL4L78+We3YzzPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660298; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4DK6YQsyP2TgsSpoYuX8S0y+YBX8JV6DUGLMLbaWI8M=; b=KwO1FLDdakZrY4rEn9q5f7Do3GlG9AUnY72ZyOZQyeS3j7y4KGMAjNJ3IrunTstjlM0o+QImhIyH2WRgeGZNnT7Oukzva892gL0e9vwNCD+wayn1lgkm46ylW2hozIFbtxt6SJyDzZQ6qooSgaDIjoPTAm31IqgEL1dX1EVX/oc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660298357154.05877169383746; Mon, 14 Jun 2021 01:44:58 -0700 (PDT) Received: from localhost ([::1]:59494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiDJ-0007j7-BS for importer@patchew.org; Mon, 14 Jun 2021 04:44:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6i-000254-8y for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:08 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:34407) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6e-0003Ub-7i for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:07 -0400 Received: by mail-pf1-x42f.google.com with SMTP id g6so10024594pfq.1 for ; Mon, 14 Jun 2021 01:38:03 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:02 -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=4DK6YQsyP2TgsSpoYuX8S0y+YBX8JV6DUGLMLbaWI8M=; b=NMUo5BkXtMOLjG7doIxADaXldMtayo93V6KOKIndFS6FHxdLAUUH4Ev2GE+DkUJurT FD5vABkRLGmeTLMzkIsvvA5P24mHYcFDQHkqA0evcxHooGdR5DEn/rIBWtiCfrwdGYcE k3Xgmj97tbkwdUaXvZeQ9ntCFen8DCZKi14fQHFIqYjX4v8QT2UJEBls62v8yPI2VGuN Xcj3OuXztXZMJSxWhAANBplbD3ay5kWK6F6pSLnCcKmRUA4PddqIwxkfrde/bW+fcY3O SQjieZPqz+uah6oUGkC4fG9D+gQ0pK0K6qco3kh1i3udtBe1Xqy0HiBYLL1HzNuuwn4w OraQ== 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=4DK6YQsyP2TgsSpoYuX8S0y+YBX8JV6DUGLMLbaWI8M=; b=MiRaVouaTePSeP4fZBtECDSUMrqCTARfEeQs7V5r96xLLkqTZ2UNXrElfBfhIqzgid mIrkeFaq/Yg8Ka4vAOvfR9h3CCj7v4Acgfg2Y3MZ0ueRWKiE1Mieb0ovL93Tj19f4djD P0eE80p7CF3vqpN+E6wyjbxU3XRo73Ge6INOkOnyQXzfSn9n1rt4ulWsHoDty8tx9I69 ib2b7YEV3OsgTY/E3NsuOaUZe4Tch747MNf3OZA64oppvrqRMh5bpLbgffv3wA/ljBK5 8t9fwYw2PnlvFGeuvPdKWJAKGtVmT5nyTqopF9lPLpp656hRCLV3ec/zGqJWplV4IJFD xs8A== X-Gm-Message-State: AOAM532VF6SJ5YnQunNA2kITCsFuwVMS/qRJEmxaT6ivVKuM17ojyy6e Bdy1xdQSM41lsVHB7eyOHGYoYtKMBw9juw== X-Google-Smtp-Source: ABdhPJyAlE5m1N/dY2pNnCfX3dhZdzfpAXuzS0DCvbV8iwK6Cp6mcET0LN+dky6/sokwdE90qMfgfw== X-Received: by 2002:a65:520a:: with SMTP id o10mr16194565pgp.172.1623659882819; Mon, 14 Jun 2021 01:38:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 02/28] tcg/i386: Support bswap flags Date: Mon, 14 Jun 2021 01:37:34 -0700 Message-Id: <20210614083800.1166166-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Retain the current rorw bswap16 expansion for the zero-in/zero-out case. Otherwise, perform a wider bswap plus a right-shift or extend. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/i386/tcg-target.c.inc | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index 34113388ef..98d924b91a 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -2421,10 +2421,28 @@ static inline void tcg_out_op(TCGContext *s, TCGOpc= ode opc, break; =20 OP_32_64(bswap16): - tcg_out_rolw_8(s, a0); + if (a2 & TCG_BSWAP_OS) { + /* Output must be sign-extended. */ + if (rexw) { + tcg_out_bswap64(s, a0); + tcg_out_shifti(s, SHIFT_SAR + rexw, a0, 48); + } else { + tcg_out_bswap32(s, a0); + tcg_out_shifti(s, SHIFT_SAR, a0, 16); + } + } else if ((a2 & (TCG_BSWAP_IZ | TCG_BSWAP_OZ)) =3D=3D TCG_BSWAP_O= Z) { + /* Output must be zero-extended, but input isn't. */ + tcg_out_bswap32(s, a0); + tcg_out_shifti(s, SHIFT_SHR, a0, 16); + } else { + tcg_out_rolw_8(s, a0); + } break; OP_32_64(bswap32): tcg_out_bswap32(s, a0); + if (rexw && (a2 & TCG_BSWAP_OS)) { + tcg_out_ext32s(s, a0, a0); + } break; =20 OP_32_64(neg): --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660030; cv=none; d=zohomail.com; s=zohoarc; b=Eb72MjAhMeXveoKKzl4gPz8RfOnaEmwljxL6GM7rl8haTQdrMZIvi+/Bzika3CRU0NcPPEu33jjxQ0oCUSjdMsCuG/MpPtuZK2B5CPmMR5cwdnbrj3SJPN1okgSJ9UaZ1x3+GKj7nqw5Djnc3kYyYWEFsgILkJLYvEET4r2yuWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660030; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=czDgvGtAgl/3pReno00NuxkKPkp4f3cviydaeOt2DuE=; b=mDx/IYp7X66hkJrNTiC/qFlgg43siCHekJQUNVTgN7Rs9pABz2spkyUdSzbuoW13TDi8TgL9jUkze7WIr1i7MubjvIjkQfe6Xko4MDLGzzBNwYfQ8a/lrrH1Fh6LKFl/D627yjdBDk96BlCJqcCj+uWfaUmibI17Ex613miWaCM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660030932394.72494128663527; Mon, 14 Jun 2021 01:40:30 -0700 (PDT) Received: from localhost ([::1]:42548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsi8z-0004uy-Rd for importer@patchew.org; Mon, 14 Jun 2021 04:40:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6i-00025E-B7 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:08 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]:53099) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6f-0003Uz-Vh for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:08 -0400 Received: by mail-pj1-x102e.google.com with SMTP id h16so9287434pjv.2 for ; Mon, 14 Jun 2021 01:38:04 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:03 -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=czDgvGtAgl/3pReno00NuxkKPkp4f3cviydaeOt2DuE=; b=AmJdjpiQE/03GbrJ97n12EmYqIvppOd6KUP90GSOEioPT7yOtYGzndiFUVSlJRxXXI 41QRlDKMt91a9RBWqOd7mNx+qhVM+7G3oGUaj3KqNNROvAy5Uw2czc6NEJS/hhP+tlpW lMOApwIegXuRi+CQgHmtF+SHPIfXakjWvaVfsaVKmN2s906OT2ALXvItH9LmuALVdsoL POMSrN4C2fUI8N8EdWTCA3H81dgucE9Ia+8+pzEHnBBY9ZVYZWVuRVyv9xT1Gk+nzUMa tpfw7bfQ/JZdiqmrzAs64f8qDKOBTsE/frlXRDDM7y2SkHNFHQffcrqsNxszw0cLFj2u wCZg== 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=czDgvGtAgl/3pReno00NuxkKPkp4f3cviydaeOt2DuE=; b=ZP1d4PHWQ9L37t9gkkc7Kd/AUYroyfXQZA3z5soigBi8nJGzRMwZl//fBDm5gWF99D N3nZOgqrKaOQcSaK63iDMdq+w1oLnK3BixneZaxXxGl8ftcSSB26OmqtCcWCuKurB09L Si7SPhqht8y9oM9memol4bEJDqZ3HweYyfUQWLxfPZQc2UC5/U13Kf/jLdVgGxBiwrBg UIPX34qoEfr9jxm0FpilyUpxXDTIQ9/otw4wDZ5s2Yap5yZHrEcVPJlVIk4H9VxBgWWz wqn6SBMMyjZ2MomauRF1PxRHhQ4rqYeGgR0MLE9L/XYRuJM1I3fFH8dPpLoTLMrNkG6l iXaQ== X-Gm-Message-State: AOAM532JGzDkA/QSaATrGGuo9gh1sp03TkmAidmjef1qe47Ml82X5A9z zDpqajs6JTF9oPUZWkyyyf41FeMQASBcQw== X-Google-Smtp-Source: ABdhPJwOaHXfFBZ55W/9U+2q0lfP7H+mvc/oV2f3ybshJCw6V/Y2DGY5+tzgO881Wl/yy+Rzrydt5Q== X-Received: by 2002:a17:902:e843:b029:109:4dbc:d4ed with SMTP id t3-20020a170902e843b02901094dbcd4edmr15772954plg.74.1623659883598; Mon, 14 Jun 2021 01:38:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 03/28] tcg/aarch64: Support bswap flags Date: Mon, 14 Jun 2021 01:37:35 -0700 Message-Id: <20210614083800.1166166-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/aarch64/tcg-target.c.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc index 27cde314a9..f72218b036 100644 --- a/tcg/aarch64/tcg-target.c.inc +++ b/tcg/aarch64/tcg-target.c.inc @@ -2187,12 +2187,24 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, tcg_out_rev64(s, a0, a1); break; case INDEX_op_bswap32_i64: + tcg_out_rev32(s, a0, a1); + if (a2 & TCG_BSWAP_OS) { + tcg_out_sxt(s, TCG_TYPE_I64, MO_32, a0, a0); + } + break; case INDEX_op_bswap32_i32: tcg_out_rev32(s, a0, a1); break; case INDEX_op_bswap16_i64: case INDEX_op_bswap16_i32: tcg_out_rev16(s, a0, a1); + if (a2 & TCG_BSWAP_OS) { + /* Output must be sign-extended. */ + tcg_out_sxt(s, ext, MO_16, a0, a0); + } else if ((a2 & (TCG_BSWAP_IZ | TCG_BSWAP_OZ)) =3D=3D TCG_BSWAP_O= Z) { + /* Output must be zero-extended, but input isn't. */ + tcg_out_uxt(s, MO_16, a0, a0); + } break; =20 case INDEX_op_ext8s_i64: --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660539; cv=none; d=zohomail.com; s=zohoarc; b=ep01CAD82LvlJSG8X2rsYjptmd4/na0C0xwgDc6hQ0J6R78FIthfRPOoCAwjDkqQVAzojV9t0y59Bp0MjHw+eRmnYKBT83gujmZNV1IoMKNQj4ReeZVVYtk6cFmQG20syP5becQQaiB5urOWkHlhfcfQRIm97xlssjYF+7zZmIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660539; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sO8Vuhh9GE568nvDdU8zL4gGQtwmUCpxM4YL6VHIofw=; b=h6ceoVW4iSuM4nLiIrqDiMrja4VXxaOUqHqXkWpGZuC6ca9ieFGVgy3dL7HGfZPscd+6LzUplOhX+cZapfYskh3OFYmO2g+H8YvZpzi2Gk0dty9Qk2Q9UHbmG+6/jbRnmo5akMl9yOkHTLhq0Au+7onjkuapJa7KVqh9Cms6uSo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660539935382.3313342983763; Mon, 14 Jun 2021 01:48:59 -0700 (PDT) Received: from localhost ([::1]:39878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiHC-00055y-RD for importer@patchew.org; Mon, 14 Jun 2021 04:48:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6k-00026Z-4C for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:11 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:44622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6f-0003VJ-Vv for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:09 -0400 Received: by mail-pf1-x42f.google.com with SMTP id u18so9997718pfk.11 for ; Mon, 14 Jun 2021 01:38:04 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:03 -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=sO8Vuhh9GE568nvDdU8zL4gGQtwmUCpxM4YL6VHIofw=; b=jHnphA4vSdjeXtz8hrAycxppoiADzwNcC9BM4APG+HtOAysw5XUECXZViCZ8+rCZH/ SFtPzkNqIROpHQ0FM19kJQ3FEhsGxLNrP0zvxYoVYtRqmSi4y/jO0Bff/U6wo0G2r4r+ yn+SITeswH4eFPNMD9bUK2C/vr3VI7oCxOFCH7QaFGcxxoW0zwTp+Espgbd5wcs+R7V3 a2HEQ8vbxmal38XdGXgGPeCVdzImXUT8JPulETMaeRV+8St+7Bzr+K0QG3rwjjq7ZYpc L0c0f1jfFZE5UmjYlNy8cQL6nlrtXs6QkEXg7tohKSFLoVVI1K1eG8bUnZvJxEujx6Xy Uuiw== 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=sO8Vuhh9GE568nvDdU8zL4gGQtwmUCpxM4YL6VHIofw=; b=jdWlZ9HG2GQ3g5uveKoFQMzkj0tOgBDEg+ClcOrBpS7gITAMFkqzuFal5Q4RAigUaD Z5WROhoGwZfJZaBnazmcmNZ0jhWcGk4zr6TzV6xEiH8PeWc/Il2fWLffl4y+yDuCvN5a AhsTNYJkc8oeIK5a1oMGlpkdllaqOWNl3ww89CU/YKxVfgeNPC4LmG9oL6AScHk/KPDU X6PYUKIQSHg4/bvJ8h9xxdwdMOwQzbRI2oHlkntS8Y0I8O0NmfVHIZRyAkBiiU/qhvzE MX5QMWIM/HFFMIYMea8jkcw04m+qWswpe2uj/dHY28X8ftdCvGWQGhqVq15epbF7yKLy sXhg== X-Gm-Message-State: AOAM533bmX5/iA42DA3Zhpa32h8Ph+VNXq2A6mexwfUVq0xwDhT5Wmqh AV/sCOu9GWBPb9DZDFOGNuFzUg6XiFntcw== X-Google-Smtp-Source: ABdhPJzMeJWP7ONaBqPg1lkUpVifRX5S5/+Y2kMuPlAPy6LmKXfPXrpdag9azdwwJZgpfsXR1P6nQw== X-Received: by 2002:a63:5203:: with SMTP id g3mr16128997pgb.247.1623659884069; Mon, 14 Jun 2021 01:38:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 04/28] tcg/arm: Support bswap flags Date: Mon, 14 Jun 2021 01:37:36 -0700 Message-Id: <20210614083800.1166166-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Combine the three bswap16 routines, and differentiate via the flags. Use the correct flags combination from the load/store routines, and pass along the constant parameter from tcg_out_op. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/arm/tcg-target.c.inc | 78 ++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index 5157143246..9824e215be 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -1013,50 +1013,44 @@ static inline void tcg_out_ext16u(TCGContext *s, in= t cond, } } =20 -static inline void tcg_out_bswap16s(TCGContext *s, int cond, int rd, int r= n) +static void tcg_out_bswap16(TCGContext *s, int cond, int rd, int rn, int f= lags) { if (use_armv6_instructions) { - /* revsh */ - tcg_out32(s, 0x06ff0fb0 | (cond << 28) | (rd << 12) | rn); - } else { - tcg_out_dat_reg(s, cond, ARITH_MOV, - TCG_REG_TMP, 0, rn, SHIFT_IMM_LSL(24)); - tcg_out_dat_reg(s, cond, ARITH_MOV, - TCG_REG_TMP, 0, TCG_REG_TMP, SHIFT_IMM_ASR(16)); - tcg_out_dat_reg(s, cond, ARITH_ORR, - rd, TCG_REG_TMP, rn, SHIFT_IMM_LSR(8)); - } -} + if (flags & TCG_BSWAP_OS) { + /* revsh */ + tcg_out32(s, 0x06ff0fb0 | (cond << 28) | (rd << 12) | rn); + return; + } =20 -static inline void tcg_out_bswap16(TCGContext *s, int cond, int rd, int rn) -{ - if (use_armv6_instructions) { /* rev16 */ tcg_out32(s, 0x06bf0fb0 | (cond << 28) | (rd << 12) | rn); - } else { - tcg_out_dat_reg(s, cond, ARITH_MOV, - TCG_REG_TMP, 0, rn, SHIFT_IMM_LSL(24)); - tcg_out_dat_reg(s, cond, ARITH_MOV, - TCG_REG_TMP, 0, TCG_REG_TMP, SHIFT_IMM_LSR(16)); - tcg_out_dat_reg(s, cond, ARITH_ORR, - rd, TCG_REG_TMP, rn, SHIFT_IMM_LSR(8)); + if ((flags & (TCG_BSWAP_IZ | TCG_BSWAP_OZ)) =3D=3D TCG_BSWAP_OZ) { + /* uxth */ + tcg_out32(s, 0x06ff0070 | (cond << 28) | (rd << 12) | rd); + } + return; } -} =20 -/* swap the two low bytes assuming that the two high input bytes and the - two high output bit can hold any value. */ -static inline void tcg_out_bswap16st(TCGContext *s, int cond, int rd, int = rn) -{ - if (use_armv6_instructions) { - /* rev16 */ - tcg_out32(s, 0x06bf0fb0 | (cond << 28) | (rd << 12) | rn); - } else { - tcg_out_dat_reg(s, cond, ARITH_MOV, - TCG_REG_TMP, 0, rn, SHIFT_IMM_LSR(8)); + /* Move the high byte down and isolate it. */ + /* rn=3DxxAB -> tmp=3D0xxA -> tmp=3D000A */ + tcg_out_dat_reg(s, cond, ARITH_MOV, TCG_REG_TMP, 0, rn, SHIFT_IMM_LSR(= 8)); + if (!(flags & TCG_BSWAP_IZ)) { tcg_out_dat_imm(s, cond, ARITH_AND, TCG_REG_TMP, TCG_REG_TMP, 0xff= ); + } + + /* Move the low byte up and extend it. */ + if (!(flags & (TCG_BSWAP_OS | TCG_BSWAP_OZ))) { + /* No output extension: rd=3DxABA */ tcg_out_dat_reg(s, cond, ARITH_ORR, rd, TCG_REG_TMP, rn, SHIFT_IMM_LSL(8)); + return; } + + /* rn=3DxxAB -> rd=3DB000 -> rd=3DssBA */ + tcg_out_dat_reg(s, cond, ARITH_MOV, rd, 0, rn, SHIFT_IMM_LSL(24)); + tcg_out_dat_reg(s, cond, ARITH_ORR, rd, TCG_REG_TMP, rd, + flags & TCG_BSWAP_OS + ? SHIFT_IMM_ASR(16) : SHIFT_IMM_LSR(16)); } =20 static inline void tcg_out_bswap32(TCGContext *s, int cond, int rd, int rn) @@ -1705,13 +1699,15 @@ static inline void tcg_out_qemu_ld_index(TCGContext= *s, MemOp opc, case MO_UW: tcg_out_ld16u_r(s, COND_AL, datalo, addrlo, addend); if (bswap) { - tcg_out_bswap16(s, COND_AL, datalo, datalo); + tcg_out_bswap16(s, COND_AL, datalo, datalo, + TCG_BSWAP_IZ | TCG_BSWAP_OZ); } break; case MO_SW: if (bswap) { tcg_out_ld16u_r(s, COND_AL, datalo, addrlo, addend); - tcg_out_bswap16s(s, COND_AL, datalo, datalo); + tcg_out_bswap16(s, COND_AL, datalo, datalo, + TCG_BSWAP_IZ | TCG_BSWAP_OS); } else { tcg_out_ld16s_r(s, COND_AL, datalo, addrlo, addend); } @@ -1766,13 +1762,15 @@ static inline void tcg_out_qemu_ld_direct(TCGContex= t *s, MemOp opc, case MO_UW: tcg_out_ld16u_8(s, COND_AL, datalo, addrlo, 0); if (bswap) { - tcg_out_bswap16(s, COND_AL, datalo, datalo); + tcg_out_bswap16(s, COND_AL, datalo, datalo, + TCG_BSWAP_IZ | TCG_BSWAP_OZ); } break; case MO_SW: if (bswap) { tcg_out_ld16u_8(s, COND_AL, datalo, addrlo, 0); - tcg_out_bswap16s(s, COND_AL, datalo, datalo); + tcg_out_bswap16(s, COND_AL, datalo, datalo, + TCG_BSWAP_IZ | TCG_BSWAP_OS); } else { tcg_out_ld16s_8(s, COND_AL, datalo, addrlo, 0); } @@ -1862,7 +1860,7 @@ static inline void tcg_out_qemu_st_index(TCGContext *= s, int cond, MemOp opc, break; case MO_16: if (bswap) { - tcg_out_bswap16st(s, cond, TCG_REG_R0, datalo); + tcg_out_bswap16(s, cond, TCG_REG_R0, datalo, 0); tcg_out_st16_r(s, cond, TCG_REG_R0, addrlo, addend); } else { tcg_out_st16_r(s, cond, datalo, addrlo, addend); @@ -1907,7 +1905,7 @@ static inline void tcg_out_qemu_st_direct(TCGContext = *s, MemOp opc, break; case MO_16: if (bswap) { - tcg_out_bswap16st(s, COND_AL, TCG_REG_R0, datalo); + tcg_out_bswap16(s, COND_AL, TCG_REG_R0, datalo, 0); tcg_out_st16_8(s, COND_AL, TCG_REG_R0, addrlo, 0); } else { tcg_out_st16_8(s, COND_AL, datalo, addrlo, 0); @@ -2245,7 +2243,7 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcod= e opc, break; =20 case INDEX_op_bswap16_i32: - tcg_out_bswap16(s, COND_AL, args[0], args[1]); + tcg_out_bswap16(s, COND_AL, args[0], args[1], args[2]); break; case INDEX_op_bswap32_i32: tcg_out_bswap32(s, COND_AL, args[0], args[1]); --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660707; cv=none; d=zohomail.com; s=zohoarc; b=lwqVb8731ouIJj3CacykXKxo5BunlfgGYU6i1iyKkQZ/nPjSmv5MVXmuqUSFyYESTUwtsyeofKAE4io+Bxu/nkzoLFfyZNf4P4ayCuRVeLdLA0jfeR08GcD52hFQapP3UzvJ7CDdhP4Ea74nzzPt8I3oUlv6abd+JefzYYJFe5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660707; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WhSFZreDO53AzLKGFi8wjggrqQhc1QnKvAfjWIRryI8=; b=Hm/yf4mwkFFhSxnTUewfjAp/5RpylYpjiv82NLiX8HBcM1k2LkL3PQwLSA0ldWSJpD531XXenstn4ZyI7lMOUVwgyEKLIO9OTGJNeEvDCMwtbD/vr6JICLJapkJNtcg0Oserl2ItNGrLEIyWb3d/9INDp9ZLoqI1EX0XvM4Zoak= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660707641698.621101212365; Mon, 14 Jun 2021 01:51:47 -0700 (PDT) Received: from localhost ([::1]:48482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiJu-0002NI-K0 for importer@patchew.org; Mon, 14 Jun 2021 04:51:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6n-000285-G1 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:13 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:37410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6f-0003Vf-Vj for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:13 -0400 Received: by mail-pl1-x631.google.com with SMTP id h12so6158798plf.4 for ; Mon, 14 Jun 2021 01:38:05 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:04 -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=WhSFZreDO53AzLKGFi8wjggrqQhc1QnKvAfjWIRryI8=; b=RgLOPHr4ymADW1P+bAuhcZbbNx5dsctX6D2MMCCWJ+aTw2/X9uLDi+SnGMMHmhpPj1 iSK9dwNUxQP0t0H8Wjh1TqFZVJ8inCDbiTFnhkYTDq4IlQHDZ0aSrl15mFKrdR3S9A5v z+pZwUcAniXmEgVcgGmp+eo1sGC7zwXHwFAbNzf4u4r5Qz3lf8drptd8XGG9grVyWRdo fwxN1EOeskeHhb5FN6sU+/B6k2joO95FOd5POyMycWgMjWbbK7gGU4UTDlcrSZcG3taq oAPvltcB8NVN03v2/xWDi7HCJWE+t8tOjEjwlBtYn2kBsUFzq85Pm1wecKGMIWnZgR6T vrug== 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=WhSFZreDO53AzLKGFi8wjggrqQhc1QnKvAfjWIRryI8=; b=IYXF3N77zgSxNt66Rb/dAJbpmpAY6fzOIiuUqtQYcDEqRCA5BzMbOoTaZBVMkk3FJV 2m6iFX/avwDvNt6BdlJjYbgEan89Yjen+2qpdabbOmH2wBBfT7kA65IL8Mx+CA/11kF5 hFnO88sF4BuzppkZvz9baEq9cKWrgrsZu5Pza0msghYaNnky9AfXFAsLpl/LfCAdz6Rx he6ikEwP/VfQ9RBcNqaZed4Rf1iqx9iRAurXip56J0+OcP7Pbw5QRsepiTDdjISNpqs9 IiTLHDgaEJlGSEB78BWrUAnMBp1hlmN5pzXZQfaG95CONz+a4e8Hs9OprAsWFEIsarDM MkQw== X-Gm-Message-State: AOAM530i0mOXAjZqz8R52+XI8y25yEyFntQERqiSvcUHtyCv2ghxOwwr aXAg8sLXYSiWBuju3B3LDpTcUbTR5QPBug== X-Google-Smtp-Source: ABdhPJzWLo6V0043MDBIfP1b5+9GmkIwGTGZWtnz1WOWezWfZwJEmDgMOpoIChQ4tzWdfbo16csSIQ== X-Received: by 2002:a17:902:e747:b029:114:af78:1776 with SMTP id p7-20020a170902e747b0290114af781776mr15981671plf.2.1623659884496; Mon, 14 Jun 2021 01:38:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 05/28] tcg/ppc: Split out tcg_out_ext{8,16,32}s Date: Mon, 14 Jun 2021 01:37:37 -0700 Message-Id: <20210614083800.1166166-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" We will shortly require these in other context; make the expansion as clear as possible. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/ppc/tcg-target.c.inc | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 795701442b..aa35ff8250 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -738,6 +738,21 @@ static inline void tcg_out_rlw(TCGContext *s, int op, = TCGReg ra, TCGReg rs, tcg_out32(s, op | RA(ra) | RS(rs) | SH(sh) | MB(mb) | ME(me)); } =20 +static inline void tcg_out_ext8s(TCGContext *s, TCGReg dst, TCGReg src) +{ + tcg_out32(s, EXTSB | RA(dst) | RS(src)); +} + +static inline void tcg_out_ext16s(TCGContext *s, TCGReg dst, TCGReg src) +{ + tcg_out32(s, EXTSH | RA(dst) | RS(src)); +} + +static inline void tcg_out_ext32s(TCGContext *s, TCGReg dst, TCGReg src) +{ + tcg_out32(s, EXTSW | RA(dst) | RS(src)); +} + static inline void tcg_out_ext32u(TCGContext *s, TCGReg dst, TCGReg src) { tcg_out_rld(s, RLDICL, dst, src, 0, 32); @@ -2322,7 +2337,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const int const_args[TCG_MAX_OP_ARGS]) { TCGArg a0, a1, a2; - int c; =20 switch (opc) { case INDEX_op_exit_tb: @@ -2390,7 +2404,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_ld8s_i32: case INDEX_op_ld8s_i64: tcg_out_mem_long(s, LBZ, LBZX, args[0], args[1], args[2]); - tcg_out32(s, EXTSB | RS(args[0]) | RA(args[0])); + tcg_out_ext8s(s, args[0], args[0]); break; case INDEX_op_ld16u_i32: case INDEX_op_ld16u_i64: @@ -2728,18 +2742,15 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, =20 case INDEX_op_ext8s_i32: case INDEX_op_ext8s_i64: - c =3D EXTSB; - goto gen_ext; + tcg_out_ext8s(s, args[0], args[1]); + break; case INDEX_op_ext16s_i32: case INDEX_op_ext16s_i64: - c =3D EXTSH; - goto gen_ext; + tcg_out_ext16s(s, args[0], args[1]); + break; case INDEX_op_ext_i32_i64: case INDEX_op_ext32s_i64: - c =3D EXTSW; - goto gen_ext; - gen_ext: - tcg_out32(s, c | RS(args[1]) | RA(args[0])); + tcg_out_ext32s(s, args[0], args[1]); break; case INDEX_op_extu_i32_i64: tcg_out_ext32u(s, args[0], args[1]); --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660177; cv=none; d=zohomail.com; s=zohoarc; b=LZ/CZ27gkUT5lV0R7LX3W19uIjjsuUamZwCrOqKiUgaLh7h825ldAh99juJhdcMx3bqq2RYb0u7NDYpwciVVA2xfxXgUi7jjIoXN/zfc8NvowmKhdzIp5gQZ+IWhcazjBszyudGj76sxCjqTN/Hm3ZCMre3P7v3siwS+pHmfbxE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660177; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9falKtlgXRX7iCDYqgvSVBqx7lbth/xVIEcKWW9LxMo=; b=dj9NRpEZSp3BQbdvDCqASL1KK7eUnrd+p4hzSf8pjiZm/MJN3Dl6/rfWVczIRAS9bmV9ny7Dc7v44v4CUwnSIMUmvxnSJmWkUaYVpdWr4DPN4WfE0jkwiSruSZ0S+JN6Y6iLNfTo+nqPtmhfjMrTxnjS5Lqvake55vlraUg6jZg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660177946519.8157479078059; Mon, 14 Jun 2021 01:42:57 -0700 (PDT) Received: from localhost ([::1]:51152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiBM-0002Eu-Oi for importer@patchew.org; Mon, 14 Jun 2021 04:42:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6j-00025b-4G for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:09 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:43629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6g-0003W2-Aj for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:08 -0400 Received: by mail-pf1-x431.google.com with SMTP id a127so4191603pfa.10 for ; Mon, 14 Jun 2021 01:38:05 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:04 -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=9falKtlgXRX7iCDYqgvSVBqx7lbth/xVIEcKWW9LxMo=; b=nXTRdb8KXaAuAeJmMgNjW1OUc5p0SwNP6e0IGPHJLZK0UMcOqqvrPPBJe7bx0uBnRc jDTsqpTixrFLqCXohxD7jgj4BsaAY3xXVkIzmLh5UXOLzfv9ETMxIGYjgVjmRompm1wC 0sJwDoQTIqgvRg3gmhH0+FvE9k9WYsQ3tcUzx2zaAnmI2ZwA9KI2S6rbBGfL/yHgNNUX rT6TyhabjUfoROy1s6Sd8KZEJs5rqraMhJJXTyzdjTkRXvHKLUo1WmVydeyB7Eg2uEz3 nnPWM4lZ9AgHlCxe2qG5PNciZf6Qo7Xprw9k5zEq8BVXYZADrXtPt20bURa0HvIzz243 fRAw== 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=9falKtlgXRX7iCDYqgvSVBqx7lbth/xVIEcKWW9LxMo=; b=eB4mnREex/O2/xNK2Rql3BX7UOPxbSAV5gM+za9KoxMyIdkdpl8yLoMdlHxL0U5Hc2 SF4MHrKR6eP0KfdNSDkWiFl5QyIfQcHKXVHlYGos3ofgDYA3QStKdXKSHnoaGpJdF+4w vMBoWpWQkPRzzbCukn6h4AowJFgpnNFyU0koV5BKflm46XLYM6SIAcOXznvu7I/K+xV6 Vkm8aA/JISsCLUwNV+icOXDZi2deq/rwt5kQ4GiPS4d9XJxFocnR3rxez4MZL3+jWmh3 A2DW2TkSOSiR07qPtH47G40OGXapUdYDPIFkIDpUgtcD3ayqAjrNWjXMMAUeSZ4eIRr7 8tvg== X-Gm-Message-State: AOAM533apUiBKusWkhGTeggjK7TwzgwdNef/XHEbVmq51+s2DeX9IE95 m5VPmtJfBhDjfXsSzwX+k08I0ZoeH7VdNQ== X-Google-Smtp-Source: ABdhPJzEQIx5u2p+GqI3aCIhIMQ5wInX3ZYN2QM79jGlfek+e+LU+BMHJJYprb4Letvlfo3RkXfj9A== X-Received: by 2002:a63:2f05:: with SMTP id v5mr15883826pgv.449.1623659885043; Mon, 14 Jun 2021 01:38:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 06/28] tcg/ppc: Split out tcg_out_sari{32,64} Date: Mon, 14 Jun 2021 01:37:38 -0700 Message-Id: <20210614083800.1166166-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" We will shortly require sari in other context; split out both for cleanliness sake. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/ppc/tcg-target.c.inc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index aa35ff8250..b49204f707 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -768,6 +768,11 @@ static inline void tcg_out_shli64(TCGContext *s, TCGRe= g dst, TCGReg src, int c) tcg_out_rld(s, RLDICR, dst, src, c, 63 - c); } =20 +static inline void tcg_out_sari32(TCGContext *s, TCGReg dst, TCGReg src, i= nt c) +{ + tcg_out32(s, SRAWI | RA(dst) | RS(src) | SH(c)); +} + static inline void tcg_out_shri32(TCGContext *s, TCGReg dst, TCGReg src, i= nt c) { tcg_out_rlw(s, RLWINM, dst, src, 32 - c, c, 31); @@ -778,6 +783,11 @@ static inline void tcg_out_shri64(TCGContext *s, TCGRe= g dst, TCGReg src, int c) tcg_out_rld(s, RLDICL, dst, src, 64 - c, c); } =20 +static inline void tcg_out_sari64(TCGContext *s, TCGReg dst, TCGReg src, i= nt c) +{ + tcg_out32(s, SRADI | RA(dst) | RS(src) | SH(c & 0x1f) | ((c >> 4) & 2)= ); +} + /* Emit a move into ret of arg, if it can be done in one insn. */ static bool tcg_out_movi_one(TCGContext *s, TCGReg ret, tcg_target_long ar= g) { @@ -2602,7 +2612,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_sar_i32: if (const_args[2]) { /* Limit immediate shift count lest we create an illegal insn.= */ - tcg_out32(s, SRAWI | RS(args[1]) | RA(args[0]) | SH(args[2] & = 31)); + tcg_out_sari32(s, args[0], args[1], args[2] & 31); } else { tcg_out32(s, SRAW | SAB(args[1], args[0], args[2])); } @@ -2690,8 +2700,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, break; case INDEX_op_sar_i64: if (const_args[2]) { - int sh =3D SH(args[2] & 0x1f) | (((args[2] >> 5) & 1) << 1); - tcg_out32(s, SRADI | RA(args[0]) | RS(args[1]) | sh); + tcg_out_sari64(s, args[0], args[1], args[2]); } else { tcg_out32(s, SRAD | SAB(args[1], args[0], args[2])); } --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660394; cv=none; d=zohomail.com; s=zohoarc; b=PtCsdM15aNL4v9mA5dXNGXQdJczDfk5kMpxXX3pdFIVwTwNVGMXB9CEDeXN67S3qkDNkQF9HXRIu9XKPD+IVRenu/NgzXShSDdZv7XY4yPRXeh+q5qb4mC9Sf/bWU0n0g0UQYETUKD0B24xhqsZ9wk9SPEyRSweoy4ZMGSmSJOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660394; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RmJRRsSQCfFpzMnGvbeflLavjd8sak/ufPXwSJZUO4k=; b=AH4yvm1U00cZ2L2Dr4uXtBIjbQf9umkodiSNX0Z8NzuiYC3DmszjUVsYXzChNSspnaBwTsnt1900CJ6AUWoF0eO2Pd4/clgIuXEiDGEvVxim/GLSXdAgx20jw2KlBOjQiYhvNnswM4vRJLijMaCTl/1IYLq4fo3tBkpV7hB8/HI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660394425943.6496768804966; Mon, 14 Jun 2021 01:46:34 -0700 (PDT) Received: from localhost ([::1]:34926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiEr-0001oc-5a for importer@patchew.org; Mon, 14 Jun 2021 04:46:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6r-0002Cc-I4 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:18 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:38423) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6h-0003WA-7H for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:17 -0400 Received: by mail-pj1-x1030.google.com with SMTP id m13-20020a17090b068db02901656cc93a75so9600594pjz.3 for ; Mon, 14 Jun 2021 01:38:06 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:05 -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=RmJRRsSQCfFpzMnGvbeflLavjd8sak/ufPXwSJZUO4k=; b=e6NRlOWjJEoa0MCTC1H93fuvJ6hi19fzTMbTZa2kn6d/HnTvIyTvyLTzZcvOz8yArs FjLFTblo0JGUi7kg06Z5oKOFGDWeSWqBVHrzsY+Kwaq+PU8KkYoIK06epYL7/CrEBfOF fZFGG6oCv1IwujY8O+8fxrgNCN+Nl9fgfnT+xfOhINbBdx2juPGdl/Vn+EaBsFff0Fe0 Av4hluWFpawitsq5OlUwQC019bHUT4QV+jjKuj6B+pp/ANIJtYul1Gg7z2yL8SOrdwRk xGvUDmZhYssnW4I0gjFRIyrtLuuMcqm4oLnR/QmeekbKTTsXAUr6aiMK7suJNK5pjYu5 8R2w== 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=RmJRRsSQCfFpzMnGvbeflLavjd8sak/ufPXwSJZUO4k=; b=TbWF0I/VQPn8me2KqLElhsj2MUGSoTavL2FNQ+gdnupdWmEAritReLJPP42xX27BQp ZQDHDohgZP27QjhfHVLnuTfrEOOAlA9K0kBUzUl1FDzwUfyNZleMczmZrn0gy5RRV+m1 zN/2HnHwcY/cDvOVp10ROC0lFfFG8c8nu0Vu3oR2TdVbzIrmUlFOX1gX3ptpp+UalYV+ NX4hj+UPd7wTLQsASG+8UQwEfJYmOP15DBXlOTFws8+ORXpfs5IVEp8gMRYsxHzwF2Z9 uiMx/zbJdh00fetE4s/QAbnz4wSiNhF22seShSgkyg9H2PXZLNpgS7GPOkBtcdriXIgn bPjw== X-Gm-Message-State: AOAM531JoDWUQJbWneNRkR9zvPq9K0U5r5T4bdNCYxraKS8A0xtXoqE6 FfLKMejq7JEB1eozNJUxBk5kFq45vR+jcw== X-Google-Smtp-Source: ABdhPJwM6iG7hD9H01F1W8Y0NmPJcwQCxF4OyS8t2bQsKnH0TPnShwA5I0xuvuU0ZktbBwSIonWhpA== X-Received: by 2002:a17:90b:4f83:: with SMTP id qe3mr22611280pjb.32.1623659885654; Mon, 14 Jun 2021 01:38:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 07/28] tcg/ppc: Split out tcg_out_bswap16 Date: Mon, 14 Jun 2021 01:37:39 -0700 Message-Id: <20210614083800.1166166-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" With the use of a suitable temporary, we can use the same algorithm when src overlaps dst. The result is the same number of instructions either way. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/ppc/tcg-target.c.inc | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index b49204f707..64c24382a8 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -788,6 +788,16 @@ static inline void tcg_out_sari64(TCGContext *s, TCGRe= g dst, TCGReg src, int c) tcg_out32(s, SRADI | RA(dst) | RS(src) | SH(c & 0x1f) | ((c >> 4) & 2)= ); } =20 +static void tcg_out_bswap16(TCGContext *s, TCGReg dst, TCGReg src) +{ + TCGReg tmp =3D dst =3D=3D src ? TCG_REG_R0 : dst; + + /* src =3D abcd */ + tcg_out_rlw(s, RLWINM, tmp, src, 24, 24, 31); /* tmp =3D 000c */ + tcg_out_rlw(s, RLWIMI, tmp, src, 8, 16, 23); /* tmp =3D 00dc */ + tcg_out_mov(s, TCG_TYPE_REG, dst, tmp); +} + /* Emit a move into ret of arg, if it can be done in one insn. */ static bool tcg_out_movi_one(TCGContext *s, TCGReg ret, tcg_target_long ar= g) { @@ -2779,21 +2789,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, =20 case INDEX_op_bswap16_i32: case INDEX_op_bswap16_i64: - a0 =3D args[0], a1 =3D args[1]; - /* a1 =3D abcd */ - if (a0 !=3D a1) { - /* a0 =3D (a1 r<< 24) & 0xff # 000c */ - tcg_out_rlw(s, RLWINM, a0, a1, 24, 24, 31); - /* a0 =3D (a0 & ~0xff00) | (a1 r<< 8) & 0xff00 # 00dc */ - tcg_out_rlw(s, RLWIMI, a0, a1, 8, 16, 23); - } else { - /* r0 =3D (a1 r<< 8) & 0xff00 # 00d0 */ - tcg_out_rlw(s, RLWINM, TCG_REG_R0, a1, 8, 16, 23); - /* a0 =3D (a1 r<< 24) & 0xff # 000c */ - tcg_out_rlw(s, RLWINM, a0, a1, 24, 24, 31); - /* a0 =3D a0 | r0 # 00dc */ - tcg_out32(s, OR | SAB(TCG_REG_R0, a0, a0)); - } + tcg_out_bswap16(s, args[0], args[1]); break; =20 case INDEX_op_bswap32_i32: --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660117; cv=none; d=zohomail.com; s=zohoarc; b=RYeH4v2HKoA32cf9wT1vzNF5BdUaz1Xxb9jrsKIAXDX+5SDGL2Jpo+4uNZ8JuF6SX/HGuQpaKe8Y2yaaCtWYLyfD8S+ALlE45obqOaix1sREG5OIQvkqCNa/UXj8mdfr2MCcYCVE4wxHLBzHAtQisDAgUMv9rTlJRp7/woXILsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660117; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3XaCQaiofWlp2RkjtaKGiOMhxyWGMuQ5bASRK7Oic+8=; b=UFW3Er7Wr3if9IUZyVIM6OtcOkU5M5IwD8fePPJq51sYPPX+UXzYoORRyhIoLvYjYJF2tJWLnAJSR4bGYPMhC2vHD3AHumOCGEn1R5JypdTKXCBb7aRfM2uzcKWwV92pg75nB0iWfX0fMOoXf1Irs3UdWjRgGQyWS+HFEhoEtGo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660117293520.0711070873157; Mon, 14 Jun 2021 01:41:57 -0700 (PDT) Received: from localhost ([::1]:48500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiAO-0000Uk-4g for importer@patchew.org; Mon, 14 Jun 2021 04:41:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6p-0002BA-JV for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:17 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:35545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6h-0003Wt-PN for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:15 -0400 Received: by mail-pf1-x42f.google.com with SMTP id h12so10032568pfe.2 for ; Mon, 14 Jun 2021 01:38:07 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:06 -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=3XaCQaiofWlp2RkjtaKGiOMhxyWGMuQ5bASRK7Oic+8=; b=TSrXbgYl29YXvO1rY1NUkuYqiIZ1xZ+9zhmuY0tIXqFD0yFbxckrOj5V523Q7d2zVb hI5nyyL+QeZphmfhtX4n2lKnCQIdPmiyek6taHqIKihFYnvZK9dpvvUoZhRko63DQOxo PWDTno1V8Fmi5/RufSPM3SEVRoCd1cpA7+k8YDrXczwALV/GCh6WfI3gbLjY8G0/UhrU CFBuGGOCkh3CwMgC0rZgDP8JKBK67Ic9KCeSW9+pFIAt+364a9ZrrJjwzRr7glnLd7Iu zG7I6aF9KP+aUR/Y2LP9Jr8yj1gvEmzgCH6A3MFANJt99kLBGbqxWNS+LVoGwesqxOW4 K/OA== 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=3XaCQaiofWlp2RkjtaKGiOMhxyWGMuQ5bASRK7Oic+8=; b=tEwzjz96DbIVARIKYXnxzgBeWdKV7LKTbBZ/03XG7SKSks0H19BdqzCjpfT31gOJ9Y dO7RXf974SuobsmmvoJMY5yF1+l8iWuuuPoUcxpH7ICvrbqPSa/s7kHx9Uiq4Eiku88t FRiHw4e2h1pHAVzyg0EcFGWjqZHWVzQUJcysa3JNh17KgqQRLVwzh+1Ufo7S862n/RZi p6QCuttmmC3Wlpyi8xqyaZA9Y2tjf3RozLju7JgAPTd7K5KZ8el0EahyNF+Bnek2IK0V TDuIOIaf455f26ZeehF53v4NYK4fm5GfUC8tYAmb/+wewdJt5KTZpaIMGtqXZwPdC946 j4pw== X-Gm-Message-State: AOAM533DvgDydvEPn+cBGlgDvVSg4NBY3X9ruTdU8VcQsdaEBOhBE0uP +BIJMOotM8v/qk1VQWRwgIY5Blnq97VcQA== X-Google-Smtp-Source: ABdhPJzLbCzTvuvGzJL3lY/6aPIdHd13MOGR1rV+9n8avpeT8QatmgUo4EwJhj0DSqEKnWVoGjapfA== X-Received: by 2002:a62:3344:0:b029:24c:735c:4546 with SMTP id z65-20020a6233440000b029024c735c4546mr21067512pfz.1.1623659886479; Mon, 14 Jun 2021 01:38:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 08/28] tcg/ppc: Split out tcg_out_bswap32 Date: Mon, 14 Jun 2021 01:37:40 -0700 Message-Id: <20210614083800.1166166-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/ppc/tcg-target.c.inc | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 64c24382a8..f0e42e4b88 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -798,6 +798,17 @@ static void tcg_out_bswap16(TCGContext *s, TCGReg dst,= TCGReg src) tcg_out_mov(s, TCG_TYPE_REG, dst, tmp); } =20 +static void tcg_out_bswap32(TCGContext *s, TCGReg dst, TCGReg src) +{ + TCGReg tmp =3D dst =3D=3D src ? TCG_REG_R0 : dst; + + /* Stolen from gcc's builtin_bswap32. src =3D abcd */ + tcg_out_rlw(s, RLWINM, tmp, src, 8, 0, 31); /* tmp =3D bcda */ + tcg_out_rlw(s, RLWIMI, tmp, src, 24, 0, 7); /* tmp =3D dcda */ + tcg_out_rlw(s, RLWIMI, tmp, src, 24, 16, 23); /* tmp =3D dcba */ + tcg_out_mov(s, TCG_TYPE_REG, dst, tmp); +} + /* Emit a move into ret of arg, if it can be done in one insn. */ static bool tcg_out_movi_one(TCGContext *s, TCGReg ret, tcg_target_long ar= g) { @@ -2791,24 +2802,9 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_bswap16_i64: tcg_out_bswap16(s, args[0], args[1]); break; - case INDEX_op_bswap32_i32: case INDEX_op_bswap32_i64: - /* Stolen from gcc's builtin_bswap32 */ - a1 =3D args[1]; - a0 =3D args[0] =3D=3D a1 ? TCG_REG_R0 : args[0]; - - /* a1 =3D args[1] # abcd */ - /* a0 =3D rotate_left (a1, 8) # bcda */ - tcg_out_rlw(s, RLWINM, a0, a1, 8, 0, 31); - /* a0 =3D (a0 & ~0xff000000) | ((a1 r<< 24) & 0xff000000) # dcda */ - tcg_out_rlw(s, RLWIMI, a0, a1, 24, 0, 7); - /* a0 =3D (a0 & ~0x0000ff00) | ((a1 r<< 24) & 0x0000ff00) # dcba */ - tcg_out_rlw(s, RLWIMI, a0, a1, 24, 16, 23); - - if (a0 =3D=3D TCG_REG_R0) { - tcg_out_mov(s, TCG_TYPE_REG, args[0], a0); - } + tcg_out_bswap32(s, args[0], args[1]); break; =20 case INDEX_op_bswap64_i64: --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660867; cv=none; d=zohomail.com; s=zohoarc; b=HfyR+rKaW2gGddnmALiTKLg/7vUlD7qgOC9cocp+2UlLmmJ/IafNzle5SO0I6gIPDCPxLWOVzgNlCIBD57chAU09YdxsGaxW/cAnLq0F1hYn6Abi/N4xnaKUXmM7WPDQee6FXxaHjygEA87dfKhZxnn0lGvH8PJro8+d2WytCRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660867; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=efhM15NF3CwbPhiaHPmRN5qTN9aiv7TZSEdl+6oiGJA=; b=ExgF2AFZG+TrVJ2FVPLR/DVDKMu4iOO4Ou5R6+bl6HjaRwvfT6QjB30yt18hgJZE+pLlb5SkID3+aLyuwGrS01P7oKo4GWPcS21LcbP5nf6TELupLl+eP9mvQLy2m+zaeIAanwZ7ERTLllYr+9ZMfUn5Y69IXKBhrXiUzAybC3Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660867033769.3040185503806; Mon, 14 Jun 2021 01:54:27 -0700 (PDT) Received: from localhost ([::1]:57126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiMT-00088X-82 for importer@patchew.org; Mon, 14 Jun 2021 04:54:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6s-0002Du-LV for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:18 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]:54218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6i-0003Xw-CP for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:18 -0400 Received: by mail-pj1-x102e.google.com with SMTP id ei4so9286940pjb.3 for ; Mon, 14 Jun 2021 01:38:07 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:06 -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=efhM15NF3CwbPhiaHPmRN5qTN9aiv7TZSEdl+6oiGJA=; b=O7qvuFfny6UZxSJSSIpgm/I0oEcDflN5S+g1lMvMwEy6KIhLmkCEbiaye/AMto0d9q 38w4hXKO5sAkY8YKTOYweFVljZlQX+rZU5LPzZBYrvikBAZkKqkrHbeOyXkB5J/p1T31 1Oa0WlZQLSBVTFNSEBUslIKx9bPtyDZklvinFwNSAU2N9BM1GK6jgm2nGFO26xKa77Bk BcpxF+mkJYKxhHo2HPzcWd+7JC+OimFxb6x7y9q4Z5GMnlQwe9TVeM+gGAsPCF9WELwY AOBqcy7tDExTGiFYRKoHQNDVNgWnoLcN6EjujrO0NDkaWqADa25GjMDzh0wyh5xq9nNa e3pQ== 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=efhM15NF3CwbPhiaHPmRN5qTN9aiv7TZSEdl+6oiGJA=; b=jGEoYlPK9j1aT3CkIQXKIXhkj2Lf/9KEZ8ra3WM18YfBqX5a9axjmhV/9yZa494SGh liXP8BCb291mEj+OmnkqQGzdgCB4WlcnQSu4OCU00noYHvntzvp2t3i6mtqlsidpYn5V 95ULWcxpZdj/D3z3B96Fs3rL1PH7h+UPzp1ra5XrSFKSQu7AjG0L1Eifyc8o2vgjOiXD gm4+xd5L0il9caqH9RnH9SwEdzyN72wFCX18108L2d6QxX8F+O3I/Hjdbx9SvS1DDW8p hL06RKIOhmhG/Tu8+YVLQu235pTM+ktGEPChMFeOWOFJnGtMOa8t9P54Lw0eI3U3Ti6p 3HOg== X-Gm-Message-State: AOAM530I/Nc+OgW2IaQYZ1aBYQn3bakk1nZsrnm+VVTxzY1gVc53ZnQi 6glwVUzNbtFa3VY9glPCfID2NPHA2VTTrw== X-Google-Smtp-Source: ABdhPJxAppJBRSsSA7W15u13HEgGQf0ad/ywVBeym5nQrdhqQUBiUw9GjCyP2PwPczEcadb5Bj+G+Q== X-Received: by 2002:a17:90b:393:: with SMTP id ga19mr17665224pjb.182.1623659887072; Mon, 14 Jun 2021 01:38:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 09/28] tcg/ppc: Split out tcg_out_bswap64 Date: Mon, 14 Jun 2021 01:37:41 -0700 Message-Id: <20210614083800.1166166-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/ppc/tcg-target.c.inc | 51 +++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index f0e42e4b88..690c77b4da 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -809,6 +809,26 @@ static void tcg_out_bswap32(TCGContext *s, TCGReg dst,= TCGReg src) tcg_out_mov(s, TCG_TYPE_REG, dst, tmp); } =20 +static void tcg_out_bswap64(TCGContext *s, TCGReg dst, TCGReg src) +{ + TCGReg t0 =3D dst =3D=3D src ? TCG_REG_R0 : dst; + TCGReg t1 =3D dst =3D=3D src ? dst : TCG_REG_R0; + + /* src =3D abcd efgh */ + tcg_out_rlw(s, RLWINM, t0, src, 8, 0, 31); /* t0 =3D 0000 fghe */ + tcg_out_rlw(s, RLWIMI, t0, src, 24, 0, 7); /* t0 =3D 0000 hghe */ + tcg_out_rlw(s, RLWIMI, t0, src, 24, 16, 23); /* t0 =3D 0000 hgfe */ + + tcg_out_rld(s, RLDICL, t0, t0, 32, 0); /* t0 =3D hgfe 0000 */ + tcg_out_rld(s, RLDICL, t1, src, 32, 0); /* t1 =3D efgh abcd */ + + tcg_out_rlw(s, RLWIMI, t0, t1, 8, 0, 31); /* t0 =3D hgfe bcda */ + tcg_out_rlw(s, RLWIMI, t0, t1, 24, 0, 7); /* t0 =3D hgfe dcda */ + tcg_out_rlw(s, RLWIMI, t0, t1, 24, 16, 23); /* t0 =3D hgfe dcba */ + + tcg_out_mov(s, TCG_TYPE_REG, dst, t0); +} + /* Emit a move into ret of arg, if it can be done in one insn. */ static bool tcg_out_movi_one(TCGContext *s, TCGReg ret, tcg_target_long ar= g) { @@ -2806,37 +2826,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_bswap32_i64: tcg_out_bswap32(s, args[0], args[1]); break; - case INDEX_op_bswap64_i64: - a0 =3D args[0], a1 =3D args[1], a2 =3D TCG_REG_R0; - if (a0 =3D=3D a1) { - a0 =3D TCG_REG_R0; - a2 =3D a1; - } - - /* a1 =3D # abcd efgh */ - /* a0 =3D rl32(a1, 8) # 0000 fghe */ - tcg_out_rlw(s, RLWINM, a0, a1, 8, 0, 31); - /* a0 =3D dep(a0, rl32(a1, 24), 0xff000000) # 0000 hghe */ - tcg_out_rlw(s, RLWIMI, a0, a1, 24, 0, 7); - /* a0 =3D dep(a0, rl32(a1, 24), 0x0000ff00) # 0000 hgfe */ - tcg_out_rlw(s, RLWIMI, a0, a1, 24, 16, 23); - - /* a0 =3D rl64(a0, 32) # hgfe 0000 */ - /* a2 =3D rl64(a1, 32) # efgh abcd */ - tcg_out_rld(s, RLDICL, a0, a0, 32, 0); - tcg_out_rld(s, RLDICL, a2, a1, 32, 0); - - /* a0 =3D dep(a0, rl32(a2, 8), 0xffffffff) # hgfe bcda */ - tcg_out_rlw(s, RLWIMI, a0, a2, 8, 0, 31); - /* a0 =3D dep(a0, rl32(a2, 24), 0xff000000) # hgfe dcda */ - tcg_out_rlw(s, RLWIMI, a0, a2, 24, 0, 7); - /* a0 =3D dep(a0, rl32(a2, 24), 0x0000ff00) # hgfe dcba */ - tcg_out_rlw(s, RLWIMI, a0, a2, 24, 16, 23); - - if (a0 =3D=3D 0) { - tcg_out_mov(s, TCG_TYPE_REG, args[0], a0); - } + tcg_out_bswap64(s, args[0], args[1]); break; =20 case INDEX_op_deposit_i32: --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660253; cv=none; d=zohomail.com; s=zohoarc; b=hLjfGD8RMFC4VoAMha57y6L0HUCLz6nfQUX8/eYRf73FG6UOrWbHn8qbVFI0JICfrM+8vrPDWnJ8aXMWB7IxFfHeqxgpUjAK+cak0Pv1fySe4OSHXhYYE79byKhSg4nMMBkZLfD+frjk+d+weyUj5eWN5aCCR5nyi9e0bkAFmVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660253; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W1aURk4AJbewcgeEluJrf0o5H8N61Ouoo0K7e9Jqy7w=; b=beL0aA9/cm1cWP632m+QaP75bC6RmckTDErw8nMTlSOKVwqawurkQstZXGxcZ0ABEniaUiIygjvEc9gBsmVzbgZNPgkuefvZ9T2GKpUwXYsSpsjCvSt5cy1VxALqgToKfw2Mm44Ba8P9/7BXZab0InvyxDmZopoGzhHiDJ8JieM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660253234527.2204156213808; Mon, 14 Jun 2021 01:44:13 -0700 (PDT) Received: from localhost ([::1]:56990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiCa-00064G-2l for importer@patchew.org; Mon, 14 Jun 2021 04:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6t-0002GG-O6 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:19 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:44826) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6i-0003Yw-Vc for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:19 -0400 Received: by mail-pl1-x62f.google.com with SMTP id b12so6150998plg.11 for ; Mon, 14 Jun 2021 01:38:08 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:07 -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=W1aURk4AJbewcgeEluJrf0o5H8N61Ouoo0K7e9Jqy7w=; b=KXvZtjCfUhlAa4vzah3XrBukd2wIUlzFCFPjgSRC1uTyVwKWxEG6930xOcjbec1ANr wLDT5f8pgApPc0QieRufNiLFIB4j20x8v//GJe++0pUeeuvtj5x0ywwm3PT6ODXVtmSL iByo1yjo8fuPeLFwmWEVRRhT0AmWtsM9tWTeHsnj4CKjlnXawlUYV+TBeWFPOOxzRUuU kvYkU12V0J/Oea6yJAP+dM6mgUAKGyzJlQJ2YUZwg03Flkz/1FE+5FN6fi53mI078ALE zD2aB4F/5h8HknwFrxY8lj3braV/kD5mFcbM+fWkPq67OXlGbVj0h03AkWWku8+NamGc OyIg== 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=W1aURk4AJbewcgeEluJrf0o5H8N61Ouoo0K7e9Jqy7w=; b=qIShkWlQmm7hb9A6i4cSxf0XEyX4pVysl5TR8jvyy5Dj2OeDHRvILfk9IB+O1MXDHv v65+58Vyiu+/OCH7vNCsM2GSdpkoQ8Q4MuhcF+QqcPGgZ2QaJ2oKVsVCn/lMX8zhuh/y mcgWVf9cViuz+tpNL7/H6dX2Itaf5xeRiLbbPYzm22l9BpKSOnEEaJOzLEDbVw4euqGi u61SAc1eOONQ01YKRbxVLlrVzSkXCvWSC6go402OgJTJc5dLR3Llu3fZIAMr1USA8VPR oz09XFRjSDcRTlkczGrb9sEHaLK3Xv9RM2Aj3D5T+yIrl7ym55ReU5FeWU+RGUn0V3vO Q2VA== X-Gm-Message-State: AOAM533vQoJIgcG7lWG5a58oAEenS2EmFyhrDW/HdGjoclw/9z0f88Uo Ps1IXXDUxAOqvx2FS2FO2jCapmYvI7A+jg== X-Google-Smtp-Source: ABdhPJwFtkV0IZmIicdHzb/KQPsNL5A7NBchk87Mqx6/hzy9Vr2zn48q5LbSjSt4DzdAnYxdqzk8rg== X-Received: by 2002:a17:90a:2d8e:: with SMTP id p14mr17339899pjd.131.1623659887699; Mon, 14 Jun 2021 01:38:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 10/28] tcg/ppc: Support bswap flags Date: Mon, 14 Jun 2021 01:37:42 -0700 Message-Id: <20210614083800.1166166-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" For INDEX_op_bswap32_i32, pass 0 for flags: input not zero-extended, output does not need extension within the host 64-bit register. Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c.inc | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 690c77b4da..e868417168 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -788,25 +788,35 @@ static inline void tcg_out_sari64(TCGContext *s, TCGR= eg dst, TCGReg src, int c) tcg_out32(s, SRADI | RA(dst) | RS(src) | SH(c & 0x1f) | ((c >> 4) & 2)= ); } =20 -static void tcg_out_bswap16(TCGContext *s, TCGReg dst, TCGReg src) +static void tcg_out_bswap16(TCGContext *s, TCGReg dst, TCGReg src, int fla= gs) { TCGReg tmp =3D dst =3D=3D src ? TCG_REG_R0 : dst; =20 - /* src =3D abcd */ - tcg_out_rlw(s, RLWINM, tmp, src, 24, 24, 31); /* tmp =3D 000c */ - tcg_out_rlw(s, RLWIMI, tmp, src, 8, 16, 23); /* tmp =3D 00dc */ - tcg_out_mov(s, TCG_TYPE_REG, dst, tmp); + /* src =3D xxxx abcd */ + tcg_out_rlw(s, RLWINM, tmp, src, 24, 24, 31); /* tmp =3D 0000 000c */ + tcg_out_rlw(s, RLWIMI, tmp, src, 8, 16, 23); /* tmp =3D 0000 00dc */ + + if (flags & TCG_BSWAP_OS) { + tcg_out_ext16s(s, dst, tmp); + } else { + tcg_out_mov(s, TCG_TYPE_REG, dst, tmp); + } } =20 -static void tcg_out_bswap32(TCGContext *s, TCGReg dst, TCGReg src) +static void tcg_out_bswap32(TCGContext *s, TCGReg dst, TCGReg src, int fla= gs) { TCGReg tmp =3D dst =3D=3D src ? TCG_REG_R0 : dst; =20 - /* Stolen from gcc's builtin_bswap32. src =3D abcd */ - tcg_out_rlw(s, RLWINM, tmp, src, 8, 0, 31); /* tmp =3D bcda */ - tcg_out_rlw(s, RLWIMI, tmp, src, 24, 0, 7); /* tmp =3D dcda */ - tcg_out_rlw(s, RLWIMI, tmp, src, 24, 16, 23); /* tmp =3D dcba */ - tcg_out_mov(s, TCG_TYPE_REG, dst, tmp); + /* Stolen from gcc's builtin_bswap32. src =3D xxxx abcd */ + tcg_out_rlw(s, RLWINM, tmp, src, 8, 0, 31); /* tmp =3D 0000 bcda */ + tcg_out_rlw(s, RLWIMI, tmp, src, 24, 0, 7); /* tmp =3D 0000 dcda */ + tcg_out_rlw(s, RLWIMI, tmp, src, 24, 16, 23); /* tmp =3D 0000 dcba */ + + if (flags & TCG_BSWAP_OS) { + tcg_out_ext32s(s, dst, tmp); + } else { + tcg_out_mov(s, TCG_TYPE_REG, dst, tmp); + } } =20 static void tcg_out_bswap64(TCGContext *s, TCGReg dst, TCGReg src) @@ -2820,11 +2830,13 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, =20 case INDEX_op_bswap16_i32: case INDEX_op_bswap16_i64: - tcg_out_bswap16(s, args[0], args[1]); + tcg_out_bswap16(s, args[0], args[1], args[2]); break; case INDEX_op_bswap32_i32: + tcg_out_bswap32(s, args[0], args[1], 0); + break; case INDEX_op_bswap32_i64: - tcg_out_bswap32(s, args[0], args[1]); + tcg_out_bswap32(s, args[0], args[1], args[2]); break; case INDEX_op_bswap64_i64: tcg_out_bswap64(s, args[0], args[1]); --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660589; cv=none; d=zohomail.com; s=zohoarc; b=QC/Yf2nFJnyeq6X3Yu2LbjBOh40txEeY/msvvqCxExr5L96eQEASvQiFY4T76zSHJRUvnxbGy4gHxd7Me4iFQHDb9T0yDJnyQrOBKV2o2x3VVL+PzXvfRXxBhrHNHlE8mlJuSiPkPIbxDx1tQ6NUMgVU3Fbzd9IiNwO4hBJfGiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660589; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zQzRjvOakCYe5ymfrsL9K6I+o9h5yKvhTAHMO1Me0hs=; b=crXeu2EjgqJRDRfCju76k4xPBrLoX9/JfknBSk//CyxFdLNxhmb+DFgE/+Y9WdigfZn08HLCBegIlhuG5BCU9W1bFb7hEB4TMRyHAzDsZ3v7HJWvGvx+MGjdhy0FXlp23Znzse1bAq6zC019rxj46WJ81o6cSP+nTbeUgzZUFSo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660589433474.0619585604388; Mon, 14 Jun 2021 01:49:49 -0700 (PDT) Received: from localhost ([::1]:43570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiI0-0007Ya-8N for importer@patchew.org; Mon, 14 Jun 2021 04:49:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6u-0002HI-3u for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:20 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:37587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6j-0003Z8-O8 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:19 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 22-20020a17090a0c16b0290164a5354ad0so9605178pjs.2 for ; Mon, 14 Jun 2021 01:38:09 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:08 -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=zQzRjvOakCYe5ymfrsL9K6I+o9h5yKvhTAHMO1Me0hs=; b=AcyJl20AfC6nMQHjLHLKXQKkpEH2Ww0L2W82ZL6QjHSn5z01PHtC/LCXQRwkhJ8S13 CBqE1atndraO9Z9zInGA7jZeiMb8Xze19bwc8O7OntzCYgEu/Vi+0MfTFtwObtXNDXrP RizSbO3Du/lzkaNEwMGpKLcGNPEDiaftUhv+BJw0+9J2SitnSeh0DZATjvYwYiyk7Gq6 DjdBWQDm5NCxEZ/kQl0g5e7i2DjbEtn0VNFKbuuEK1GEcUuFDaKbryQQA8Jem1WM9y7F CiJDJX9kHf2N5MEHllgJHEilvcB/rpM79EYeLK0NPMonmQ5ZeuiPWxW4eIxGrwUFy8QZ Bn0w== 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=zQzRjvOakCYe5ymfrsL9K6I+o9h5yKvhTAHMO1Me0hs=; b=J7e4boxyav/2KISdklT5Cmb84I9EX5EOOQuPr7F/kT0oyz8T5299RDfUiyRnvp0I9R PJ8i4DFWzczStG2TXyB0q1ON4IUop8LcfxnVkOIL50Gs6RxU3qdm567E9Lykai/8//4m vPE/PRGlP2cEpTlnQ43fuetUazA9LmyeK3c+fpIOprQPwkOS4wzIw0jAx63P8s0C4iWn GrL7n2O8sxvsdsodUjdCTAIZBnDcS7m1HTd1wscUSDszOmVvYDlOalQaY51tm5WkZjMR GCDZhW7XsncHBsQh+Y2GWL7635iU9g89WCBnmrUyVoLqzUxQ3VYCWDWxMVbjaKnDJnqZ X83g== X-Gm-Message-State: AOAM533LvQtHokRGy1UOeYfaWQaClZKMDUSaqNuKHQOhQTq9ehiEMqqt 63GI64KUA5trlmDdMwc3BZKiR0IugZ/iWQ== X-Google-Smtp-Source: ABdhPJzbC7Vl8Oq7mk0j4ush9Iex5aSf9tpX1uam2VLWmjC+ZR0ALLupW+k2LztgXejPqpSiuQkOcw== X-Received: by 2002:a17:90b:3882:: with SMTP id mu2mr12872586pjb.170.1623659888287; Mon, 14 Jun 2021 01:38:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 11/28] tcg/ppc: Use power10 byte-reverse instructions Date: Mon, 14 Jun 2021 01:37:43 -0700 Message-Id: <20210614083800.1166166-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c.inc | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index e868417168..af87643f54 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -413,6 +413,10 @@ static bool tcg_target_const_match(int64_t val, TCGTyp= e type, int ct) #define SRAD XO31(794) #define SRADI XO31(413<<1) =20 +#define BRH XO31(219) +#define BRW XO31(155) +#define BRD XO31(187) + #define TW XO31( 4) #define TRAP (TW | TO(31)) =20 @@ -748,6 +752,11 @@ static inline void tcg_out_ext16s(TCGContext *s, TCGRe= g dst, TCGReg src) tcg_out32(s, EXTSH | RA(dst) | RS(src)); } =20 +static inline void tcg_out_ext16u(TCGContext *s, TCGReg dst, TCGReg src) +{ + tcg_out32(s, ANDI | SAI(src, dst, 0xffff)); +} + static inline void tcg_out_ext32s(TCGContext *s, TCGReg dst, TCGReg src) { tcg_out32(s, EXTSW | RA(dst) | RS(src)); @@ -792,6 +801,16 @@ static void tcg_out_bswap16(TCGContext *s, TCGReg dst,= TCGReg src, int flags) { TCGReg tmp =3D dst =3D=3D src ? TCG_REG_R0 : dst; =20 + if (have_isa_3_10) { + tcg_out32(s, BRH | RA(dst) | RS(src)); + if (flags & TCG_BSWAP_OS) { + tcg_out_ext16s(s, dst, dst); + } else if ((flags & (TCG_BSWAP_IZ | TCG_BSWAP_OZ)) =3D=3D TCG_BSWA= P_OZ) { + tcg_out_ext16u(s, dst, dst); + } + return; + } + /* src =3D xxxx abcd */ tcg_out_rlw(s, RLWINM, tmp, src, 24, 24, 31); /* tmp =3D 0000 000c */ tcg_out_rlw(s, RLWIMI, tmp, src, 8, 16, 23); /* tmp =3D 0000 00dc */ @@ -807,6 +826,16 @@ static void tcg_out_bswap32(TCGContext *s, TCGReg dst,= TCGReg src, int flags) { TCGReg tmp =3D dst =3D=3D src ? TCG_REG_R0 : dst; =20 + if (have_isa_3_10) { + tcg_out32(s, BRW | RA(dst) | RS(src)); + if (flags & TCG_BSWAP_OS) { + tcg_out_ext32s(s, dst, src); + } else if ((flags & (TCG_BSWAP_IZ | TCG_BSWAP_OZ)) =3D=3D TCG_BSWA= P_OZ) { + tcg_out_ext32u(s, dst, dst); + } + return; + } + /* Stolen from gcc's builtin_bswap32. src =3D xxxx abcd */ tcg_out_rlw(s, RLWINM, tmp, src, 8, 0, 31); /* tmp =3D 0000 bcda */ tcg_out_rlw(s, RLWIMI, tmp, src, 24, 0, 7); /* tmp =3D 0000 dcda */ @@ -824,6 +853,11 @@ static void tcg_out_bswap64(TCGContext *s, TCGReg dst,= TCGReg src) TCGReg t0 =3D dst =3D=3D src ? TCG_REG_R0 : dst; TCGReg t1 =3D dst =3D=3D src ? dst : TCG_REG_R0; =20 + if (have_isa_3_10) { + tcg_out32(s, BRD | RA(dst) | RS(src)); + return; + } + /* src =3D abcd efgh */ tcg_out_rlw(s, RLWINM, t0, src, 8, 0, 31); /* t0 =3D 0000 fghe */ tcg_out_rlw(s, RLWIMI, t0, src, 24, 0, 7); /* t0 =3D 0000 hghe */ --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660771; cv=none; d=zohomail.com; s=zohoarc; b=LUmalRigZxQlASwOjoW1tfi7Qczsm65fpO/CTIguLVx7R6hI3AZTYBxhkk4mTyUrbnNVeNh9qReBU/0khCNEUTF2VM+cHdZuLshQ0PGlPt9Qh2lRqV3zci+YbzOexfFyU0jgw4ttfAXinq+3E4yOEo+Iu+0zg31LqAKEt9662OE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660771; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9DRzzMJ2NyGbyRHOk5FDpkj407KEfEqhUdHXH7B5Y3g=; b=PekIEDf0oj/ExjWWT8HQkk1RZ3+Zf+DmWqgqqU9kYjFmbGGyAADe7bGgwNRJETyTsA9BML7Hn5/BmrjKrPBgW4vVz1aX8Lst1X5JW/bKc2Xheo1XmWxgpEAg/YK+tbWAXqnihuw5N25e1y5hdL/sQ8mbthi8XGY3lZGG9Mpk64M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660771946250.2356892616101; Mon, 14 Jun 2021 01:52:51 -0700 (PDT) Received: from localhost ([::1]:52124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiKw-0004rZ-Q8 for importer@patchew.org; Mon, 14 Jun 2021 04:52:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6x-0002Se-CA for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:23 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:41667) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6l-0003ZN-6Q for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:23 -0400 Received: by mail-pg1-x532.google.com with SMTP id l184so8051364pgd.8 for ; Mon, 14 Jun 2021 01:38:09 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:08 -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=9DRzzMJ2NyGbyRHOk5FDpkj407KEfEqhUdHXH7B5Y3g=; b=RlGSYyTpGaBG9fXYtoFtU+SIcEYa+xarVTkWYoGuYeZ7ZrUIlLjkyZKQF2v0r34g30 gU/FVuMXSpJAd0xXfdKfD20isrg1mScqRg0QmbTTJAUN81Gp8C8JSUrRRTd815hEpFWM 4f2kJm/62gklF4iUar8/9lxEL+j9Nkqm5hTeg3CUIosgPp9kMT7gaA2TjspHsnvUuzqM cGCz8xECypfYyP89oMbntmihvoMjAsEuXDW6NbJasKl6BUHvG8Rlp78xu/jH4fg2wBX6 DncLtRuKbS16LDvgU3w8gR52RbXHjKUnBqCWEfJhimJPygndSY1lHH/fz4jtSt6LKV6q pMBw== 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=9DRzzMJ2NyGbyRHOk5FDpkj407KEfEqhUdHXH7B5Y3g=; b=QGz4Tfk2mPnEUrtGIasRMhG6YOeyvS4u+PcskRdYDfr2H0Bw+OZITqY8doNjIVl1Qw MDDTypjyhl8Rm2TW4iKpbLOWaEVeax/fExUviq1Uc43JQCIWQhRixuL8vOFtjiki4pGC vr2LkW9cmDsDomneV8fLCuZeoDXVwHkHZOUT+k0IyrHsBHhBxNyhDd23/KflwB4Dsqip HrePgAYEcFqEppPhmu62faMOUGNSqxkhHp67BFkV1Vfca5NVKNPmQ8SWp0DF2MmZ/xNO l1PLH+km+FkAwg7RF/doGuAsjqvrvXjhJIzTKHeHQfZxVmjFlRpJu19LB+/zvwKoR0fB aLgw== X-Gm-Message-State: AOAM531mSxjGE/Pgj8BAfx/wwFG9+EnIoJ2fa2DeBZEGX53wj8M9TE9Q 75tu9RmvOXuN6LIu3SIZH7Mf4acmX+g7tA== X-Google-Smtp-Source: ABdhPJywmMZvvZ+kUrQ8QIQP7LTtQLjl1eFa210+27KHaGloFBq6AQJm1g+V2XD0iLgbpccYG9SiUg== X-Received: by 2002:a62:84d4:0:b029:2e9:c639:5452 with SMTP id k203-20020a6284d40000b02902e9c6395452mr20757757pfd.61.1623659888742; Mon, 14 Jun 2021 01:38:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 12/28] tcg/s390: Support bswap flags Date: Mon, 14 Jun 2021 01:37:44 -0700 Message-Id: <20210614083800.1166166-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::532; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x532.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" For INDEX_op_bswap16_i64, use 64-bit instructions so that we can easily provide the extension to 64-bits. Drop the special case, previously used, where the input is already zero-extended -- the minor code size savings is not worth the complication. Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.c.inc | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/tcg/s390/tcg-target.c.inc b/tcg/s390/tcg-target.c.inc index 5fe073f09a..b82cf19f09 100644 --- a/tcg/s390/tcg-target.c.inc +++ b/tcg/s390/tcg-target.c.inc @@ -1951,15 +1951,37 @@ static inline void tcg_out_op(TCGContext *s, TCGOpc= ode opc, tgen_ext16u(s, TCG_TYPE_I32, args[0], args[1]); break; =20 - OP_32_64(bswap16): - /* The TCG bswap definition requires bits 0-47 already be zero. - Thus we don't need the G-type insns to implement bswap16_i64. = */ - tcg_out_insn(s, RRE, LRVR, args[0], args[1]); - tcg_out_sh32(s, RS_SRL, args[0], TCG_REG_NONE, 16); + case INDEX_op_bswap16_i32: + a0 =3D args[0], a1 =3D args[1], a2 =3D args[2]; + tcg_out_insn(s, RRE, LRVR, a0, a1); + if (a2 & TCG_BSWAP_OS) { + tcg_out_sh32(s, RS_SRA, a0, TCG_REG_NONE, 16); + } else { + tcg_out_sh32(s, RS_SRL, a0, TCG_REG_NONE, 16); + } break; - OP_32_64(bswap32): + case INDEX_op_bswap16_i64: + a0 =3D args[0], a1 =3D args[1], a2 =3D args[2]; + tcg_out_insn(s, RRE, LRVGR, a0, a1); + if (a2 & TCG_BSWAP_OS) { + tcg_out_sh64(s, RSY_SRAG, a0, a0, TCG_REG_NONE, 48); + } else { + tcg_out_sh64(s, RSY_SRLG, a0, a0, TCG_REG_NONE, 48); + } + break; + + case INDEX_op_bswap32_i32: tcg_out_insn(s, RRE, LRVR, args[0], args[1]); break; + case INDEX_op_bswap32_i64: + a0 =3D args[0], a1 =3D args[1], a2 =3D args[2]; + tcg_out_insn(s, RRE, LRVR, a0, a1); + if (a2 & TCG_BSWAP_OS) { + tgen_ext32s(s, a0, a0); + } else if ((a2 & (TCG_BSWAP_IZ | TCG_BSWAP_OZ)) =3D=3D TCG_BSWAP_O= Z) { + tgen_ext32u(s, a0, a0); + } + break; =20 case INDEX_op_add2_i32: if (const_args[4]) { --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660139; cv=none; d=zohomail.com; s=zohoarc; b=O7EIoAmMFgj7BGhfS/yxlTXWFamK7u5k8Phoy6OtNk9N7ZaQ/pHImW6TDMTM1h1JwzI3gWHM2DPnvMzD2911eQsuUZeSs9Hy28Aii/Vka4gWx29LpSPRAJz9wGdhdYxZME8R5QHvDy66RlQHyH3sUy8atvk5U3kPBCDvID4suFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660139; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2lV8vgJYRzkBj6vA6hwqKERA8bZrmR1z2r1Kt2NYFM8=; b=fSzMzE3ZCxKEnJ/XjAtgi3Macz1dHnMNb+fQv3fbrKg8rB9/uKlHqEEmRrvYILJl/2k/25ekFA4neLelGCIjKwX5WR2V6ZCC1RvU5ncYwrkoGpKPG7naUeqw4L8djEtiC8UbglwtOUs6Utff5zUmPjKCHjvE5Eycx7tlRSWyf/k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660138997769.5991605260073; Mon, 14 Jun 2021 01:42:18 -0700 (PDT) Received: from localhost ([::1]:49814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiAh-0001N9-Si for importer@patchew.org; Mon, 14 Jun 2021 04:42:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6t-0002FN-GC for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:19 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:45739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6l-0003ZV-6t for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:19 -0400 Received: by mail-pl1-x62e.google.com with SMTP id 11so6147011plk.12 for ; Mon, 14 Jun 2021 01:38:10 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:09 -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=2lV8vgJYRzkBj6vA6hwqKERA8bZrmR1z2r1Kt2NYFM8=; b=YUv8rmXQuk0IU0YxJOXKjhF4gjJsptl0msePKlTxWAgfPk/7sUUNWV1SxUDqDdpG8f ZSjRIq0Xze5uPCUUybMH4b64JatfHMLpQsNP4FXoTav7UllOaRTMW6eiHgq1Jg/xDkzP nx1giEFn1tfcTUiNRc5y6uyxiJYAIWqv/ei5/A6F7MQIK4W41yb53e5jexJsr/16vsrz fsscrRFH6P5qnUYbVonv8AgcBV/Kj32rVxk58v3fl3LlArQyJPw+8e2Wa4Pl3isqQR0h CTP/c7apC9wEdkgt4JZK3rqIvfAf2wtixy1WSwwCzNOXKslCEOyrQoyLM/WDL5a26+rS xfGw== 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=2lV8vgJYRzkBj6vA6hwqKERA8bZrmR1z2r1Kt2NYFM8=; b=RD77VucPXsolyEDQbPEuodCDH6IX6524Zhnq5gfzSDvJWahiPP6K1qodGkUmM1r9sg 4/bKnz2TKiAD/T0zHz0qmuveNp+/xBxqTPzTUTJipujc3/KABYKMvzZNOvzFNHtNTWhB 7k9IAPQStxosMd0X6hpu74PGOqq+/uOQUQd7ynuKNoljmZwmPfsLx9aQAk9z3/Ztgmx/ XvCfIn+sD+4GWKU/4ggwHnavR0bPGyZ9wjsUYIy0y5qn46DPWcz3XfQhyi26S1MNXevy 4Z6awmezH0Ayj9uL8or/hy/PcRFuuVDDp9vE4rBvhO08bpVUeoRmnJTA2kXTVJYX1xGY xkNA== X-Gm-Message-State: AOAM533SL+yF8MpXv5ihDtBNFxcHGzNJNM4QCROgMpmtsCwDzNVDGEXb 1QVLUzMSAYC0Bzw0WCtcp33P6quyguCPJw== X-Google-Smtp-Source: ABdhPJxdpmzOYkNeXE1JJ0jSSmSGjHgv5JnWQYMitglxCgq1H6oC2NWID+90sJfkCipvLs38Nz4kAQ== X-Received: by 2002:a17:90a:ea8c:: with SMTP id h12mr21632542pjz.149.1623659889335; Mon, 14 Jun 2021 01:38:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 13/28] tcg/mips: Support bswap flags in tcg_out_bswap16 Date: Mon, 14 Jun 2021 01:37:45 -0700 Message-Id: <20210614083800.1166166-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Merge tcg_out_bswap16 and tcg_out_bswap16s. Use the flags in the internal uses for loads and stores. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/mips/tcg-target.c.inc | 60 ++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 5944448b2a..7a5634419c 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -540,39 +540,36 @@ static void tcg_out_movi(TCGContext *s, TCGType type, } } =20 -static inline void tcg_out_bswap16(TCGContext *s, TCGReg ret, TCGReg arg) +static void tcg_out_bswap16(TCGContext *s, TCGReg ret, TCGReg arg, int fla= gs) { + /* ret and arg can't be register tmp0 */ + tcg_debug_assert(ret !=3D TCG_TMP0); + tcg_debug_assert(arg !=3D TCG_TMP0); + if (use_mips32r2_instructions) { tcg_out_opc_reg(s, OPC_WSBH, ret, 0, arg); - } else { - /* ret and arg can't be register at */ - if (ret =3D=3D TCG_TMP0 || arg =3D=3D TCG_TMP0) { - tcg_abort(); + if (flags & TCG_BSWAP_OS) { + tcg_out_opc_reg(s, OPC_SEH, ret, 0, ret); + } else if ((flags & (TCG_BSWAP_IZ | TCG_BSWAP_OZ)) =3D=3D TCG_BSWA= P_OZ) { + tcg_out_opc_imm(s, OPC_ANDI, ret, ret, 0xffff); } - - tcg_out_opc_sa(s, OPC_SRL, TCG_TMP0, arg, 8); - tcg_out_opc_sa(s, OPC_SLL, ret, arg, 8); - tcg_out_opc_imm(s, OPC_ANDI, ret, ret, 0xff00); - tcg_out_opc_reg(s, OPC_OR, ret, ret, TCG_TMP0); + return; } -} =20 -static inline void tcg_out_bswap16s(TCGContext *s, TCGReg ret, TCGReg arg) -{ - if (use_mips32r2_instructions) { - tcg_out_opc_reg(s, OPC_WSBH, ret, 0, arg); - tcg_out_opc_reg(s, OPC_SEH, ret, 0, ret); - } else { - /* ret and arg can't be register at */ - if (ret =3D=3D TCG_TMP0 || arg =3D=3D TCG_TMP0) { - tcg_abort(); - } - - tcg_out_opc_sa(s, OPC_SRL, TCG_TMP0, arg, 8); + tcg_out_opc_sa(s, OPC_SRL, TCG_TMP0, arg, 8); + if (!(flags & TCG_BSWAP_IZ)) { + tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP0, TCG_TMP0, 0x00ff); + } + if (flags & TCG_BSWAP_OS) { tcg_out_opc_sa(s, OPC_SLL, ret, arg, 24); tcg_out_opc_sa(s, OPC_SRA, ret, ret, 16); - tcg_out_opc_reg(s, OPC_OR, ret, ret, TCG_TMP0); + } else { + tcg_out_opc_sa(s, OPC_SLL, ret, arg, 8); + if (flags & TCG_BSWAP_OZ) { + tcg_out_opc_imm(s, OPC_ANDI, ret, ret, 0xff00); + } } + tcg_out_opc_reg(s, OPC_OR, ret, ret, TCG_TMP0); } =20 static void tcg_out_bswap_subr(TCGContext *s, const tcg_insn_unit *sub) @@ -1367,14 +1364,14 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, T= CGReg lo, TCGReg hi, break; case MO_UW | MO_BSWAP: tcg_out_opc_imm(s, OPC_LHU, TCG_TMP1, base, 0); - tcg_out_bswap16(s, lo, TCG_TMP1); + tcg_out_bswap16(s, lo, TCG_TMP1, TCG_BSWAP_IZ | TCG_BSWAP_OZ); break; case MO_UW: tcg_out_opc_imm(s, OPC_LHU, lo, base, 0); break; case MO_SW | MO_BSWAP: tcg_out_opc_imm(s, OPC_LHU, TCG_TMP1, base, 0); - tcg_out_bswap16s(s, lo, TCG_TMP1); + tcg_out_bswap16(s, lo, TCG_TMP1, TCG_BSWAP_IZ | TCG_BSWAP_OS); break; case MO_SW: tcg_out_opc_imm(s, OPC_LH, lo, base, 0); @@ -1514,8 +1511,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, TCG= Reg lo, TCGReg hi, break; =20 case MO_16 | MO_BSWAP: - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP1, lo, 0xffff); - tcg_out_bswap16(s, TCG_TMP1, TCG_TMP1); + tcg_out_bswap16(s, TCG_TMP1, lo, 0); lo =3D TCG_TMP1; /* FALLTHRU */ case MO_16: @@ -1933,10 +1929,6 @@ static inline void tcg_out_op(TCGContext *s, TCGOpco= de opc, case INDEX_op_not_i64: i1 =3D OPC_NOR; goto do_unary; - case INDEX_op_bswap16_i32: - case INDEX_op_bswap16_i64: - i1 =3D OPC_WSBH; - goto do_unary; case INDEX_op_ext8s_i32: case INDEX_op_ext8s_i64: i1 =3D OPC_SEB; @@ -1948,6 +1940,10 @@ static inline void tcg_out_op(TCGContext *s, TCGOpco= de opc, tcg_out_opc_reg(s, i1, a0, TCG_REG_ZERO, a1); break; =20 + case INDEX_op_bswap16_i32: + case INDEX_op_bswap16_i64: + tcg_out_bswap16(s, a0, a1, a2); + break; case INDEX_op_bswap32_i32: tcg_out_bswap32(s, a0, a1); break; --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623661081; cv=none; d=zohomail.com; s=zohoarc; b=aynPJyToOczlT5D/usreq0oSIX5PPyOipDNua8ZYyFGok0LzsPrykOE0EvBQx8Ko1ysqeL4Yfy+F+V3PfMZFD4rn0tHTvDnc0v/973ovxr5vQJUEffDG4OllGIwfbyW2PTb3M4T05SiLaWN9n8rB3xj88+AwOWtKKTgi79Xf82M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623661081; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LgKd1kr+0l/T/EU54OtdSbM7ljWVi4b0faE3cCGA0EQ=; b=kAs9E4lMRa0csDcK47rqOTKOs0V5P31LdM3R2HjT2YJBSbP5VuQrFwLX4CICzxq85+z1M3MtixCguC83ljcOW+IssvZsB95yPtscRU27kZ0nT0d/167IDqcJpHMGrRUeD6fdmPzghIbf88clJsIUKu/Rt1xzk89ZfcPfNN6iQxg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623661081023517.5492765218422; Mon, 14 Jun 2021 01:58:01 -0700 (PDT) Received: from localhost ([::1]:37496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiPw-0005bd-12 for importer@patchew.org; Mon, 14 Jun 2021 04:58:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6v-0002LV-CV for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:21 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:33737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6l-0003Zg-Ky for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:21 -0400 Received: by mail-pf1-x430.google.com with SMTP id p13so10045940pfw.0 for ; Mon, 14 Jun 2021 01:38:10 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:09 -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=LgKd1kr+0l/T/EU54OtdSbM7ljWVi4b0faE3cCGA0EQ=; b=q28oC+Q8oDgeJAJ5kz2qU/XA1uzu+NmyHnaLv6/x/1TW99+KiTUjvMK/Z2hkz5bK+s hIYqAhO7DOuN92+JGrZgfHUh1PONkJxknvqVINefP/nPffAE26clM8Wx8cgr4Gllmab+ Ijc3IDACBhVivmjiJV6axUmJpW9KOeLcu1M71htrRHLFg1CDmSy02sbzY0mDHD+kBxR2 hnxUpTkzqJj/6jFlnW5FckuHVG3QVMVKnYCQ2ZyNMv9yNQQ9nwGLBSmbuRmy6UCmJ5GS 7tmv6Ac2e+sNpvJojYkBNrPrOBxMul8rZZ+MFamFmU200It+8q2/QGQoa7Ul621RsceK CQHA== 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=LgKd1kr+0l/T/EU54OtdSbM7ljWVi4b0faE3cCGA0EQ=; b=ERjQmXFRft6ktt52VaSXpNUBL2aCaib9TD/IY+GGc0ZSmaOIrnkqNOvDgeT9FzUq7f nBWoCS4E52Oz9l01L01nzGtJD/TIq48oDdMEg9vXvv0srVuY/GNN74x/i1LNGV84wDXf sLVXpnU9e/WkN1eu2zmDzsn1Xede6gpzLH9TzwujegyCMJqb7U7dD7/XL0WAcdqvE+8b jxS4tYmeLYCGafaqUPreAtWFsQeS0zcyV1DthScxjqvo9HHJCaiGON5JG2B9M6cNiifu F8/MKCYqfp6mxNqlR9rHIEisZcaTdxCNSJuV9CJWrqJ5HJCKIx3AGFPEvNVkRuVytA/H oAFg== X-Gm-Message-State: AOAM532tNICCkxsHZi4jpkiCTU75ltidO1zYquuSYpO+Iv/fIwqWiNI5 CY3ezuyuvFvrxl/U36+lYu/aRSeFv7wvJA== X-Google-Smtp-Source: ABdhPJwSlBqIFUGou0sc5/2ZkS7XuLMqddtjIwUolxm1FOG1oAnhJSjIs+FopQex1tWTVyAERVE/Mw== X-Received: by 2002:a05:6a00:a17:b029:2f9:a2bb:e126 with SMTP id p23-20020a056a000a17b02902f9a2bbe126mr4750977pfh.30.1623659889904; Mon, 14 Jun 2021 01:38:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 14/28] tcg/mips: Support bswap flags in tcg_out_bswap32 Date: Mon, 14 Jun 2021 01:37:46 -0700 Message-Id: <20210614083800.1166166-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Merge tcg_out_bswap32 and tcg_out_bswap32s. Use the flags in the internal uses for loads and stores. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/mips/tcg-target.c.inc | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 7a5634419c..e3698274eb 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -578,27 +578,20 @@ static void tcg_out_bswap_subr(TCGContext *s, const t= cg_insn_unit *sub) tcg_debug_assert(ok); } =20 -static void tcg_out_bswap32(TCGContext *s, TCGReg ret, TCGReg arg) +static void tcg_out_bswap32(TCGContext *s, TCGReg ret, TCGReg arg, int fla= gs) { if (use_mips32r2_instructions) { tcg_out_opc_reg(s, OPC_WSBH, ret, 0, arg); tcg_out_opc_sa(s, OPC_ROTR, ret, ret, 16); + if (flags & TCG_BSWAP_OZ) { + tcg_out_opc_bf(s, OPC_DEXT, ret, ret, 31, 0); + } } else { - tcg_out_bswap_subr(s, bswap32_addr); - /* delay slot -- never omit the insn, like tcg_out_mov might. */ - tcg_out_opc_reg(s, OPC_OR, TCG_TMP0, arg, TCG_REG_ZERO); - tcg_out_mov(s, TCG_TYPE_I32, ret, TCG_TMP3); - } -} - -static void tcg_out_bswap32u(TCGContext *s, TCGReg ret, TCGReg arg) -{ - if (use_mips32r2_instructions) { - tcg_out_opc_reg(s, OPC_DSBH, ret, 0, arg); - tcg_out_opc_reg(s, OPC_DSHD, ret, 0, ret); - tcg_out_dsrl(s, ret, ret, 32); - } else { - tcg_out_bswap_subr(s, bswap32u_addr); + if (flags & TCG_BSWAP_OZ) { + tcg_out_bswap_subr(s, bswap32u_addr); + } else { + tcg_out_bswap_subr(s, bswap32_addr); + } /* delay slot -- never omit the insn, like tcg_out_mov might. */ tcg_out_opc_reg(s, OPC_OR, TCG_TMP0, arg, TCG_REG_ZERO); tcg_out_mov(s, TCG_TYPE_I32, ret, TCG_TMP3); @@ -1380,7 +1373,7 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TCG= Reg lo, TCGReg hi, if (TCG_TARGET_REG_BITS =3D=3D 64 && is_64) { if (use_mips32r2_instructions) { tcg_out_opc_imm(s, OPC_LWU, lo, base, 0); - tcg_out_bswap32u(s, lo, lo); + tcg_out_bswap32(s, lo, lo, TCG_BSWAP_IZ | TCG_BSWAP_OZ); } else { tcg_out_bswap_subr(s, bswap32u_addr); /* delay slot */ @@ -1393,7 +1386,7 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TCG= Reg lo, TCGReg hi, case MO_SL | MO_BSWAP: if (use_mips32r2_instructions) { tcg_out_opc_imm(s, OPC_LW, lo, base, 0); - tcg_out_bswap32(s, lo, lo); + tcg_out_bswap32(s, lo, lo, 0); } else { tcg_out_bswap_subr(s, bswap32_addr); /* delay slot */ @@ -1519,7 +1512,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, TCG= Reg lo, TCGReg hi, break; =20 case MO_32 | MO_BSWAP: - tcg_out_bswap32(s, TCG_TMP3, lo); + tcg_out_bswap32(s, TCG_TMP3, lo, 0); lo =3D TCG_TMP3; /* FALLTHRU */ case MO_32: @@ -1538,9 +1531,9 @@ static void tcg_out_qemu_st_direct(TCGContext *s, TCG= Reg lo, TCGReg hi, tcg_out_opc_imm(s, OPC_SW, TCG_TMP0, base, 0); tcg_out_opc_imm(s, OPC_SW, TCG_TMP1, base, 4); } else { - tcg_out_bswap32(s, TCG_TMP3, MIPS_BE ? lo : hi); + tcg_out_bswap32(s, TCG_TMP3, MIPS_BE ? lo : hi, 0); tcg_out_opc_imm(s, OPC_SW, TCG_TMP3, base, 0); - tcg_out_bswap32(s, TCG_TMP3, MIPS_BE ? hi : lo); + tcg_out_bswap32(s, TCG_TMP3, MIPS_BE ? hi : lo, 0); tcg_out_opc_imm(s, OPC_SW, TCG_TMP3, base, 4); } break; @@ -1945,10 +1938,10 @@ static inline void tcg_out_op(TCGContext *s, TCGOpc= ode opc, tcg_out_bswap16(s, a0, a1, a2); break; case INDEX_op_bswap32_i32: - tcg_out_bswap32(s, a0, a1); + tcg_out_bswap32(s, a0, a1, 0); break; case INDEX_op_bswap32_i64: - tcg_out_bswap32u(s, a0, a1); + tcg_out_bswap32(s, a0, a1, a2); break; case INDEX_op_bswap64_i64: tcg_out_bswap64(s, a0, a1); --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660480; cv=none; d=zohomail.com; s=zohoarc; b=WcS59T/69rL/iEAeSw0spXRub3WL8b/kK2PvZJbJ66oZjIqNBS/rvf1nfA/W+zN9dZDGjhZyWvn9XcU4OgMOZwgfdXaFMqR9wD/GFG0KoVee879zWkVw16yAVhmOzqICQhTcM9qjM2+t1ti9sHD689amNwEu1ek9kgSSKHlHN7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660480; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eanNhhdSmGxxyPIStrUWyJsT/SdYtmDYp1DHF6kEh6o=; b=Z53y2sJnQeNyYuGUH5q6nPI2/XwlA/RT1nZ9hjVtf/pOUFznQLIQn/Qwahs35Si9OUwuA1pRhVmJY0i0MLvAzyORuJNp/S1ZcYtzwXhRwRDPabAPoooXkHutnHN8EdiXRn04QhRyeKhuzkY7BLxzuG+ouFsxzzinKtT0pJ5jwT4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16236604808644.061930984466926; Mon, 14 Jun 2021 01:48:00 -0700 (PDT) Received: from localhost ([::1]:38680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiGF-0004Iu-Gs for importer@patchew.org; Mon, 14 Jun 2021 04:47:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6v-0002Ny-W5 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:22 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:40617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6l-0003Zo-PC for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:21 -0400 Received: by mail-pj1-x1030.google.com with SMTP id mp5-20020a17090b1905b029016dd057935fso9589219pjb.5 for ; Mon, 14 Jun 2021 01:38:11 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:10 -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=eanNhhdSmGxxyPIStrUWyJsT/SdYtmDYp1DHF6kEh6o=; b=ZpsqCrsUF2QzCbXdnytQKEJRtleqCS2tlNtDW+dd8sLPezkdwBVGLOx/EyZ5iR37dD QDoFFoazCT/Q1qE1JmTboOkTASJe8J+2poDmwNWaN53+R/obGqKvPAEq6q4WWI/8B4Co e16ppTNepCzeebfqOvWLJTcCkw87I8emQ7Ge7gxO2OkCK6BbfhjQDkj6UuqgaAty6Ilw YG+AAsc8JiRMotFS9oXDreT5Tw+24b7jb4HGJwL8uQVf6Up3C2TiS74a7hCjGxsubg4/ d+zcMxUMkOSV2KCdpgMffdqqAR2xVOcy7n2pI6QQjAURs0llpaH5ADgOc28e87TCvTEQ pRSA== 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=eanNhhdSmGxxyPIStrUWyJsT/SdYtmDYp1DHF6kEh6o=; b=i0+s1CV0PvEIdGzOZsiLGjY1Viiu4+xlEP2NsbmGAmMhG7eS4wVGNZmCOb/baY2kVr F+ruHSzwMa0NHbxZBq3bJkIIoAyX55wZKKW12rf0C8oqcGFMDqpgPaZ7r4VR/lw9345Q 5nui/MkS7yOh19XNFfFpZF7mbUNU+BbkWKxM3cgeFqXKrQvtGTGF+tOy9tAfJmnhh+z4 EQxfeH6CQF8BpFOhSlhnnU3dLKeu0lSHCM5lCOWMz9mzbUejjp6a740UGSqa0EIW1oO9 372oJXmMn8ywNXjc/TiVCezN8xdTEPHCOJaVNwxjM6/2x/UkXa0Erhi77543nh4fGfjN I8Kw== X-Gm-Message-State: AOAM530Aemr9P/nLoBp3j4BC/KkEHziLpt80OfgS7wAAA6MMpGLsFA+f psklC0hgs8eX78D2GCO4RC5zauq7sUE4IA== X-Google-Smtp-Source: ABdhPJxHDlqB9MOt9DMFSexNr/yZSh780erNBRiLJf0ndYfRzLNxQEYQXBGPEl02uDzEjCISsKW1xQ== X-Received: by 2002:a17:90a:fb51:: with SMTP id iq17mr17752189pjb.26.1623659890549; Mon, 14 Jun 2021 01:38:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 15/28] tcg/tci: Support bswap flags Date: Mon, 14 Jun 2021 01:37:47 -0700 Message-Id: <20210614083800.1166166-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The existing interpreter zero-extends, ignoring high bits. Simply add a separate sign-extension opcode if required. Ensure that the interpreter supports ext16s when bswap16 is enabled. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/tci.c | 3 ++- tcg/tci/tcg-target.c.inc | 23 ++++++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tcg/tci.c b/tcg/tci.c index d68c5a4e55..109522a865 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -733,7 +733,8 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchStat= e *env, regs[r0] =3D (int8_t)regs[r1]; break; #endif -#if TCG_TARGET_HAS_ext16s_i32 || TCG_TARGET_HAS_ext16s_i64 +#if TCG_TARGET_HAS_ext16s_i32 || TCG_TARGET_HAS_ext16s_i64 || \ + TCG_TARGET_HAS_bswap16_i32 || TCG_TARGET_HAS_bswap16_i64 CASE_32_64(ext16s) tci_args_rr(&tb_ptr, &r0, &r1); regs[r0] =3D (int16_t)regs[r1]; diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index 823ecd5d35..1e92688dca 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -617,6 +617,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg args[TCG_MAX_OP_ARGS], const int const_args[TCG_MAX_OP_ARGS]) { + TCGOpcode exts; + switch (opc) { case INDEX_op_exit_tb: tcg_out_op_p(s, opc, (void *)args[0]); @@ -710,12 +712,27 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, CASE_64(ext32u) /* Optional (TCG_TARGET_HAS_ext32u_i64). */ CASE_64(ext_i32) CASE_64(extu_i32) - CASE_32_64(bswap16) /* Optional (TCG_TARGET_HAS_bswap16_*). */ - CASE_32_64(bswap32) /* Optional (TCG_TARGET_HAS_bswap32_*). */ - CASE_64(bswap64) /* Optional (TCG_TARGET_HAS_bswap64_i64). */ + case INDEX_op_bswap32_i32: /* Optional (TCG_TARGET_HAS_bswap32_i32). */ + case INDEX_op_bswap64_i64: /* Optional (TCG_TARGET_HAS_bswap64_i64). */ tcg_out_op_rr(s, opc, args[0], args[1]); break; =20 + case INDEX_op_bswap16_i32: /* Optional (TCG_TARGET_HAS_bswap16_i32). */ + exts =3D INDEX_op_ext16s_i32; + goto do_bswap; + case INDEX_op_bswap16_i64: /* Optional (TCG_TARGET_HAS_bswap16_i64). */ + exts =3D INDEX_op_ext16s_i64; + goto do_bswap; + case INDEX_op_bswap32_i64: /* Optional (TCG_TARGET_HAS_bswap32_i64). */ + exts =3D INDEX_op_ext32s_i64; + do_bswap: + /* The base tci bswaps zero-extend, and ignore high bits. */ + tcg_out_op_rr(s, opc, args[0], args[1]); + if (args[2] & TCG_BSWAP_OS) { + tcg_out_op_rr(s, exts, args[0], args[0]); + } + break; + #if TCG_TARGET_REG_BITS =3D=3D 32 case INDEX_op_add2_i32: case INDEX_op_sub2_i32: --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660274; cv=none; d=zohomail.com; s=zohoarc; b=FJ+hnrjw5NV6etgPJTEdzRYS9ewsxE3lNxtypxrDINg8LhkjB0D0+vvuGAr8bmEWQnTCqRvR0Ak7ZokWHi72/ch4KfMWg4j/jrETX0v/ZYDIXAI0jcESPu/IQdK4x9v5TSUveCFzlt3e9PqX2rbRUkaCAD6nR75AvI8kMjPiUw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660274; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UZkn/bCz3YGcO9TqhXoosXO7opN8+jen9eeeiO+Mw8Y=; b=FyU6yuf+ocfbeX5Z+Ht62V6VmkIv0vgiYHL+aYvbkkTz0z5W89Z0tMFoHmiQK38QTWq3AL5EVrRBXQJy3aVroLTxtwg8IjAN1vxfPVhmPcVWnbMiKU7ipmLGGaWLL4zm2L9Js8mdKA41fPaN7LtpvXYZlDvBPORJNCYfwhf9uI8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660274018114.08943632027433; Mon, 14 Jun 2021 01:44:34 -0700 (PDT) Received: from localhost ([::1]:58330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiCu-0006yS-Kr for importer@patchew.org; Mon, 14 Jun 2021 04:44:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6v-0002MP-LE for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:21 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:40619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6n-0003Zv-5j for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:21 -0400 Received: by mail-pj1-x1032.google.com with SMTP id mp5-20020a17090b1905b029016dd057935fso9589252pjb.5 for ; Mon, 14 Jun 2021 01:38:11 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:10 -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=UZkn/bCz3YGcO9TqhXoosXO7opN8+jen9eeeiO+Mw8Y=; b=SSJlREGT/yv8Er9ROaPRLix0KZGEhoeElfqmFmPuh1LkGcO0KuZvpCZFgmCnNdB2Jn Xdn2eItMpgGbK/fImwcCHnafZPSlgRuhIA7qIIVfnymNhoTCW3oAaVC0Jw0C8L/Ucdyi IW8AZU1PfheTPYJdFCPGJCo9FtAYhk5KGFtWrhhpGdrT0PiIo4B4zeUj2ImePYFYM7cz awk0xU6kmEhWDvUZBlwXa10P6ejLhrQDuj2ney61sv/5FudCRs7HW2czRlA64/ikT5TU dliyR42zN7sst2wPh2y1fKPPJKo0LfpPxBhgbygX8FevVtq9G9Z1HTwkeSe1Q5hqVRQJ ZsBQ== 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=UZkn/bCz3YGcO9TqhXoosXO7opN8+jen9eeeiO+Mw8Y=; b=j2sjOsICCQKC3neNFBdMtiVBOTPkReH0XafKP9nUvIEUyYwVudjfeweDT5ElHikQ+e Esoy14CdW7i4bSFZLrBq6Vn40TipkX9tOFilLPgKCD59tm4LWYH9XlQjUU0SbkfmxlM8 Tg8xErUfmClSoddfyGCKiXwGxW6RwWgv2alVj/XuOXJ4nBQSABRhVOm/ShsjJmZnfTq6 uhN09tAPyFiGEE3t3g1qwn3PJwMPhsSg7pkKe0huznHoHqZPxx5/zVAAgCiEfkql/XSb 0edUk1ShjeCxmxVVmKZqFA4JSvvfKrYujpdmSN0rM2q3+KfZJ+gevlKVPTcgCohkU9Cf bhFQ== X-Gm-Message-State: AOAM530LcHaXeVVCCKs7HnZuArs9BekR+6vfG60I4TzlBtE1bo21ZEx/ WtpxW06T3HqnHn6KxDWxxpAg9JCFWqLOHA== X-Google-Smtp-Source: ABdhPJyac6wxzceVMefh0x8lrkLYBHtTW8NPasP0OJlpi6QdYKolTkoLyjBqsRaRX/mGGOnnOIbPdw== X-Received: by 2002:a17:902:222:b029:11b:9cea:eea9 with SMTP id 31-20020a1709020222b029011b9ceaeea9mr3816446plc.11.1623659891130; Mon, 14 Jun 2021 01:38:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 16/28] tcg: Handle new bswap flags during optimize Date: Mon, 14 Jun 2021 01:37:48 -0700 Message-Id: <20210614083800.1166166-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Notice when the input is known to be zero-extended and force the TCG_BSWAP_IZ flag on. Honor the TCG_BSWAP_OS bit during constant folding. Propagate the input to the output mask. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/optimize.c | 56 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 37c902283e..3b6983fbef 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -354,10 +354,12 @@ static uint64_t do_constant_folding_2(TCGOpcode op, u= int64_t x, uint64_t y) return (uint16_t)x; =20 CASE_OP_32_64(bswap16): - return bswap16(x); + x =3D bswap16(x); + return y & TCG_BSWAP_OS ? (int16_t)x : x; =20 CASE_OP_32_64(bswap32): - return bswap32(x); + x =3D bswap32(x); + return y & TCG_BSWAP_OS ? (int32_t)x : x; =20 case INDEX_op_bswap64_i64: return bswap64(x); @@ -1028,6 +1030,42 @@ void tcg_optimize(TCGContext *s) } break; =20 + CASE_OP_32_64(bswap16): + mask =3D arg_info(op->args[1])->mask; + if (mask <=3D 0xffff) { + op->args[2] |=3D TCG_BSWAP_IZ; + } + mask =3D bswap16(mask); + switch (op->args[2] & (TCG_BSWAP_OZ | TCG_BSWAP_OS)) { + case TCG_BSWAP_OZ: + break; + case TCG_BSWAP_OS: + mask =3D (int16_t)mask; + break; + default: /* undefined high bits */ + mask |=3D MAKE_64BIT_MASK(16, 48); + break; + } + break; + + case INDEX_op_bswap32_i64: + mask =3D arg_info(op->args[1])->mask; + if (mask <=3D 0xffffffffu) { + op->args[2] |=3D TCG_BSWAP_IZ; + } + mask =3D bswap32(mask); + switch (op->args[2] & (TCG_BSWAP_OZ | TCG_BSWAP_OS)) { + case TCG_BSWAP_OZ: + break; + case TCG_BSWAP_OS: + mask =3D (int32_t)mask; + break; + default: /* undefined high bits */ + mask |=3D MAKE_64BIT_MASK(32, 32); + break; + } + break; + default: break; } @@ -1134,9 +1172,6 @@ void tcg_optimize(TCGContext *s) CASE_OP_32_64(ext16s): CASE_OP_32_64(ext16u): CASE_OP_32_64(ctpop): - CASE_OP_32_64(bswap16): - CASE_OP_32_64(bswap32): - case INDEX_op_bswap64_i64: case INDEX_op_ext32s_i64: case INDEX_op_ext32u_i64: case INDEX_op_ext_i32_i64: @@ -1150,6 +1185,17 @@ void tcg_optimize(TCGContext *s) } goto do_default; =20 + CASE_OP_32_64(bswap16): + CASE_OP_32_64(bswap32): + case INDEX_op_bswap64_i64: + if (arg_is_const(op->args[1])) { + tmp =3D do_constant_folding(opc, arg_info(op->args[1])->va= l, + op->args[2]); + tcg_opt_gen_movi(s, &temps_used, op, op->args[0], tmp); + break; + } + goto do_default; + CASE_OP_32_64(add): CASE_OP_32_64(sub): CASE_OP_32_64(mul): --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660660; cv=none; d=zohomail.com; s=zohoarc; b=m008+iRsei6ympCUDHDmCUaJRtiM1IqTCkV3YA5x1CaJexM5SG1RHWCqwCUDPiLTTuS59nQJWHjM88dhDt0dV3MAUoHsJ42Q/mP9z5iJqcpw4woI0XRWszoJm9l9dSSoO8ffrC4r4FE0OX3POrTtICQxj8dex1QXPOSMimJb3W4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660660; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4hwXCHaT/vW/aMtR3cJ4Vr8bzsPcCgTPjrmVdwIPgV4=; b=KP6CsTNRmQxyLzyI5KwvDCddyiCXYVPluVfWCa9a2lf/+jGKUR6pd8PS5KnttY2X2Wlgdu7wS/7LKy+Tc8/7VcNkVfKZHvzcss+sxIusJVI4Ra4cWzvH8F+d1zwdKW9LqlXa5mjlPHKAO6UgSpJiYYDtM/tjW3VkSllZ3z+HKI0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660660427295.60818510866; Mon, 14 Jun 2021 01:51:00 -0700 (PDT) Received: from localhost ([::1]:47280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiJ9-0001aO-AY for importer@patchew.org; Mon, 14 Jun 2021 04:50:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6w-0002Qr-O8 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:22 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:41789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6n-0003ao-86 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:22 -0400 Received: by mail-pl1-x636.google.com with SMTP id e1so6151761plh.8 for ; Mon, 14 Jun 2021 01:38:12 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:11 -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=4hwXCHaT/vW/aMtR3cJ4Vr8bzsPcCgTPjrmVdwIPgV4=; b=cpc/6/7O7brmAkDc73FOJrUFTku3lMRMK+BbT81o8hyEWz+OGii/FMVxNQ6Qg5hAAQ JSq6JpCeROUVT+19Kk2Dk3nvKgambMo2DTKxzNEpvOEAuXlQ7Q17Y3yhe6XTV4mwP6Wm VnPqy5g3xLkpjWXTBpu8fI8ADEF+wkI1zIMPmryTjTTkXQH3V99b8wDaCNg950r6MiuW m+TnT1O5b8jZZWmryKU+9RWj58YB/jqAbK+HPIOpMIYY9uXxnhjfk9tvSFTwi3pFD+4g v1tvJgZkOQ2RsKkXax9ksexo7jLBsuEks269ptKhRKNvpFO2GLK3XGo3Muug4C4qLIjJ O48A== 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=4hwXCHaT/vW/aMtR3cJ4Vr8bzsPcCgTPjrmVdwIPgV4=; b=nmj563aEODYbImySUKMNsaemkYg4dd4pS36+3q157NDRpuDk+Eqw/3b25LW3tFsinh yGA6y2fotE68/z34vsffMhtEA/5GpyK6KZ5PNQrSM/e1PcFwVFeqXqttX2Glizcgkf+0 N5fh0Vw1b6gONihQQ1GCa3bEYoL04lwjiJMwtj5uWIMH/Lua+I/y+ivKRThm7eLwROS8 +fXshIzNjgnS+uXpMnDa2qlJuRdMI63EjqVrXY5aEArFaOxxq2CD6T5bD2+Umb0BHFeg GQ4EZ+F/FD4VpSpyci0V/DhDxrmz53/l3G4p5Z9tizD4S7x7MhbVMPV4pXblWS9f7hOc WLSQ== X-Gm-Message-State: AOAM533bHb2x1THNidusKy7HvI4lPS/m+PVFy8UgvxbGPFDx39xgki4L YcPFxn0oSsQVolgcJl6XL04W8xubLaBHNg== X-Google-Smtp-Source: ABdhPJym7NHzTVg3dK+HqLj5hYGddY1rNxKsCzfBgCaFDB+DXYCu+heEB8S/gGWzy9sA7T2PmcaBvg== X-Received: by 2002:a17:90a:398f:: with SMTP id z15mr17854680pjb.183.1623659891820; Mon, 14 Jun 2021 01:38:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 17/28] tcg: Add flags argument to tcg_gen_bswap16_*, tcg_gen_bswap32_i64 Date: Mon, 14 Jun 2021 01:37:49 -0700 Message-Id: <20210614083800.1166166-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Implement the new semantics in the fallback expansion. Change all callers to supply the flags that keep the semantics unchanged locally. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/tcg/tcg-op.h | 8 +-- target/arm/translate-a64.c | 12 ++-- target/arm/translate.c | 2 +- target/i386/tcg/translate.c | 2 +- target/mips/tcg/mxu_translate.c | 2 +- target/s390x/translate.c | 4 +- target/sh4/translate.c | 2 +- tcg/tcg-op.c | 121 ++++++++++++++++++++++---------- 8 files changed, 99 insertions(+), 54 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index ef8a008ea7..caf6ba2149 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -330,7 +330,7 @@ void tcg_gen_ext8s_i32(TCGv_i32 ret, TCGv_i32 arg); void tcg_gen_ext16s_i32(TCGv_i32 ret, TCGv_i32 arg); void tcg_gen_ext8u_i32(TCGv_i32 ret, TCGv_i32 arg); void tcg_gen_ext16u_i32(TCGv_i32 ret, TCGv_i32 arg); -void tcg_gen_bswap16_i32(TCGv_i32 ret, TCGv_i32 arg); +void tcg_gen_bswap16_i32(TCGv_i32 ret, TCGv_i32 arg, int flags); void tcg_gen_bswap32_i32(TCGv_i32 ret, TCGv_i32 arg); void tcg_gen_smin_i32(TCGv_i32, TCGv_i32 arg1, TCGv_i32 arg2); void tcg_gen_smax_i32(TCGv_i32, TCGv_i32 arg1, TCGv_i32 arg2); @@ -525,8 +525,8 @@ void tcg_gen_ext32s_i64(TCGv_i64 ret, TCGv_i64 arg); void tcg_gen_ext8u_i64(TCGv_i64 ret, TCGv_i64 arg); void tcg_gen_ext16u_i64(TCGv_i64 ret, TCGv_i64 arg); void tcg_gen_ext32u_i64(TCGv_i64 ret, TCGv_i64 arg); -void tcg_gen_bswap16_i64(TCGv_i64 ret, TCGv_i64 arg); -void tcg_gen_bswap32_i64(TCGv_i64 ret, TCGv_i64 arg); +void tcg_gen_bswap16_i64(TCGv_i64 ret, TCGv_i64 arg, int flags); +void tcg_gen_bswap32_i64(TCGv_i64 ret, TCGv_i64 arg, int flags); void tcg_gen_bswap64_i64(TCGv_i64 ret, TCGv_i64 arg); void tcg_gen_smin_i64(TCGv_i64, TCGv_i64 arg1, TCGv_i64 arg2); void tcg_gen_smax_i64(TCGv_i64, TCGv_i64 arg1, TCGv_i64 arg2); @@ -1185,7 +1185,7 @@ void tcg_gen_stl_vec(TCGv_vec r, TCGv_ptr base, TCGAr= g offset, TCGType t); #define tcg_gen_ext32u_tl tcg_gen_mov_i32 #define tcg_gen_ext32s_tl tcg_gen_mov_i32 #define tcg_gen_bswap16_tl tcg_gen_bswap16_i32 -#define tcg_gen_bswap32_tl tcg_gen_bswap32_i32 +#define tcg_gen_bswap32_tl(D, S, F) tcg_gen_bswap32_i32(D, S) #define tcg_gen_bswap_tl tcg_gen_bswap32_i32 #define tcg_gen_concat_tl_i64 tcg_gen_concat_i32_i64 #define tcg_gen_extr_i64_tl tcg_gen_extr_i64_i32 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 8713dfec17..e0785ce859 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -5437,15 +5437,15 @@ static void handle_rev32(DisasContext *s, unsigned = int sf, =20 /* bswap32_i64 requires zero high word */ tcg_gen_ext32u_i64(tcg_tmp, tcg_rn); - tcg_gen_bswap32_i64(tcg_rd, tcg_tmp); + tcg_gen_bswap32_i64(tcg_rd, tcg_tmp, TCG_BSWAP_IZ | TCG_BSWAP_OZ); tcg_gen_shri_i64(tcg_tmp, tcg_rn, 32); - tcg_gen_bswap32_i64(tcg_tmp, tcg_tmp); + tcg_gen_bswap32_i64(tcg_tmp, tcg_tmp, TCG_BSWAP_IZ | TCG_BSWAP_OZ); tcg_gen_concat32_i64(tcg_rd, tcg_rd, tcg_tmp); =20 tcg_temp_free_i64(tcg_tmp); } else { tcg_gen_ext32u_i64(tcg_rd, cpu_reg(s, rn)); - tcg_gen_bswap32_i64(tcg_rd, tcg_rd); + tcg_gen_bswap32_i64(tcg_rd, tcg_rd, TCG_BSWAP_IZ | TCG_BSWAP_OZ); } } =20 @@ -12436,10 +12436,12 @@ static void handle_rev(DisasContext *s, int opcod= e, bool u, read_vec_element(s, tcg_tmp, rn, i, grp_size); switch (grp_size) { case MO_16: - tcg_gen_bswap16_i64(tcg_tmp, tcg_tmp); + tcg_gen_bswap16_i64(tcg_tmp, tcg_tmp, + TCG_BSWAP_IZ | TCG_BSWAP_OZ); break; case MO_32: - tcg_gen_bswap32_i64(tcg_tmp, tcg_tmp); + tcg_gen_bswap32_i64(tcg_tmp, tcg_tmp, + TCG_BSWAP_IZ | TCG_BSWAP_OZ); break; case MO_64: tcg_gen_bswap64_i64(tcg_tmp, tcg_tmp); diff --git a/target/arm/translate.c b/target/arm/translate.c index 8e0e55c1e0..6b88163e3a 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -342,7 +342,7 @@ void gen_rev16(TCGv_i32 dest, TCGv_i32 var) static void gen_revsh(TCGv_i32 dest, TCGv_i32 var) { tcg_gen_ext16u_i32(var, var); - tcg_gen_bswap16_i32(var, var); + tcg_gen_bswap16_i32(var, var, TCG_BSWAP_IZ | TCG_BSWAP_OZ); tcg_gen_ext16s_i32(dest, var); } =20 diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index a7f5c0c8f2..e8a9dcd21a 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -7203,7 +7203,7 @@ static target_ulong disas_insn(DisasContext *s, CPUSt= ate *cpu) { gen_op_mov_v_reg(s, MO_32, s->T0, reg); tcg_gen_ext32u_tl(s->T0, s->T0); - tcg_gen_bswap32_tl(s->T0, s->T0); + tcg_gen_bswap32_tl(s->T0, s->T0, TCG_BSWAP_IZ | TCG_BSWAP_OZ); gen_op_mov_reg_v(s, MO_32, reg, s->T0); } break; diff --git a/target/mips/tcg/mxu_translate.c b/target/mips/tcg/mxu_translat= e.c index fb0a811af6..c12cf78df7 100644 --- a/target/mips/tcg/mxu_translate.c +++ b/target/mips/tcg/mxu_translate.c @@ -861,7 +861,7 @@ static void gen_mxu_s32ldd_s32lddr(DisasContext *ctx) =20 if (sel =3D=3D 1) { /* S32LDDR */ - tcg_gen_bswap32_tl(t1, t1); + tcg_gen_bswap32_tl(t1, t1, TCG_BSWAP_IZ | TCG_BSWAP_OZ); } gen_store_mxu_gpr(t1, XRa); =20 diff --git a/target/s390x/translate.c b/target/s390x/translate.c index e243624d2a..03dab9f350 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3939,13 +3939,13 @@ static DisasJumpType op_rosbg(DisasContext *s, Disa= sOps *o) =20 static DisasJumpType op_rev16(DisasContext *s, DisasOps *o) { - tcg_gen_bswap16_i64(o->out, o->in2); + tcg_gen_bswap16_i64(o->out, o->in2, TCG_BSWAP_IZ | TCG_BSWAP_OZ); return DISAS_NEXT; } =20 static DisasJumpType op_rev32(DisasContext *s, DisasOps *o) { - tcg_gen_bswap32_i64(o->out, o->in2); + tcg_gen_bswap32_i64(o->out, o->in2, TCG_BSWAP_IZ | TCG_BSWAP_OZ); return DISAS_NEXT; } =20 diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 9312790623..147219759b 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -677,7 +677,7 @@ static void _decode_opc(DisasContext * ctx) { TCGv low =3D tcg_temp_new(); tcg_gen_ext16u_i32(low, REG(B7_4)); - tcg_gen_bswap16_i32(low, low); + tcg_gen_bswap16_i32(low, low, TCG_BSWAP_IZ | TCG_BSWAP_OZ); tcg_gen_deposit_i32(REG(B11_8), REG(B7_4), low, 0, 16); tcg_temp_free(low); } diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index dc65577e2f..3763285bb0 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -1001,20 +1001,35 @@ void tcg_gen_ext16u_i32(TCGv_i32 ret, TCGv_i32 arg) } } =20 -/* Note: we assume the two high bytes are set to zero */ -void tcg_gen_bswap16_i32(TCGv_i32 ret, TCGv_i32 arg) +void tcg_gen_bswap16_i32(TCGv_i32 ret, TCGv_i32 arg, int flags) { + /* Only one extension flag may be present. */ + tcg_debug_assert(!(flags & TCG_BSWAP_OS) || !(flags & TCG_BSWAP_OZ)); + if (TCG_TARGET_HAS_bswap16_i32) { - tcg_gen_op3i_i32(INDEX_op_bswap16_i32, ret, arg, - TCG_BSWAP_IZ | TCG_BSWAP_OZ); + tcg_gen_op3i_i32(INDEX_op_bswap16_i32, ret, arg, flags); } else { TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); =20 - tcg_gen_ext8u_i32(t0, arg); - tcg_gen_shli_i32(t0, t0, 8); - tcg_gen_shri_i32(ret, arg, 8); - tcg_gen_or_i32(ret, ret, t0); + tcg_gen_shri_i32(t0, arg, 8); + if (!(flags & TCG_BSWAP_IZ)) { + tcg_gen_ext8u_i32(t0, t0); + } + + if (flags & TCG_BSWAP_OS) { + tcg_gen_shli_i32(t1, t1, 24); + tcg_gen_sari_i32(t1, t1, 16); + } else if (flags & TCG_BSWAP_OZ) { + tcg_gen_ext8u_i32(t1, arg); + tcg_gen_shli_i32(t1, t1, 8); + } else { + tcg_gen_shli_i32(t1, arg, 8); + } + + tcg_gen_or_i32(ret, t0, t1); tcg_temp_free_i32(t0); + tcg_temp_free_i32(t1); } } =20 @@ -1655,51 +1670,79 @@ void tcg_gen_ext32u_i64(TCGv_i64 ret, TCGv_i64 arg) } } =20 -/* Note: we assume the six high bytes are set to zero */ -void tcg_gen_bswap16_i64(TCGv_i64 ret, TCGv_i64 arg) +void tcg_gen_bswap16_i64(TCGv_i64 ret, TCGv_i64 arg, int flags) { + /* Only one extension flag may be present. */ + tcg_debug_assert(!(flags & TCG_BSWAP_OS) || !(flags & TCG_BSWAP_OZ)); + if (TCG_TARGET_REG_BITS =3D=3D 32) { - tcg_gen_bswap16_i32(TCGV_LOW(ret), TCGV_LOW(arg)); - tcg_gen_movi_i32(TCGV_HIGH(ret), 0); + tcg_gen_bswap16_i32(TCGV_LOW(ret), TCGV_LOW(arg), flags); + if (flags & TCG_BSWAP_OS) { + tcg_gen_sari_i32(TCGV_HIGH(ret), TCGV_LOW(ret), 31); + } else { + tcg_gen_movi_i32(TCGV_HIGH(ret), 0); + } } else if (TCG_TARGET_HAS_bswap16_i64) { - tcg_gen_op3i_i64(INDEX_op_bswap16_i64, ret, arg, - TCG_BSWAP_IZ | TCG_BSWAP_OZ); + tcg_gen_op3i_i64(INDEX_op_bswap16_i64, ret, arg, flags); } else { TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); =20 - tcg_gen_ext8u_i64(t0, arg); - tcg_gen_shli_i64(t0, t0, 8); - tcg_gen_shri_i64(ret, arg, 8); - tcg_gen_or_i64(ret, ret, t0); + tcg_gen_shri_i64(t0, arg, 8); + if (!(flags & TCG_BSWAP_IZ)) { + tcg_gen_ext8u_i64(t0, t0); + } + + if (flags & TCG_BSWAP_OS) { + tcg_gen_shli_i64(t1, t1, 56); + tcg_gen_sari_i64(t1, t1, 48); + } else if (flags & TCG_BSWAP_OZ) { + tcg_gen_ext8u_i64(t1, arg); + tcg_gen_shli_i64(t1, t1, 8); + } else { + tcg_gen_shli_i64(t1, arg, 8); + } + + tcg_gen_or_i64(ret, t0, t1); tcg_temp_free_i64(t0); + tcg_temp_free_i64(t1); } } =20 -/* Note: we assume the four high bytes are set to zero */ -void tcg_gen_bswap32_i64(TCGv_i64 ret, TCGv_i64 arg) +void tcg_gen_bswap32_i64(TCGv_i64 ret, TCGv_i64 arg, int flags) { + /* Only one extension flag may be present. */ + tcg_debug_assert(!(flags & TCG_BSWAP_OS) || !(flags & TCG_BSWAP_OZ)); + if (TCG_TARGET_REG_BITS =3D=3D 32) { tcg_gen_bswap32_i32(TCGV_LOW(ret), TCGV_LOW(arg)); - tcg_gen_movi_i32(TCGV_HIGH(ret), 0); + if (flags & TCG_BSWAP_OS) { + tcg_gen_sari_i32(TCGV_HIGH(ret), TCGV_LOW(ret), 31); + } else { + tcg_gen_movi_i32(TCGV_HIGH(ret), 0); + } } else if (TCG_TARGET_HAS_bswap32_i64) { - tcg_gen_op3i_i64(INDEX_op_bswap32_i64, ret, arg, - TCG_BSWAP_IZ | TCG_BSWAP_OZ); + tcg_gen_op3i_i64(INDEX_op_bswap32_i64, ret, arg, flags); } else { TCGv_i64 t0 =3D tcg_temp_new_i64(); TCGv_i64 t1 =3D tcg_temp_new_i64(); TCGv_i64 t2 =3D tcg_constant_i64(0x00ff00ff); =20 - /* arg =3D ....abcd */ - tcg_gen_shri_i64(t0, arg, 8); /* t0 =3D .....abc */ - tcg_gen_and_i64(t1, arg, t2); /* t1 =3D .....b.d */ - tcg_gen_and_i64(t0, t0, t2); /* t0 =3D .....a.c */ - tcg_gen_shli_i64(t1, t1, 8); /* t1 =3D ....b.d. */ - tcg_gen_or_i64(ret, t0, t1); /* ret =3D ....badc */ + /* arg =3D xxxxabcd */ + tcg_gen_shri_i64(t0, arg, 8); /* t0 =3D .xxxxabc */ + tcg_gen_and_i64(t1, arg, t2); /* t1 =3D .....b.d */ + tcg_gen_and_i64(t0, t0, t2); /* t0 =3D .....a.c */ + tcg_gen_shli_i64(t1, t1, 8); /* t1 =3D ....b.d. */ + tcg_gen_or_i64(ret, t0, t1); /* ret =3D ....badc */ =20 - tcg_gen_shli_i64(t1, ret, 48); /* t1 =3D dc...... */ - tcg_gen_shri_i64(t0, ret, 16); /* t0 =3D ......ba */ - tcg_gen_shri_i64(t1, t1, 32); /* t1 =3D ....dc.. */ - tcg_gen_or_i64(ret, t0, t1); /* ret =3D ....dcba */ + tcg_gen_shli_i64(t1, ret, 48); /* t1 =3D dc...... */ + tcg_gen_shri_i64(t0, ret, 16); /* t0 =3D ......ba */ + if (flags & TCG_BSWAP_OS) { + tcg_gen_sari_i64(t1, t1, 32); /* t1 =3D ssssdc.. */ + } else { + tcg_gen_shri_i64(t1, t1, 32); /* t1 =3D ....dc.. */ + } + tcg_gen_or_i64(ret, t0, t1); /* ret =3D ssssdcba */ =20 tcg_temp_free_i64(t0); tcg_temp_free_i64(t1); @@ -2846,7 +2889,7 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCG= Arg idx, MemOp memop) if ((orig_memop ^ memop) & MO_BSWAP) { switch (orig_memop & MO_SIZE) { case MO_16: - tcg_gen_bswap16_i32(val, val); + tcg_gen_bswap16_i32(val, val, TCG_BSWAP_IZ | TCG_BSWAP_OZ); if (orig_memop & MO_SIGN) { tcg_gen_ext16s_i32(val, val); } @@ -2874,7 +2917,7 @@ void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCG= Arg idx, MemOp memop) switch (memop & MO_SIZE) { case MO_16: tcg_gen_ext16u_i32(swap, val); - tcg_gen_bswap16_i32(swap, swap); + tcg_gen_bswap16_i32(swap, swap, TCG_BSWAP_IZ | TCG_BSWAP_OZ); break; case MO_32: tcg_gen_bswap32_i32(swap, val); @@ -2935,13 +2978,13 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, T= CGArg idx, MemOp memop) if ((orig_memop ^ memop) & MO_BSWAP) { switch (orig_memop & MO_SIZE) { case MO_16: - tcg_gen_bswap16_i64(val, val); + tcg_gen_bswap16_i64(val, val, TCG_BSWAP_IZ | TCG_BSWAP_OZ); if (orig_memop & MO_SIGN) { tcg_gen_ext16s_i64(val, val); } break; case MO_32: - tcg_gen_bswap32_i64(val, val); + tcg_gen_bswap32_i64(val, val, TCG_BSWAP_IZ | TCG_BSWAP_OZ); if (orig_memop & MO_SIGN) { tcg_gen_ext32s_i64(val, val); } @@ -2975,11 +3018,11 @@ void tcg_gen_qemu_st_i64(TCGv_i64 val, TCGv addr, T= CGArg idx, MemOp memop) switch (memop & MO_SIZE) { case MO_16: tcg_gen_ext16u_i64(swap, val); - tcg_gen_bswap16_i64(swap, swap); + tcg_gen_bswap16_i64(swap, swap, TCG_BSWAP_IZ | TCG_BSWAP_OZ); break; case MO_32: tcg_gen_ext32u_i64(swap, val); - tcg_gen_bswap32_i64(swap, swap); + tcg_gen_bswap32_i64(swap, swap, TCG_BSWAP_IZ | TCG_BSWAP_OZ); break; case MO_64: tcg_gen_bswap64_i64(swap, val); --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623661294; cv=none; d=zohomail.com; s=zohoarc; b=OumABCFIa27qAbN1xeXsYH+iMh0cUqHjpT4A/aIN5n8mKaUflcDahjs3ijdgU4K2DyB/CFNvb3cR2rQRzB6G4XLMDKVJwTkvN08nbSRiHZ7RzX9c4br6AJQC4q+9Wtn1XPFyxSVKqP4XuxtbMUfyNslXi81BVZp2RhYBsHV+5ao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623661294; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UVKS3oIvQJqq/m46KHoZVGeIMZjC4WFobcwJ7uSJNW4=; b=XZFn7bjQiTbRwZyczTG9VtAIePSo/HcXc09eQ4y2v4au2arIzvYj0HxuN23zLtjSmxbU66b5xsxPYPXd/bBko2gieIdWQRv/Vparu9npQrxfRGSlqyddEESYQRbQAwUXn9R1E34ng90PAJUsSawlsTnDHn2PFT9NY0E+5PYyKnQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623661294024771.1324041929498; Mon, 14 Jun 2021 02:01:34 -0700 (PDT) Received: from localhost ([::1]:44660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiTM-0002rH-6G for importer@patchew.org; Mon, 14 Jun 2021 05:01:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6x-0002Rt-3c for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:23 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:37404) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6o-0003c2-Ie for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:22 -0400 Received: by mail-pl1-x62a.google.com with SMTP id h12so6159007plf.4 for ; Mon, 14 Jun 2021 01:38:13 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:12 -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=UVKS3oIvQJqq/m46KHoZVGeIMZjC4WFobcwJ7uSJNW4=; b=haD5awAve1TkWeDf8PA/dXAj/yXjjrYaYGZ8fEWUbY0kXXQ14t/7xWqIzho3NYrzKd uKr6HZw/vO/3qTdiHmRLeN2R7REkMFoJRK1aP5k+yXZja+uXNqaCRby5fpKJKWZLn3YF EIDqBjFpily6qKlTH1MvfPkwLaL/Wmi7l32B/FWy+LVon8s2rDeVlrOyls08UudSI+JQ A+lryCwQgRqxDdHICVqgNJ6tDV/GD6I93y4jwQysuaHFhyjKiIlkp1OWLJXrvXA4zz1u kcrSAplooSI784kkMdWEq3MhZid+185Qo4i8qPrJjwSzXX3DsrG6Jgfv6CbEzBdlc5Ts 2/wQ== 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=UVKS3oIvQJqq/m46KHoZVGeIMZjC4WFobcwJ7uSJNW4=; b=tODRNGyDcyB52BXAUSo/G5xzrRVe5+YSszB9C6zOQ8a17jiykMmGEVAaT4rEAB3XEj NgTBMzi2kYRWp3Xrtziv2erdKcWWVX7iencGyJ2Q9wOlHyCqO4F9qFtriMbqb1lfSl8+ VDpK3g0n+MI7nNwck0AME1Pnh/wBXgke4fNSTbv0ddxOGZjb2eHfeAOl2L+k5qvW/Iqf OJVH6LORYgmBJ9jUArlCJCDKcfyXo3CnoNgmo9P16QqAY6kWJXZnrT4llziBOjmXwuQI BfokhK6A7s4nb1/rGgXpEoKe5claA4ay4lj/EHwVlZA9OUPFdTi3aNTpamzYCETPKsPj WHNw== X-Gm-Message-State: AOAM532V3u33iO4rujMAG3h+oD6s9uoLJcSsLiGJN3Ebc099ow96YLqi tmdfcQ/BTLSmrn4//WSWDpxQBzI3pgWEfw== X-Google-Smtp-Source: ABdhPJwiMU4mHHigurckWItxoUfSYRbBcFZUzCSA1NFhk589Q43yvUnoOCesFhJxoz2o2BNodFeHSQ== X-Received: by 2002:a17:90a:4503:: with SMTP id u3mr18213194pjg.210.1623659892384; Mon, 14 Jun 2021 01:38:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 18/28] tcg: Make use of bswap flags in tcg_gen_qemu_ld_* Date: Mon, 14 Jun 2021 01:37:50 -0700 Message-Id: <20210614083800.1166166-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" We can perform any required sign-extension via TCG_BSWAP_OS. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/tcg-op.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 3763285bb0..702da7afb7 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2876,7 +2876,7 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCG= Arg idx, MemOp memop) orig_memop =3D memop; if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { memop &=3D ~MO_BSWAP; - /* The bswap primitive requires zero-extended input. */ + /* The bswap primitive benefits from zero-extended input. */ if ((memop & MO_SSIZE) =3D=3D MO_SW) { memop &=3D ~MO_SIGN; } @@ -2889,10 +2889,9 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TC= GArg idx, MemOp memop) if ((orig_memop ^ memop) & MO_BSWAP) { switch (orig_memop & MO_SIZE) { case MO_16: - tcg_gen_bswap16_i32(val, val, TCG_BSWAP_IZ | TCG_BSWAP_OZ); - if (orig_memop & MO_SIGN) { - tcg_gen_ext16s_i32(val, val); - } + tcg_gen_bswap16_i32(val, val, (orig_memop & MO_SIGN + ? TCG_BSWAP_IZ | TCG_BSWAP_OS + : TCG_BSWAP_IZ | TCG_BSWAP_OZ)); break; case MO_32: tcg_gen_bswap32_i32(val, val); @@ -2965,7 +2964,7 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCG= Arg idx, MemOp memop) orig_memop =3D memop; if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { memop &=3D ~MO_BSWAP; - /* The bswap primitive requires zero-extended input. */ + /* The bswap primitive benefits from zero-extended input. */ if ((memop & MO_SIGN) && (memop & MO_SIZE) < MO_64) { memop &=3D ~MO_SIGN; } @@ -2976,18 +2975,15 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, T= CGArg idx, MemOp memop) plugin_gen_mem_callbacks(addr, info); =20 if ((orig_memop ^ memop) & MO_BSWAP) { + int flags =3D (orig_memop & MO_SIGN + ? TCG_BSWAP_IZ | TCG_BSWAP_OS + : TCG_BSWAP_IZ | TCG_BSWAP_OZ); switch (orig_memop & MO_SIZE) { case MO_16: - tcg_gen_bswap16_i64(val, val, TCG_BSWAP_IZ | TCG_BSWAP_OZ); - if (orig_memop & MO_SIGN) { - tcg_gen_ext16s_i64(val, val); - } + tcg_gen_bswap16_i64(val, val, flags); break; case MO_32: - tcg_gen_bswap32_i64(val, val, TCG_BSWAP_IZ | TCG_BSWAP_OZ); - if (orig_memop & MO_SIGN) { - tcg_gen_ext32s_i64(val, val); - } + tcg_gen_bswap32_i64(val, val, flags); break; case MO_64: tcg_gen_bswap64_i64(val, val); --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660638; cv=none; d=zohomail.com; s=zohoarc; b=QccA25eprpbdfzkG6ui/bXh1+ScThYtABxr6v9sFziHpFP8DBVg3NlLZg68dpbjcJcorBcobQdrMGHa0B8AXbDbq90hIGeK72psyKmYtReqDxA8yj3qK+TauNaWbIuKWMoAHnqr4fgPT/Jckm5tMi7qZM04e3sbAy9UwkruT7xQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660638; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=g2DFsQ9t433IY1mkuvqi2WafpHFJU1Gt4g42MrkG5qo=; b=PhC//p5DnM2fLWEWTNAv36sc6gZu3YRi0iucPJlPEiah2MEZB7PQ45/J1lUe8zTpmjZ7ZjIEK2LehqatLVS6+CFYJPsKVlocUgxaQXFwMBdJYDMS3lZ82jh/6B6qmMRSf61nL3Nr+u9ezlg39jYikicwX2UJKMyfo9BiDvhvwA8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660638200758.8093949447791; Mon, 14 Jun 2021 01:50:38 -0700 (PDT) Received: from localhost ([::1]:46004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiIn-0000ko-3V for importer@patchew.org; Mon, 14 Jun 2021 04:50:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6z-0002ZI-80 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:25 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:51776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6o-0003cI-Nr for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:24 -0400 Received: by mail-pj1-x1030.google.com with SMTP id k5so9290007pjj.1 for ; Mon, 14 Jun 2021 01:38:13 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:12 -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=g2DFsQ9t433IY1mkuvqi2WafpHFJU1Gt4g42MrkG5qo=; b=p4qNBABVLziCoaM19gFNyEfMX9hF9sPnK/Mh2pGjI80ZPA+zal2RKhId6J+rv0z5uR l3OAFyUbzQ7AyFOR5XfcCQu5BL/AHTJwjgyMiqpqUsb1IUgyGxlkDDN5fSOZ3GOASxdA OwROQcvqanK0q/1ikBahACu26T4IDA3tc6EdcKFIGcO4JVgNFpMSibIJpUwwOF977FT5 OEBDIIsWX3G8oEb61hGMIRtt20XAqyVoz2S3pW65yDjs+AfIXc4fkJjn1dFlCSrWuNo0 Fgcgo7MFQMKW6sIlda05x254o8IOIJXQgk82d4pf4dT9d3RvqO/id2JHpDs7TB+BqUa3 Wt1Q== 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=g2DFsQ9t433IY1mkuvqi2WafpHFJU1Gt4g42MrkG5qo=; b=Km92Nz6PqAYCvzlST/lLwTgY3z0E14FHpvLHpWhhAF2fF4OORxuO8hV9jP4LFDuYUB 3pb0/sGmhw6vIS3/EtEmzOuea0iKQWExIfFIzwGGBVYVMdxJA1zZRwyMra/JVeN/4c4j 3BvRMaAxZ1q5HKWiJf0+7QMBNUCpy3NpJrfnJOtoz8guMeXXYstKWX+dxE+qfafVmkY5 z4e41CQf0NkPOInb6O+whO0RyTgINekt9qaiakQg9xgvdf6OOUrltWWZltyf/oSYpC3F 4MDUcM7I54s27LcAnXl5bwsSAlaBPieZeFbz8PD/bGBHZeYJJdpskch/Y6TITTratHwS 0lsQ== X-Gm-Message-State: AOAM533ueXG6QQ2P8JwP/i7kfNgte8iBBaa+IEoWqPk1f8miGw4uw/Ks uka42/APp/VWzYUdHGWeXbJd5rM37FIllA== X-Google-Smtp-Source: ABdhPJwvtTB/7eTM93I4lDcvSP9SmWd56ofZsi3LOwRLYsNGKqp0W81ePkAjCvs3MZC1IZ///iOk1w== X-Received: by 2002:a17:90b:18d:: with SMTP id t13mr22654673pjs.191.1623659892812; Mon, 14 Jun 2021 01:38:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 19/28] tcg: Make use of bswap flags in tcg_gen_qemu_st_* Date: Mon, 14 Jun 2021 01:37:51 -0700 Message-Id: <20210614083800.1166166-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" By removing TCG_BSWAP_IZ we indicate that the input is not zero-extended, and thus can remove an explicit extend. By removing TCG_BSWAP_OZ, we allow the implementation to leave high bits set, which will be ignored by the store. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/tcg-op.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 702da7afb7..5dbcd1b0cf 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2915,8 +2915,7 @@ void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCG= Arg idx, MemOp memop) swap =3D tcg_temp_new_i32(); switch (memop & MO_SIZE) { case MO_16: - tcg_gen_ext16u_i32(swap, val); - tcg_gen_bswap16_i32(swap, swap, TCG_BSWAP_IZ | TCG_BSWAP_OZ); + tcg_gen_bswap16_i32(swap, val, 0); break; case MO_32: tcg_gen_bswap32_i32(swap, val); @@ -3013,12 +3012,10 @@ void tcg_gen_qemu_st_i64(TCGv_i64 val, TCGv addr, T= CGArg idx, MemOp memop) swap =3D tcg_temp_new_i64(); switch (memop & MO_SIZE) { case MO_16: - tcg_gen_ext16u_i64(swap, val); - tcg_gen_bswap16_i64(swap, swap, TCG_BSWAP_IZ | TCG_BSWAP_OZ); + tcg_gen_bswap16_i64(swap, val, 0); break; case MO_32: - tcg_gen_ext32u_i64(swap, val); - tcg_gen_bswap32_i64(swap, swap, TCG_BSWAP_IZ | TCG_BSWAP_OZ); + tcg_gen_bswap32_i64(swap, val, 0); break; case MO_64: tcg_gen_bswap64_i64(swap, val); --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660967; cv=none; d=zohomail.com; s=zohoarc; b=ExQnihplqrZSxW/UQJf9085ML2DGfDSscw0DIKEHOe5v/OQubjaewIDVgZGlROi0nWIZ9KSE6XMaApMsIrwtdQ3mkpodh0/ycrz2yNTq8mw3o8lfTLhCgdnOJ5u9eif5A53SKfe/0T824PxYk7BghTFxjzbYUVakcYN3MRVlVB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660967; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u6MGt+Q30W0DPkO3zn0zAr3wVy2EgLq+Mej76ef0rEM=; b=iO6yYojP6mp/o6AtiDAKGmpmGAcFoyUYE5xcvAqwtOVF+AjLyu+PJXu9AYsW2Zn8YdUsXL2NiaR7ly9FK1FivenjY9ET3xRfdcDEhvKy94RZ7vol2kxjui5aICPBt2SCOgpKV/9sdFvrSVkqODJlLPMeb6YLwGmbFM04f2IqmkI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660967759578.3268658752559; Mon, 14 Jun 2021 01:56:07 -0700 (PDT) Received: from localhost ([::1]:60772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiO6-00028W-Kz for importer@patchew.org; Mon, 14 Jun 2021 04:56:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6y-0002XX-Oh for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:24 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:41780) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6o-0003ct-OQ for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:24 -0400 Received: by mail-pl1-x62c.google.com with SMTP id e1so6151794plh.8 for ; Mon, 14 Jun 2021 01:38:14 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:13 -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 :mime-version:content-transfer-encoding; bh=u6MGt+Q30W0DPkO3zn0zAr3wVy2EgLq+Mej76ef0rEM=; b=SzYiMDuWQ9M/iRz/zbb54S69iYKXEYw9D1aFyKYxn9Y6uvsSYiPsAbh6fW2DyeZEFY EK8K/+BdU+eroAIrRwqPnufs/320D5jX0IfkE4MOP3dL/Cn6Jfsc7a5dRTOSNl9V4qjg oOy+QF2TSG8HtCvu5flahGjGBh4oXMQkCFqpG9rLwdD9kJ6B6DH8qDXoxUC05bKewj64 04fiFpzeqK5zDD1FL8gHvF2fGMjpG0Tmsff3MVhw7drwAeOAUdB5qvFe1HAoPkJN8okt u8QCF9m87nbb3X2DY3oC5c7cOqCuNEQwvgN2q691CN8TK8YkVa95AD8+bIvMa+lLHHNP ulQQ== 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:mime-version:content-transfer-encoding; bh=u6MGt+Q30W0DPkO3zn0zAr3wVy2EgLq+Mej76ef0rEM=; b=TaCEBSUASvhh95Lz92D7dFre+XAta6IBEpG88y+pMyIO8jCvubqwOgnD9VsX7CJYLx 66irBnxrLiC34WIGRy7W6Dm28iuFg5pl5M9kY2gQwqKNLvmHzz1f+rQ2oxx5j0TDaODd Jn0SHrpmfrT1ziFJUO2HKIjfes/KeK+3smJOjXvjbKa5CAv3R1IdCkCjgf8wPr8LE3h+ Fu77ys0EvuQKwXqTN2WCtoZTVwy6qJEKi/QBqld8JmcIQt38TSCjQPbr+0SRpyTjfTHU ZqrwY6J0yymtK8y1aPqZnWHRW1DiVdmmVxUMZI3EDleJ/lnglemgwVLmAVD1shsc18Ov RM7A== X-Gm-Message-State: AOAM532H6v1KtaRBZPn7ltXhUrtcUN9erjUqPZSOP5YHDGqrOcwxa8fN oqI3nGNouAMZDsTmxqE7GbZRJjMGqOElMQ== X-Google-Smtp-Source: ABdhPJyBphYKRUlS67RlqZ7hRONFHhKcskarFe/vwjt58vrWpzJgjUwNzX9q4P0QRsUwW5c3ZBk4nA== X-Received: by 2002:a17:902:c20d:b029:110:483c:b965 with SMTP id 13-20020a170902c20db0290110483cb965mr15756500pll.77.1623659893429; Mon, 14 Jun 2021 01:38:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 20/28] target/arm: Improve REV32 Date: Mon, 14 Jun 2021 01:37:52 -0700 Message-Id: <20210614083800.1166166-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" For the sf version, we are performing two 32-bit bswaps in either half of the register. This is equivalent to performing one 64-bit bswap followed by a rotate. For the non-sf version, we can remove TCG_BSWAP_IZ and the preceding zero-extension. Cc: Peter Maydell Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/translate-a64.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index e0785ce859..ea9d2d4647 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -5430,22 +5430,13 @@ static void handle_rev32(DisasContext *s, unsigned = int sf, unsigned int rn, unsigned int rd) { TCGv_i64 tcg_rd =3D cpu_reg(s, rd); + TCGv_i64 tcg_rn =3D cpu_reg(s, rn); =20 if (sf) { - TCGv_i64 tcg_tmp =3D tcg_temp_new_i64(); - TCGv_i64 tcg_rn =3D read_cpu_reg(s, rn, sf); - - /* bswap32_i64 requires zero high word */ - tcg_gen_ext32u_i64(tcg_tmp, tcg_rn); - tcg_gen_bswap32_i64(tcg_rd, tcg_tmp, TCG_BSWAP_IZ | TCG_BSWAP_OZ); - tcg_gen_shri_i64(tcg_tmp, tcg_rn, 32); - tcg_gen_bswap32_i64(tcg_tmp, tcg_tmp, TCG_BSWAP_IZ | TCG_BSWAP_OZ); - tcg_gen_concat32_i64(tcg_rd, tcg_rd, tcg_tmp); - - tcg_temp_free_i64(tcg_tmp); + tcg_gen_bswap64_i64(tcg_rd, tcg_rn); + tcg_gen_rotri_i64(tcg_rd, tcg_rd, 32); } else { - tcg_gen_ext32u_i64(tcg_rd, cpu_reg(s, rn)); - tcg_gen_bswap32_i64(tcg_rd, tcg_rd, TCG_BSWAP_IZ | TCG_BSWAP_OZ); + tcg_gen_bswap32_i64(tcg_rd, tcg_rn, TCG_BSWAP_OZ); } } =20 --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623661504; cv=none; d=zohomail.com; s=zohoarc; b=SOcWj4yxxm4G73fiwWNhE3WdEZhH8E1PuK1Tcko7aLDYtxdhDXoOZVyR8btDaik26HuYM/yKFe3pffrTnKLpAjkKcZ9KLqZoilrwiDWKVDAMWX61Bpt/lTqKQ4D5xRwUVqmQlWSg3zSRAa4tax6ZE5JgPfJ0KpCl5jcYgqYSjRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623661504; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0M95dsVn9R89EVHrqMHORQgU6sVSBYjtS/DenInu1AA=; b=YQkJO59Ie/74N4d/Omy/0EO8ojpxYlkHBNLt7WffFMbaCUDhVoWFaKaz+EDiPZFGnW+tiYTosMNkh71qtmUpqqg/GCFkYIZu3nlEoigmnFJmY5Oja/TwtZirl9hpqE2D/ZjJwsVctDPXNXM+5f23esXtpzEyp2ZkMpzZpCW/Hlw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623661504293488.1062540369703; Mon, 14 Jun 2021 02:05:04 -0700 (PDT) Received: from localhost ([::1]:51040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiWl-0007El-6C for importer@patchew.org; Mon, 14 Jun 2021 05:05:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6y-0002XF-Ms for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:24 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:36355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6p-0003cx-Ai for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:24 -0400 Received: by mail-pj1-x102b.google.com with SMTP id s17-20020a17090a8811b029016e89654f93so4435554pjn.1 for ; Mon, 14 Jun 2021 01:38:14 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:13 -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 :mime-version:content-transfer-encoding; bh=0M95dsVn9R89EVHrqMHORQgU6sVSBYjtS/DenInu1AA=; b=ABFC97TeYrSNLzDWhf9F4JZITwr7a0xO9nEMFujV6cGxJB6iPvvjxUkGkuvWa8CbLT yfMOZgiA7S2DFBa3hBudDkja/CopWUBHN4nU0uPAXmyz384let5+XHj/Z+ZjKu7Fu9Ze 1pPi/s5+iaMeywiNSF3A3dWHsP/AoOtECu1S07Doug78bb/udN5B4TACjZceYhbURYYE h7inVr+LT2kz31YsWDetZM4WGnnMbbAPi0KHS+yhqzdBMrNq9wicprSjGOEMRxnZ6C8y ByXZ4DqJf7Hjhq2KJJH2EEiD6Alcqa2DoWVXF+brfo1w/kakuM7kxDKTEORyu75yYwVo 0Vdg== 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:mime-version:content-transfer-encoding; bh=0M95dsVn9R89EVHrqMHORQgU6sVSBYjtS/DenInu1AA=; b=CUb/lqI0pMDnC1T+w8vL9RLQBjJaWEVQkNI1ESrbWoi8hzYOSfMDgD0OqAKdCFJFSi ZpFDmCn4fqp/Ij5YMo6saw8VNj/MzhraTaJceSxTZCTYpVjVHQXo1CoJnATNaIWwY1Az fBq5sStA17onL6e83mdmAzKG2n0NqZ6Hd5XCoV97rcOXQpEeSsaFUnAeq/I8lewvjsLE iGPgMGadsK7d5UvyyQLg9D/s/8jRy7dmBqfYVviBtGqBf2WfoIRM6ZZm1Rn0l/zVH7Iu BAHDN8ikR9h169mEA2PoinJ+a1O7LvJW10iLXHJcP22BnlH2jofYiKsXLAoS2dh4oVfb hjVQ== X-Gm-Message-State: AOAM531bce/3JLkJ2PzTFnoEo7Phyt3vWWVEkRS7b0QwqF0lUOmXntI3 sEWMzerGsg4aPK2xA7TulpISqB55jIvl5A== X-Google-Smtp-Source: ABdhPJzFcc6pSE6q1T0GEEXpR568q1Wz1Ui5xl42HZVKpYAeG8OfhbeGsjBjwmbSydjpl43G7ysWbg== X-Received: by 2002:a17:90b:789:: with SMTP id l9mr21719415pjz.25.1623659894063; Mon, 14 Jun 2021 01:38:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 21/28] target/arm: Improve vector REV Date: Mon, 14 Jun 2021 01:37:53 -0700 Message-Id: <20210614083800.1166166-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.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: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" We can eliminate the requirement for a zero-extended output, because the following store will ignore any garbage high bits. Cc: Peter Maydell =20 Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/translate-a64.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index ea9d2d4647..e12387e19c 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -12427,12 +12427,10 @@ static void handle_rev(DisasContext *s, int opcod= e, bool u, read_vec_element(s, tcg_tmp, rn, i, grp_size); switch (grp_size) { case MO_16: - tcg_gen_bswap16_i64(tcg_tmp, tcg_tmp, - TCG_BSWAP_IZ | TCG_BSWAP_OZ); + tcg_gen_bswap16_i64(tcg_tmp, tcg_tmp, TCG_BSWAP_IZ); break; case MO_32: - tcg_gen_bswap32_i64(tcg_tmp, tcg_tmp, - TCG_BSWAP_IZ | TCG_BSWAP_OZ); + tcg_gen_bswap32_i64(tcg_tmp, tcg_tmp, TCG_BSWAP_IZ); break; case MO_64: tcg_gen_bswap64_i64(tcg_tmp, tcg_tmp); --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623661760; cv=none; d=zohomail.com; s=zohoarc; b=QnF4yAs8z0TKkC7mQ+fL/56oBqyacjtLcrT4zvKD/U9v7Q8DUXPhNMThuMcdL9A2rVphKQa5MdZn6e1vW4g9edl9LFQdubE/L0j9clA6MwuBA5u7K71yo9HyuBMCHNg5gwMlyE29SXuEPGglSJemrjvPGvBI8OztABXyWV8MM1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623661760; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9pPwNgd+FhwESG7b/TarUMGEShi9vbglIUO+o/J97nY=; b=jlqhJMOX3JQtwLf/kpUO0NhYmX4XwpwtV5C6m8aS7pw/kfbnkd4HEK5fJI22a9qkirKnWCXcGYp0Wke11VaT2sJJMmiwmT9s9HOEX70mp8RRnz5U4PHV3Ie8pXZQVq9kxg8ZlFqID10SGzcTvo2C1k2YTUy+wPMv5c5RoVsq00E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623661760754417.0362715655792; Mon, 14 Jun 2021 02:09:20 -0700 (PDT) Received: from localhost ([::1]:37454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiat-0000Mp-Kl for importer@patchew.org; Mon, 14 Jun 2021 05:09:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi70-0002er-Ox for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:26 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:54214) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6q-0003d3-Bm for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:26 -0400 Received: by mail-pj1-x1029.google.com with SMTP id ei4so9287141pjb.3 for ; Mon, 14 Jun 2021 01:38:15 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38: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 :mime-version:content-transfer-encoding; bh=9pPwNgd+FhwESG7b/TarUMGEShi9vbglIUO+o/J97nY=; b=RYWZ6pptEGzMOaI53mfq7NTrcI2qI7z98tlgRCTqsZj6IWA49N+OLKfPoIiwTGHV8E GZMor8a5jP83+2oS9hDlFN/uc/MrsBFjOOLxhFiEaCxohNMpVi/hsW6c3v9yw1dOohbo CIo2sYSBqb6EvF94qck+5VLX/nyiZSlxNM+XqqoMqkISeh5hPfAeYveZHSX1cEd5Saof gf0FCA4JHk4IHC1lhjucFDTfjjI5G7sj5vbc6iYRpyDwVdbDRy+oifZnVaWDlz4wdaK2 /kOiDcHQ4FsrVNV4g5hJr6iyamOrHLeK0IiVKhmUqjicqHHib0YFyteilLsTjgGS+6ql Wqjw== 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:mime-version:content-transfer-encoding; bh=9pPwNgd+FhwESG7b/TarUMGEShi9vbglIUO+o/J97nY=; b=ZYoRrg3lRpIBoCxCwxYKrq+UwZM013c4/M48sh7RSOfU0euFKxiv8LKLfUgF+nXpEk vbDW8bl8XGYtwGHdASVDxhL4kKPxhrYbVUyia/P1FXV18htaw6QIZz/IjQKTrSlqqzYr G3DETUYaRfwLWVe3ukzYRvpX5Pu42lqaK3Yzohx4xDOiEgTB/RHSQSNx2rzglhdMH0r4 DwJjA6KVa11ERM5akQRiGCZb8kgihLdoJSQKfp6KUoIm3+b2JZIe+ffTUydSq+0zmfkF a/7U59MPMcOpkVwEuUNxAh/A7GAE+zAppFLqBhhcb0GmYAank35k3TAQLaRlTJLUsgF+ 4XZg== X-Gm-Message-State: AOAM530AsUw1DmlNEB+DESWsFXv/8LzfZldhZjv6TuBBTKTGM+a4GpJU /4gV7nAlDzBc1ynxVO6z1H3U71hGDHtZIg== X-Google-Smtp-Source: ABdhPJxnFx8xmkv3rSLFHPuEXsWG/TfG+IeaUyCWFtAegoIUj0ToEYKzANR2dLdTbvRmz/t5NWR+jQ== X-Received: by 2002:a17:902:ceca:b029:112:b67b:fe4f with SMTP id d10-20020a170902cecab0290112b67bfe4fmr15773235plg.32.1623659894674; Mon, 14 Jun 2021 01:38:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 22/28] target/arm: Improve REVSH Date: Mon, 14 Jun 2021 01:37:54 -0700 Message-Id: <20210614083800.1166166-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.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: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The new bswap flags can implement the semantics exactly. Cc: Peter Maydell =20 Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/translate.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index 6b88163e3a..46d95d75ae 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -341,9 +341,7 @@ void gen_rev16(TCGv_i32 dest, TCGv_i32 var) /* Byteswap low halfword and sign extend. */ static void gen_revsh(TCGv_i32 dest, TCGv_i32 var) { - tcg_gen_ext16u_i32(var, var); - tcg_gen_bswap16_i32(var, var, TCG_BSWAP_IZ | TCG_BSWAP_OZ); - tcg_gen_ext16s_i32(dest, var); + tcg_gen_bswap16_i32(var, var, TCG_BSWAP_OS); } =20 /* Dual 16-bit add. Result placed in t0 and t1 is marked as dead. --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660443; cv=none; d=zohomail.com; s=zohoarc; b=bLX1Yw3pm15o40TrdgqCCYkJ6ExMW8yIE9qFw4qmWbjW7+GIMLrm7Rq4Q36hTIeI16uoiB9ZstyUdjzZXzOmKwvy2sgyoXoNqLUSxhwBkHcn19E0bZjftxDB7IQ9KqtttbKMB1BNvSv9zpGDlV4VVn00opyLKTVoZ2rZT+tqnu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660443; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/cj6AHfD4MCylW24pA885ZQ85JIZz19VyVMXS+bbqyw=; b=H5fh7DCRCWaoK0Z3o9JFpgOdlKeBaoZBJ6wE/RzJAUA7su/CK7uq/X7KiPdwJrOVmMWbMPGx/snW1onU6NyrQf++mXuiki5tZFANrZx8vKL29buQj3+Ac3wSLJaEI66g21D42uYxbZMhWwKMLciAcuNvuXEIFjKIYX+2HNHNarE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660443481869.5979275204501; Mon, 14 Jun 2021 01:47:23 -0700 (PDT) Received: from localhost ([::1]:37342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiFe-0003PT-9l for importer@patchew.org; Mon, 14 Jun 2021 04:47:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6y-0002YD-Uz for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:24 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:44629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6r-0003dA-84 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:24 -0400 Received: by mail-pf1-x435.google.com with SMTP id u18so9998054pfk.11 for ; Mon, 14 Jun 2021 01:38:16 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:15 -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 :mime-version:content-transfer-encoding; bh=/cj6AHfD4MCylW24pA885ZQ85JIZz19VyVMXS+bbqyw=; b=YTEBO+1AN83WnP1zP1vnjRN61xfVa6buJ6Rg0vRzWKGZ5swwkuw4NahIyD+AES8j2u 5okQJjbYcG6IfxMtN5vxu/yBWtQe4u09lFHjkRLJOnPtwm/no4/4DQZjCkr8NZCBaTnB IGcLPMsZmyXtgyf5XZk9WRDJmwLj8HSZnWwflS5G27ncYbXYt+nsg0KIY3twE6f1MyVg evNgr8BOy2TiSncAP2BuWqnAJ6OJg7kBwd9wDC+Eg0h6syqEP6bPa6ZfM+OTIQl4MfXE t0CNs7OMMl9uycPOol3WFxHkeG3WwYzns+7xBQEEcKnKDUoQzN9ZjqJqlbMvxainykro vnPw== 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:mime-version:content-transfer-encoding; bh=/cj6AHfD4MCylW24pA885ZQ85JIZz19VyVMXS+bbqyw=; b=dUAbg2V2VLi3h/uok5fVyi1RPFNmKHraORK/sHo7JBCMZtx7m4gwWnrM7z8x2ltXG6 d+KWj/8mGuyOASCpa295KOsz7wXWhFsOWr4KnqNGhwfrFdVd5zKUv3Y/NWE2HibhQWbL RrmZGWew5rd824bVU+L1w8d2xmtj9MLg2OWh32R3W2udZbyM9DW1FwC7ilYi9BfvuZmP NAn6SENRZ7k+uQWBHuvwZ99HNdrvbQ4iWU3RsfWEbAqRP0J8UEz1jmSPDhh96Oypttee QJt3glOXDtWfvTEpdY4BCALEuJDD4Im67fIfBv4f5u0/vgF9JyMaK0vzRWuh9HB8oH3k tNrw== X-Gm-Message-State: AOAM5300w9q5lqOx3T8FC1sTjW13FEj8HIc0YJGFy1ML/ajgV8EpRKYt Wr8bR3wuoFIMfbaGK3WnDcKsq/xM1LZxWA== X-Google-Smtp-Source: ABdhPJyoXJgMpeXGCglYBMADxJKmQARt9uTERhc73qjmq5EF2Jx2ZcoWWsRxfVmGYf8/Er08At8pHw== X-Received: by 2002:a63:5645:: with SMTP id g5mr16064027pgm.442.1623659895300; Mon, 14 Jun 2021 01:38:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 23/28] target/i386: Improve bswap translation Date: Mon, 14 Jun 2021 01:37:55 -0700 Message-Id: <20210614083800.1166166-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.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: , Cc: Paolo Bonzini , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Use a break instead of an ifdefed else. There's no need to move the values through s->T0. Remove TCG_BSWAP_IZ and the preceding zero-extension. Cc: Paolo Bonzini Cc: Eduardo Habkost Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/i386/tcg/translate.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index e8a9dcd21a..b21873ed23 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -7195,17 +7195,11 @@ static target_ulong disas_insn(DisasContext *s, CPU= State *cpu) reg =3D (b & 7) | REX_B(s); #ifdef TARGET_X86_64 if (dflag =3D=3D MO_64) { - gen_op_mov_v_reg(s, MO_64, s->T0, reg); - tcg_gen_bswap64_i64(s->T0, s->T0); - gen_op_mov_reg_v(s, MO_64, reg, s->T0); - } else -#endif - { - gen_op_mov_v_reg(s, MO_32, s->T0, reg); - tcg_gen_ext32u_tl(s->T0, s->T0); - tcg_gen_bswap32_tl(s->T0, s->T0, TCG_BSWAP_IZ | TCG_BSWAP_OZ); - gen_op_mov_reg_v(s, MO_32, reg, s->T0); + tcg_gen_bswap64_i64(cpu_regs[reg], cpu_regs[reg]); + break; } +#endif + tcg_gen_bswap32_tl(cpu_regs[reg], cpu_regs[reg], TCG_BSWAP_OZ); break; case 0xd6: /* salc */ if (CODE64(s)) --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660805; cv=none; d=zohomail.com; s=zohoarc; b=f4I3/KpzRH1GeTLuA/m1h8bSAnjvl4fWAkwCf433LrUdiUmPVMhaB4G+LPwGh2Yq3MkgK5Nh5fyf0YR2mmPK5wyLdApXm/sfLt6Ghmd1YjvdHxm7l8uJpCJRu3ZMZFs5ANFL7F1Ui/Jd+HZkz9Wj4nGafyCCp91S1n6vP4XSbII= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660805; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T7BJEd3GAshXT7gnjM3Wy8Serp0Ny2cG7uiwPGDYDAQ=; b=BOPZ4f/YGWL2qmuhZdvkzxZW4C6M1LP0aCd3JApXUDm5Sa5yPP4ZvIrCLnTK0ie5vfnTcdMOwMpMsU2zAWSpFby+rL9kLGystot1IxzzhuTWMacqOz2nVnxKcncbRYK3YdCb2lyX9LOzdDBtG7gwc7sdWKNe5+Q+gfyEc6zS7nc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162366080579155.07131715506421; Mon, 14 Jun 2021 01:53:25 -0700 (PDT) Received: from localhost ([::1]:54560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiLU-0006Sr-Lh for importer@patchew.org; Mon, 14 Jun 2021 04:53:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi6z-0002bx-UE for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:25 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:35335) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6r-0003dF-8c for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:25 -0400 Received: by mail-pl1-x62f.google.com with SMTP id x19so6162041pln.2 for ; Mon, 14 Jun 2021 01:38:16 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:15 -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 :mime-version:content-transfer-encoding; bh=T7BJEd3GAshXT7gnjM3Wy8Serp0Ny2cG7uiwPGDYDAQ=; b=gDQUzFhVCqTkO67z878SfPpWgFohfEH9yt9rHm+bXIE07OT3Fb/LhDdlPOxx4z3eqA GiXtLUYK3r6/bDpzchEHVJ+OY+SMXfw9P5Xh0nrnpvq8uMLnz1ZKC1lTl9PCPVDSu+HA 2HU2gY+Yt9cGIo38L/ECxS8UYFQLQD9sdkCdyaWRJbLs+gMLvOyugMQ6ISNg2yIshXVd Tgmg2vOfe1TibzvH6NnN9VxI2BuH7lrCu057TAww3Qpeu8/hnJ4FtiL4s3LYFRAHAEMQ UuOlkUPRiYBYJA8zbJUrxTAIV+QvezUA0R6OZJJfW1us9+JMFj9ZA4CtViqP11DK3MeI oBaA== 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:mime-version:content-transfer-encoding; bh=T7BJEd3GAshXT7gnjM3Wy8Serp0Ny2cG7uiwPGDYDAQ=; b=a82UxxKOkR+vvRG9f229uMz2U/+B747FK5svqO1OcEqRIFKU/XKzXvgHR8P6iPDxbS ZEw2iKNAKMLFDJgHBJAQ00HZOsv6vnvbotMlp/U3YrVXKd60lbulusd/nTQGs3/SpjMo vTYJOao/XDsTDMrd7rAsek6g8uInvRj2RQSPoyOsHF+tRi3ochhOOG2KteIjFuEp+fzC FyFxIIDezP8Xc2eAhbFO/bzrrLV2xAUoaMwu7AQdE/e1n9TOuhLwj5lecgaAawuXfOuE mK3DpsTEIxs7CIvH7JsU//lwuFIXOy/9CVoQDhKDsxCFhjfItSxTKbGlLZlU1yIdS3n9 8yNA== X-Gm-Message-State: AOAM532WFOPuH/TULZKuvNwUI8/bxOdgeVDFpdWBfO0cM57b82kjP1id 9bJcc50RR8kxAlS9H9a4Nu3IX1YGszgoVg== X-Google-Smtp-Source: ABdhPJxfMF+Pt4iSCaOLHl3S8wzYXx/RUsOFp93r9argEM9zZBfUdoEdzujb8CE5Z34XGkdJrAHqIw== X-Received: by 2002:a17:90a:e654:: with SMTP id ep20mr17611003pjb.168.1623659895736; Mon, 14 Jun 2021 01:38:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 24/28] target/sh4: Improve swap.b translation Date: Mon, 14 Jun 2021 01:37:56 -0700 Message-Id: <20210614083800.1166166-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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: , Cc: Yoshinori Sato Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Remove TCG_BSWAP_IZ and the preceding zero-extension. Cc: Yoshinori Sato Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/sh4/translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 147219759b..f45515952f 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -676,8 +676,7 @@ static void _decode_opc(DisasContext * ctx) case 0x6008: /* swap.b Rm,Rn */ { TCGv low =3D tcg_temp_new(); - tcg_gen_ext16u_i32(low, REG(B7_4)); - tcg_gen_bswap16_i32(low, low, TCG_BSWAP_IZ | TCG_BSWAP_OZ); + tcg_gen_bswap16_i32(low, REG(B7_4), 0); tcg_gen_deposit_i32(REG(B11_8), REG(B7_4), low, 0, 16); tcg_temp_free(low); } --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623661649751256.7811499042904; Mon, 14 Jun 2021 02:07:29 -0700 (PDT) Received: from localhost ([::1]:58058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiZ6-0003gI-DS for importer@patchew.org; Mon, 14 Jun 2021 05:07:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi70-0002cv-5C for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:26 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:38637) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6s-0003dO-Bv for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:25 -0400 Received: by mail-pf1-x42d.google.com with SMTP id z26so10014636pfj.5 for ; Mon, 14 Jun 2021 01:38:17 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:16 -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 :mime-version:content-transfer-encoding; bh=TjMHnJXoUnjhGFE1iA2UhvGhUmi66dGkfV7HJSIAp70=; b=yuFyrMFqG83oKNU44BBMjHzz5MtkKdKVejfaZK+VAYise1c7PiWJnImMwp3Irjui+u gtkUHvAdAws0hbUmoV1zUcyhDrPszZJ2N4gk8WOKPY3luw+Evjq7JvRZ3d6zl9ceR0LU DevtJu2nTKlYDz+2WITyv63dYvg+Ucsaw/inuO8VRwrBPDPBoJ58pm+unGX4qwNzBxL/ vROOrDjRVO4XjDl5JO5pJevb6Q5oqTnOC2JlqWY4WEqD3SJv9aXUb7+Ukr6zLXkSyiU/ fSzEqC6h+ePm5TmjPnHBPh3m6o6eRYBjl0uG68HXYPOm/PB9K1XvaWIvnlMXEVc0bTQT B+7Q== 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:mime-version:content-transfer-encoding; bh=TjMHnJXoUnjhGFE1iA2UhvGhUmi66dGkfV7HJSIAp70=; b=f4Ct/UYE8INlRduItMZFk8ByfImmKDI0bxOS7s8QfqtW1qBR6deDzWdKa6Abq42QDA 5c2nadHYVFhoVE6jJ2MPpszzCn4RFan9EzzwbgVCJf93zGtYJ8h0Z8OfOoswsiRUL2eW PaWVzYJO9zxRDNcsj8FQ4BocQmhJOfbGyykGkmx9vww2wJRcl0+RBLRaAeIbL2pKZ6DE G35atjfeBxAajfYacmNK1CWf65WXffAEmAPHfeBHbE/E/G9pum9ArtsraRsOu4+2pqgB Lj6/eBrEtDBJeDNVNM/dJ6aknU3ULmjgu4QIgNnn8ElwAk0LOLkBQBd6eVlyVyScyrkN gZlg== X-Gm-Message-State: AOAM532HiLBEbN75HIZv2097S/wB2pGpgznZUOwVPhcFGO5OppMUUoHZ 9CE0virAbRr7e8m+wTvc90krVbZHVFdQvw== X-Google-Smtp-Source: ABdhPJz5clVas3VnbwAuC1bcnjOF2eSKi5n05XPyY+FMo11Duxt7b5xSuPrQH1s+EsyfPv7fTKG45w== X-Received: by 2002:a63:6284:: with SMTP id w126mr16056140pgb.284.1623659896329; Mon, 14 Jun 2021 01:38:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 25/28] target/mips: Fix gen_mxu_s32ldd_s32lddr Date: Mon, 14 Jun 2021 01:37:57 -0700 Message-Id: <20210614083800.1166166-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There were two bugs here: (1) the required endianness was not present in the MemOp, and (2) we were not providing a zero-extended input to the bswap as semantics required. The best fix is to fold the bswap into the memory operation, producing the desired result directly. Cc: Philippe Mathieu-Daud=C3=A9 Cc: Jiaxun Yang Signed-off-by: Richard Henderson Acked-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/tcg/mxu_translate.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/target/mips/tcg/mxu_translate.c b/target/mips/tcg/mxu_translat= e.c index c12cf78df7..f4356432c7 100644 --- a/target/mips/tcg/mxu_translate.c +++ b/target/mips/tcg/mxu_translate.c @@ -857,12 +857,8 @@ static void gen_mxu_s32ldd_s32lddr(DisasContext *ctx) tcg_gen_ori_tl(t1, t1, 0xFFFFF000); } tcg_gen_add_tl(t1, t0, t1); - tcg_gen_qemu_ld_tl(t1, t1, ctx->mem_idx, MO_SL); + tcg_gen_qemu_ld_tl(t1, t1, ctx->mem_idx, MO_TESL ^ (sel * MO_BSWAP)); =20 - if (sel =3D=3D 1) { - /* S32LDDR */ - tcg_gen_bswap32_tl(t1, t1, TCG_BSWAP_IZ | TCG_BSWAP_OZ); - } gen_store_mxu_gpr(t1, XRa); =20 tcg_temp_free(t0); --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623661039; cv=none; d=zohomail.com; s=zohoarc; b=fGOZjParzx1p1v8HsfLDYriPWR7yIIg9GMWgtJvAhTJyCK6cf69G82X9kKFbkoRBfk9xYVYskv9LQI2Ca8CreVgpO66nybXgRYrKrCeOdyGits42cxS31SoLCxI1xtf60HKrAk2eJIEpRFGwP00SG/+KeUPTZIWHkSoDuCjHauY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623661039; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7/2JikIbqrctKsBzlUf7eFp9owHQMZjeoHnQlm4T8zE=; b=no9elFYt9qMtKFlX4Pmlr17RMroV+hc4A+ozwVCHhNnJwP/SeOJ9h5jFGA50Hsl1DH/PhzNECA2+h3lS7d9MUkU3jM7zr8+pg0aZCp08rOWxNLDaMobbEqrWPL4FCb1KiZlwXteKpY6pWkMSj9iU9N+o8vhx5BjK+dOBof/QqbI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623661039435737.0228735191928; Mon, 14 Jun 2021 01:57:19 -0700 (PDT) Received: from localhost ([::1]:36466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiPG-0004mu-Cf for importer@patchew.org; Mon, 14 Jun 2021 04:57:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi74-0002qZ-LP for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:30 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:37586) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6s-0003e3-CA for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:30 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 22-20020a17090a0c16b0290164a5354ad0so9605451pjs.2 for ; Mon, 14 Jun 2021 01:38:17 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:16 -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=7/2JikIbqrctKsBzlUf7eFp9owHQMZjeoHnQlm4T8zE=; b=TElHqeJr4n1Mh3ddq+vc/zfAX6nCi/4KTXWpxPinlr3JIgldVwB3Z8+kSGVFgs7Ho7 ZGUTiIAy/gWUf3MjRmCR6mudRfTuPppmvhO8iC46v5oxBKRqTPhqc5ynXEOGf+AOfzWd UZfhOhYDgbRow+ahGrfZ9fK2YsNAq5QUs6icW7a6HQ6m7hWWGE4Tw6/Ow9lfQN+F+Dlj 8snZzETrGPBLGzE2XjyNl3/4UCesrq2Ot+vL2xZUTcWPw59Mfk0acr2ZvarWO0clOzdG ZFoUzWBeH1qAjZAluCinyurQks9a9SS8fNhoy4J3DJCYGoVxz0h1swmKLwTMUbhIDPp/ HjWw== 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=7/2JikIbqrctKsBzlUf7eFp9owHQMZjeoHnQlm4T8zE=; b=LcxMjIRXjG4AA4QsTG3d51i/m5/O5cp8hs5i31Z7MjzPWixYzhmQ/hVG5Z76fVYyWn wmmrXzgivlc2iyy5ek9pqtVgFUqE+KBgjzPcMAkrG1juBn4KilsFgjr0i8tu6yz5O5tE a2/kBbeJcjvpSJmcbPwQPqa2wNU4NGOQeWprjHxFNGmdg8Q5sM8NjtvbXwTp8fsglUXF kw+/QZTtnW305pswItUthTgb3gdH/iqwu9ZFfLkYrYE4cSV1hvhvi0rByPjanER9ZcqP svKg5OBgkavSX5SPxn3nNEeBBCtdwpW/kjRKI9kl/tXI5hzkU1w2hEmUsYP1eBPe8isc uWRw== X-Gm-Message-State: AOAM533qGW/F+TdJGmiW6leg4xqBVpv6+KeBbQQaLS6+pAINvH2l2LlC 9Kh6AgYID7kC+3DFbG/sL2Zzp9Hdc4LxQg== X-Google-Smtp-Source: ABdhPJy6M6GRPcTWi/Bq5D18cCO07Lmz4gyac2gjCcuBlqiwAFCkXgtk789Z4rkHMEyW8q1WgZ3KGg== X-Received: by 2002:a17:90a:7bc3:: with SMTP id d3mr12105068pjl.212.1623659896932; Mon, 14 Jun 2021 01:38:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 26/28] tcg/arm: Unset TCG_TARGET_HAS_MEMORY_BSWAP Date: Mon, 14 Jun 2021 01:37:58 -0700 Message-Id: <20210614083800.1166166-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102f.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Now that the middle-end can replicate the same tricks as tcg/arm used for optimizing bswap for signed loads and for stores, do not pretend to have these memory ops in the backend. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/arm/tcg-target.h | 2 +- tcg/arm/tcg-target.c.inc | 214 ++++++++++++++------------------------- 2 files changed, 77 insertions(+), 139 deletions(-) diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h index 57fd0c0c74..95fcef33bc 100644 --- a/tcg/arm/tcg-target.h +++ b/tcg/arm/tcg-target.h @@ -174,7 +174,7 @@ extern bool use_neon_instructions; #define TCG_TARGET_HAS_cmpsel_vec 0 =20 #define TCG_TARGET_DEFAULT_MO (0) -#define TCG_TARGET_HAS_MEMORY_BSWAP 1 +#define TCG_TARGET_HAS_MEMORY_BSWAP 0 =20 /* not defined -- call should be eliminated at compile time */ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index 9824e215be..35753c9e46 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -1366,34 +1366,38 @@ static void tcg_out_vldst(TCGContext *s, ARMInsn in= sn, /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * int mmu_idx, uintptr_t ra) */ -static void * const qemu_ld_helpers[16] =3D { +static void * const qemu_ld_helpers[8] =3D { [MO_UB] =3D helper_ret_ldub_mmu, [MO_SB] =3D helper_ret_ldsb_mmu, - - [MO_LEUW] =3D helper_le_lduw_mmu, - [MO_LEUL] =3D helper_le_ldul_mmu, - [MO_LEQ] =3D helper_le_ldq_mmu, - [MO_LESW] =3D helper_le_ldsw_mmu, - [MO_LESL] =3D helper_le_ldul_mmu, - - [MO_BEUW] =3D helper_be_lduw_mmu, - [MO_BEUL] =3D helper_be_ldul_mmu, - [MO_BEQ] =3D helper_be_ldq_mmu, - [MO_BESW] =3D helper_be_ldsw_mmu, - [MO_BESL] =3D helper_be_ldul_mmu, +#ifdef HOST_WORDS_BIGENDIAN + [MO_UW] =3D helper_be_lduw_mmu, + [MO_UL] =3D helper_be_ldul_mmu, + [MO_Q] =3D helper_be_ldq_mmu, + [MO_SW] =3D helper_be_ldsw_mmu, + [MO_SL] =3D helper_be_ldul_mmu, +#else + [MO_UW] =3D helper_le_lduw_mmu, + [MO_UL] =3D helper_le_ldul_mmu, + [MO_Q] =3D helper_le_ldq_mmu, + [MO_SW] =3D helper_le_ldsw_mmu, + [MO_SL] =3D helper_le_ldul_mmu, +#endif }; =20 /* helper signature: helper_ret_st_mmu(CPUState *env, target_ulong addr, * uintxx_t val, int mmu_idx, uintptr_= t ra) */ -static void * const qemu_st_helpers[16] =3D { - [MO_UB] =3D helper_ret_stb_mmu, - [MO_LEUW] =3D helper_le_stw_mmu, - [MO_LEUL] =3D helper_le_stl_mmu, - [MO_LEQ] =3D helper_le_stq_mmu, - [MO_BEUW] =3D helper_be_stw_mmu, - [MO_BEUL] =3D helper_be_stl_mmu, - [MO_BEQ] =3D helper_be_stq_mmu, +static void * const qemu_st_helpers[4] =3D { + [MO_8] =3D helper_ret_stb_mmu, +#ifdef HOST_WORDS_BIGENDIAN + [MO_16] =3D helper_be_stw_mmu, + [MO_32] =3D helper_be_stl_mmu, + [MO_64] =3D helper_be_stq_mmu, +#else + [MO_16] =3D helper_le_stw_mmu, + [MO_32] =3D helper_le_stl_mmu, + [MO_64] =3D helper_le_stq_mmu, +#endif }; =20 /* Helper routines for marshalling helper function arguments into @@ -1598,9 +1602,9 @@ static bool tcg_out_qemu_ld_slow_path(TCGContext *s, = TCGLabelQemuLdst *lb) icache usage. For pre-armv6, use the signed helpers since we do not have a single insn sign-extend. */ if (use_armv6_instructions) { - func =3D qemu_ld_helpers[opc & (MO_BSWAP | MO_SIZE)]; + func =3D qemu_ld_helpers[opc & MO_SIZE]; } else { - func =3D qemu_ld_helpers[opc & (MO_BSWAP | MO_SSIZE)]; + func =3D qemu_ld_helpers[opc & MO_SSIZE]; if (opc & MO_SIGN) { opc =3D MO_UL; } @@ -1678,7 +1682,7 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, = TCGLabelQemuLdst *lb) argreg =3D tcg_out_arg_reg32(s, argreg, TCG_REG_R14); =20 /* Tail-call to the helper, which will return to the fast path. */ - tcg_out_goto(s, COND_AL, qemu_st_helpers[opc & (MO_BSWAP | MO_SIZE)]); + tcg_out_goto(s, COND_AL, qemu_st_helpers[opc & MO_SIZE]); return true; } #endif /* SOFTMMU */ @@ -1687,7 +1691,8 @@ static inline void tcg_out_qemu_ld_index(TCGContext *= s, MemOp opc, TCGReg datalo, TCGReg datahi, TCGReg addrlo, TCGReg addend) { - MemOp bswap =3D opc & MO_BSWAP; + /* Byte swapping is left to middle-end expansion. */ + tcg_debug_assert((opc & MO_BSWAP) =3D=3D 0); =20 switch (opc & MO_SSIZE) { case MO_UB: @@ -1698,51 +1703,30 @@ static inline void tcg_out_qemu_ld_index(TCGContext= *s, MemOp opc, break; case MO_UW: tcg_out_ld16u_r(s, COND_AL, datalo, addrlo, addend); - if (bswap) { - tcg_out_bswap16(s, COND_AL, datalo, datalo, - TCG_BSWAP_IZ | TCG_BSWAP_OZ); - } break; case MO_SW: - if (bswap) { - tcg_out_ld16u_r(s, COND_AL, datalo, addrlo, addend); - tcg_out_bswap16(s, COND_AL, datalo, datalo, - TCG_BSWAP_IZ | TCG_BSWAP_OS); - } else { - tcg_out_ld16s_r(s, COND_AL, datalo, addrlo, addend); - } + tcg_out_ld16s_r(s, COND_AL, datalo, addrlo, addend); break; case MO_UL: - default: tcg_out_ld32_r(s, COND_AL, datalo, addrlo, addend); - if (bswap) { - tcg_out_bswap32(s, COND_AL, datalo, datalo); - } break; case MO_Q: - { - TCGReg dl =3D (bswap ? datahi : datalo); - TCGReg dh =3D (bswap ? datalo : datahi); - - /* Avoid ldrd for user-only emulation, to handle unaligned. */ - if (USING_SOFTMMU && use_armv6_instructions - && (dl & 1) =3D=3D 0 && dh =3D=3D dl + 1) { - tcg_out_ldrd_r(s, COND_AL, dl, addrlo, addend); - } else if (dl !=3D addend) { - tcg_out_ld32_rwb(s, COND_AL, dl, addend, addrlo); - tcg_out_ld32_12(s, COND_AL, dh, addend, 4); - } else { - tcg_out_dat_reg(s, COND_AL, ARITH_ADD, TCG_REG_TMP, - addend, addrlo, SHIFT_IMM_LSL(0)); - tcg_out_ld32_12(s, COND_AL, dl, TCG_REG_TMP, 0); - tcg_out_ld32_12(s, COND_AL, dh, TCG_REG_TMP, 4); - } - if (bswap) { - tcg_out_bswap32(s, COND_AL, dl, dl); - tcg_out_bswap32(s, COND_AL, dh, dh); - } + /* Avoid ldrd for user-only emulation, to handle unaligned. */ + if (USING_SOFTMMU && use_armv6_instructions + && (datalo & 1) =3D=3D 0 && datahi =3D=3D datalo + 1) { + tcg_out_ldrd_r(s, COND_AL, datalo, addrlo, addend); + } else if (datalo !=3D addend) { + tcg_out_ld32_rwb(s, COND_AL, datalo, addend, addrlo); + tcg_out_ld32_12(s, COND_AL, datahi, addend, 4); + } else { + tcg_out_dat_reg(s, COND_AL, ARITH_ADD, TCG_REG_TMP, + addend, addrlo, SHIFT_IMM_LSL(0)); + tcg_out_ld32_12(s, COND_AL, datalo, TCG_REG_TMP, 0); + tcg_out_ld32_12(s, COND_AL, datahi, TCG_REG_TMP, 4); } break; + default: + g_assert_not_reached(); } } =20 @@ -1750,7 +1734,8 @@ static inline void tcg_out_qemu_ld_direct(TCGContext = *s, MemOp opc, TCGReg datalo, TCGReg datahi, TCGReg addrlo) { - MemOp bswap =3D opc & MO_BSWAP; + /* Byte swapping is left to middle-end expansion. */ + tcg_debug_assert((opc & MO_BSWAP) =3D=3D 0); =20 switch (opc & MO_SSIZE) { case MO_UB: @@ -1761,49 +1746,28 @@ static inline void tcg_out_qemu_ld_direct(TCGContex= t *s, MemOp opc, break; case MO_UW: tcg_out_ld16u_8(s, COND_AL, datalo, addrlo, 0); - if (bswap) { - tcg_out_bswap16(s, COND_AL, datalo, datalo, - TCG_BSWAP_IZ | TCG_BSWAP_OZ); - } break; case MO_SW: - if (bswap) { - tcg_out_ld16u_8(s, COND_AL, datalo, addrlo, 0); - tcg_out_bswap16(s, COND_AL, datalo, datalo, - TCG_BSWAP_IZ | TCG_BSWAP_OS); - } else { - tcg_out_ld16s_8(s, COND_AL, datalo, addrlo, 0); - } + tcg_out_ld16s_8(s, COND_AL, datalo, addrlo, 0); break; case MO_UL: - default: tcg_out_ld32_12(s, COND_AL, datalo, addrlo, 0); - if (bswap) { - tcg_out_bswap32(s, COND_AL, datalo, datalo); - } break; case MO_Q: - { - TCGReg dl =3D (bswap ? datahi : datalo); - TCGReg dh =3D (bswap ? datalo : datahi); - - /* Avoid ldrd for user-only emulation, to handle unaligned. */ - if (USING_SOFTMMU && use_armv6_instructions - && (dl & 1) =3D=3D 0 && dh =3D=3D dl + 1) { - tcg_out_ldrd_8(s, COND_AL, dl, addrlo, 0); - } else if (dl =3D=3D addrlo) { - tcg_out_ld32_12(s, COND_AL, dh, addrlo, bswap ? 0 : 4); - tcg_out_ld32_12(s, COND_AL, dl, addrlo, bswap ? 4 : 0); - } else { - tcg_out_ld32_12(s, COND_AL, dl, addrlo, bswap ? 4 : 0); - tcg_out_ld32_12(s, COND_AL, dh, addrlo, bswap ? 0 : 4); - } - if (bswap) { - tcg_out_bswap32(s, COND_AL, dl, dl); - tcg_out_bswap32(s, COND_AL, dh, dh); - } + /* Avoid ldrd for user-only emulation, to handle unaligned. */ + if (USING_SOFTMMU && use_armv6_instructions + && (datalo & 1) =3D=3D 0 && datahi =3D=3D datalo + 1) { + tcg_out_ldrd_8(s, COND_AL, datalo, addrlo, 0); + } else if (datalo =3D=3D addrlo) { + tcg_out_ld32_12(s, COND_AL, datahi, addrlo, 4); + tcg_out_ld32_12(s, COND_AL, datalo, addrlo, 0); + } else { + tcg_out_ld32_12(s, COND_AL, datalo, addrlo, 0); + tcg_out_ld32_12(s, COND_AL, datahi, addrlo, 4); } break; + default: + g_assert_not_reached(); } } =20 @@ -1852,44 +1816,31 @@ static inline void tcg_out_qemu_st_index(TCGContext= *s, int cond, MemOp opc, TCGReg datalo, TCGReg datahi, TCGReg addrlo, TCGReg addend) { - MemOp bswap =3D opc & MO_BSWAP; + /* Byte swapping is left to middle-end expansion. */ + tcg_debug_assert((opc & MO_BSWAP) =3D=3D 0); =20 switch (opc & MO_SIZE) { case MO_8: tcg_out_st8_r(s, cond, datalo, addrlo, addend); break; case MO_16: - if (bswap) { - tcg_out_bswap16(s, cond, TCG_REG_R0, datalo, 0); - tcg_out_st16_r(s, cond, TCG_REG_R0, addrlo, addend); - } else { - tcg_out_st16_r(s, cond, datalo, addrlo, addend); - } + tcg_out_st16_r(s, cond, datalo, addrlo, addend); break; case MO_32: - default: - if (bswap) { - tcg_out_bswap32(s, cond, TCG_REG_R0, datalo); - tcg_out_st32_r(s, cond, TCG_REG_R0, addrlo, addend); - } else { - tcg_out_st32_r(s, cond, datalo, addrlo, addend); - } + tcg_out_st32_r(s, cond, datalo, addrlo, addend); break; case MO_64: /* Avoid strd for user-only emulation, to handle unaligned. */ - if (bswap) { - tcg_out_bswap32(s, cond, TCG_REG_R0, datahi); - tcg_out_st32_rwb(s, cond, TCG_REG_R0, addend, addrlo); - tcg_out_bswap32(s, cond, TCG_REG_R0, datalo); - tcg_out_st32_12(s, cond, TCG_REG_R0, addend, 4); - } else if (USING_SOFTMMU && use_armv6_instructions - && (datalo & 1) =3D=3D 0 && datahi =3D=3D datalo + 1) { + if (USING_SOFTMMU && use_armv6_instructions + && (datalo & 1) =3D=3D 0 && datahi =3D=3D datalo + 1) { tcg_out_strd_r(s, cond, datalo, addrlo, addend); } else { tcg_out_st32_rwb(s, cond, datalo, addend, addrlo); tcg_out_st32_12(s, cond, datahi, addend, 4); } break; + default: + g_assert_not_reached(); } } =20 @@ -1897,44 +1848,31 @@ static inline void tcg_out_qemu_st_direct(TCGContex= t *s, MemOp opc, TCGReg datalo, TCGReg datahi, TCGReg addrlo) { - MemOp bswap =3D opc & MO_BSWAP; + /* Byte swapping is left to middle-end expansion. */ + tcg_debug_assert((opc & MO_BSWAP) =3D=3D 0); =20 switch (opc & MO_SIZE) { case MO_8: tcg_out_st8_12(s, COND_AL, datalo, addrlo, 0); break; case MO_16: - if (bswap) { - tcg_out_bswap16(s, COND_AL, TCG_REG_R0, datalo, 0); - tcg_out_st16_8(s, COND_AL, TCG_REG_R0, addrlo, 0); - } else { - tcg_out_st16_8(s, COND_AL, datalo, addrlo, 0); - } + tcg_out_st16_8(s, COND_AL, datalo, addrlo, 0); break; case MO_32: - default: - if (bswap) { - tcg_out_bswap32(s, COND_AL, TCG_REG_R0, datalo); - tcg_out_st32_12(s, COND_AL, TCG_REG_R0, addrlo, 0); - } else { - tcg_out_st32_12(s, COND_AL, datalo, addrlo, 0); - } + tcg_out_st32_12(s, COND_AL, datalo, addrlo, 0); break; case MO_64: /* Avoid strd for user-only emulation, to handle unaligned. */ - if (bswap) { - tcg_out_bswap32(s, COND_AL, TCG_REG_R0, datahi); - tcg_out_st32_12(s, COND_AL, TCG_REG_R0, addrlo, 0); - tcg_out_bswap32(s, COND_AL, TCG_REG_R0, datalo); - tcg_out_st32_12(s, COND_AL, TCG_REG_R0, addrlo, 4); - } else if (USING_SOFTMMU && use_armv6_instructions - && (datalo & 1) =3D=3D 0 && datahi =3D=3D datalo + 1) { + if (USING_SOFTMMU && use_armv6_instructions + && (datalo & 1) =3D=3D 0 && datahi =3D=3D datalo + 1) { tcg_out_strd_8(s, COND_AL, datalo, addrlo, 0); } else { tcg_out_st32_12(s, COND_AL, datalo, addrlo, 0); tcg_out_st32_12(s, COND_AL, datahi, addrlo, 4); } break; + default: + g_assert_not_reached(); } } =20 --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660852; cv=none; d=zohomail.com; s=zohoarc; b=JplVZw8BtgNUddOSCw67X9NPcTzQeB+r/uoHiz+hc14cAPUXxSk/SFkGG3WNpumcG0F6NUx/pO928pndJcohbqdF593NoYFcusWk6VmYv13s1jY40ACHO9JpEKmcjl2spliv5iiVYjUcPWXKp/+XHzvR9kviEizQPvzJUbgzqwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660852; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yJFKTLwdQ6BKW9i364z8Kx1sZ3PNnLVCKyVccYD/P/o=; b=ez/pD69rm6Hv5FyzqRXQaC+TOW9uLJm7Z726VvQpeBNE7XMbRxgQDq3rjgDZsZjIiIqI1a0LrLKSn7jPgOU8+QKCiBnSgd3MdHUUHIx64kz7pe5r2Xb34g6wm4ZUfakzg46eXj9jOhBLiAjhs5I9JODuz0XvlENahqR9PoEzPo0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660852042370.35727416198904; Mon, 14 Jun 2021 01:54:12 -0700 (PDT) Received: from localhost ([::1]:55990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiME-0007Og-Sb for importer@patchew.org; Mon, 14 Jun 2021 04:54:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi71-0002gG-8P for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:27 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:34409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6t-0003e6-5m for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:26 -0400 Received: by mail-pf1-x42f.google.com with SMTP id g6so10025050pfq.1 for ; Mon, 14 Jun 2021 01:38:18 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:17 -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=yJFKTLwdQ6BKW9i364z8Kx1sZ3PNnLVCKyVccYD/P/o=; b=d3DO8LE6gNUKHbMYSpYa/FNmgIK7nQMVZtfl8bMj4De/jAoW7t0k6voDr21+5+CW9W Yl1jdVqfXoP7O8Sl7k+r/eGORBJ6f5Wlfo6rJUl0RXprTfnrIPYf2tBs7vwR16TORzyG EuuXGQ+mzo2vWbjVox9wPUP9x1sdukWl39W+HMxqw/v4sAtHxVIQwiwQ5yarWMAJAnBA xOPi4qParp1JGIVpQmVUuhmmqqwuakhrrFhvnG9UN7oiFFE4RWflyhfU0Kc5Q03afs5A aQJUSziL3Ax/3DEsr8WIYDcs00XXak9sPFhJWD5Q0C8p6gq31gxUDj1p7uVt2r1WyP6x T8wg== 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=yJFKTLwdQ6BKW9i364z8Kx1sZ3PNnLVCKyVccYD/P/o=; b=lg6BDEGtaMsePPv6hhRA1OuL5zHkoYafhi9xu7r0ZXRrLDpe3t4W/bXDL3M7gn6b3o 5PmQE6+uiykoMLAKmLIArkX1TD9RCjXBGvor722YyxDtiUJIgqMrWgpl9XEJnXICJxCl 53MvBXqq3R+8JYuSdWT20687FySSwaU9WAHDTBc+v1TLce7wj7f5671MxHObLHJmu8+x JwhfDq0/lDnKrwpqFAkARJfcyyBxNekKhx0w52Ksie1QqNNYVlzl+TbZHkYnaAa95Uil vMRx/JcTH6kaTNwgFStgr+zWYn1CatOLX428BmOSuF5QNuOK0vvSxeIZS3mMxygvvOZK vVVA== X-Gm-Message-State: AOAM531paQERZxQGgh/wtmfxTvXFK+KuDoaR0u4hJUyi+PkJ2X8PSwXk iv5dTaik9ciGL5jpVwQCoRcotGSa5vKnZw== X-Google-Smtp-Source: ABdhPJzskyuPOR+vweBQ9zcAcrAeMIo6beYmKuCx9MYlQFFJKE3HRlTXnGXCYHtm2ZUX0EUOuNsxgQ== X-Received: by 2002:a63:1163:: with SMTP id 35mr16335660pgr.400.1623659897527; Mon, 14 Jun 2021 01:38:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 27/28] tcg/aarch64: Unset TCG_TARGET_HAS_MEMORY_BSWAP Date: Mon, 14 Jun 2021 01:37:59 -0700 Message-Id: <20210614083800.1166166-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The memory bswap support in the aarch64 backend merely dates from a time when it was required. There is nothing special about the backend support that could not have been provided by the middle-end even prior to the introduction of the bswap flags. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/aarch64/tcg-target.h | 2 +- tcg/aarch64/tcg-target.c.inc | 87 +++++++++++++----------------------- 2 files changed, 32 insertions(+), 57 deletions(-) diff --git a/tcg/aarch64/tcg-target.h b/tcg/aarch64/tcg-target.h index ef55f7c185..551baf8da3 100644 --- a/tcg/aarch64/tcg-target.h +++ b/tcg/aarch64/tcg-target.h @@ -148,7 +148,7 @@ typedef enum { #define TCG_TARGET_HAS_cmpsel_vec 0 =20 #define TCG_TARGET_DEFAULT_MO (0) -#define TCG_TARGET_HAS_MEMORY_BSWAP 1 +#define TCG_TARGET_HAS_MEMORY_BSWAP 0 =20 void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); =20 diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc index f72218b036..55eb98d0b1 100644 --- a/tcg/aarch64/tcg-target.c.inc +++ b/tcg/aarch64/tcg-target.c.inc @@ -1557,28 +1557,34 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext= , TCGReg d, /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * TCGMemOpIdx oi, uintptr_t ra) */ -static void * const qemu_ld_helpers[16] =3D { - [MO_UB] =3D helper_ret_ldub_mmu, - [MO_LEUW] =3D helper_le_lduw_mmu, - [MO_LEUL] =3D helper_le_ldul_mmu, - [MO_LEQ] =3D helper_le_ldq_mmu, - [MO_BEUW] =3D helper_be_lduw_mmu, - [MO_BEUL] =3D helper_be_ldul_mmu, - [MO_BEQ] =3D helper_be_ldq_mmu, +static void * const qemu_ld_helpers[4] =3D { + [MO_8] =3D helper_ret_ldub_mmu, +#ifdef HOST_WORDS_BIGENDIAN + [MO_16] =3D helper_be_lduw_mmu, + [MO_32] =3D helper_be_ldul_mmu, + [MO_64] =3D helper_be_ldq_mmu, +#else + [MO_16] =3D helper_le_lduw_mmu, + [MO_32] =3D helper_le_ldul_mmu, + [MO_64] =3D helper_le_ldq_mmu, +#endif }; =20 /* helper signature: helper_ret_st_mmu(CPUState *env, target_ulong addr, * uintxx_t val, TCGMemOpIdx oi, * uintptr_t ra) */ -static void * const qemu_st_helpers[16] =3D { - [MO_UB] =3D helper_ret_stb_mmu, - [MO_LEUW] =3D helper_le_stw_mmu, - [MO_LEUL] =3D helper_le_stl_mmu, - [MO_LEQ] =3D helper_le_stq_mmu, - [MO_BEUW] =3D helper_be_stw_mmu, - [MO_BEUL] =3D helper_be_stl_mmu, - [MO_BEQ] =3D helper_be_stq_mmu, +static void * const qemu_st_helpers[4] =3D { + [MO_8] =3D helper_ret_stb_mmu, +#ifdef HOST_WORDS_BIGENDIAN + [MO_16] =3D helper_be_stw_mmu, + [MO_32] =3D helper_be_stl_mmu, + [MO_64] =3D helper_be_stq_mmu, +#else + [MO_16] =3D helper_le_stw_mmu, + [MO_32] =3D helper_le_stl_mmu, + [MO_64] =3D helper_le_stq_mmu, +#endif }; =20 static inline void tcg_out_adr(TCGContext *s, TCGReg rd, const void *targe= t) @@ -1602,7 +1608,7 @@ static bool tcg_out_qemu_ld_slow_path(TCGContext *s, = TCGLabelQemuLdst *lb) tcg_out_mov(s, TARGET_LONG_BITS =3D=3D 64, TCG_REG_X1, lb->addrlo_reg); tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_X2, oi); tcg_out_adr(s, TCG_REG_X3, lb->raddr); - tcg_out_call(s, qemu_ld_helpers[opc & (MO_BSWAP | MO_SIZE)]); + tcg_out_call(s, qemu_ld_helpers[opc & MO_SIZE]); if (opc & MO_SIGN) { tcg_out_sxt(s, lb->type, size, lb->datalo_reg, TCG_REG_X0); } else { @@ -1628,7 +1634,7 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, = TCGLabelQemuLdst *lb) tcg_out_mov(s, size =3D=3D MO_64, TCG_REG_X2, lb->datalo_reg); tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_X3, oi); tcg_out_adr(s, TCG_REG_X4, lb->raddr); - tcg_out_call(s, qemu_st_helpers[opc & (MO_BSWAP | MO_SIZE)]); + tcg_out_call(s, qemu_st_helpers[opc & MO_SIZE]); tcg_out_goto(s, lb->raddr); return true; } @@ -1724,7 +1730,8 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, Mem= Op memop, TCGType ext, TCGReg data_r, TCGReg addr_r, TCGType otype, TCGReg off_r) { - const MemOp bswap =3D memop & MO_BSWAP; + /* Byte swapping is left to middle-end expansion. */ + tcg_debug_assert((memop & MO_BSWAP) =3D=3D 0); =20 switch (memop & MO_SSIZE) { case MO_UB: @@ -1736,40 +1743,19 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, M= emOp memop, TCGType ext, break; case MO_UW: tcg_out_ldst_r(s, I3312_LDRH, data_r, addr_r, otype, off_r); - if (bswap) { - tcg_out_rev16(s, data_r, data_r); - } break; case MO_SW: - if (bswap) { - tcg_out_ldst_r(s, I3312_LDRH, data_r, addr_r, otype, off_r); - tcg_out_rev16(s, data_r, data_r); - tcg_out_sxt(s, ext, MO_16, data_r, data_r); - } else { - tcg_out_ldst_r(s, (ext ? I3312_LDRSHX : I3312_LDRSHW), - data_r, addr_r, otype, off_r); - } + tcg_out_ldst_r(s, (ext ? I3312_LDRSHX : I3312_LDRSHW), + data_r, addr_r, otype, off_r); break; case MO_UL: tcg_out_ldst_r(s, I3312_LDRW, data_r, addr_r, otype, off_r); - if (bswap) { - tcg_out_rev32(s, data_r, data_r); - } break; case MO_SL: - if (bswap) { - tcg_out_ldst_r(s, I3312_LDRW, data_r, addr_r, otype, off_r); - tcg_out_rev32(s, data_r, data_r); - tcg_out_sxt(s, TCG_TYPE_I64, MO_32, data_r, data_r); - } else { - tcg_out_ldst_r(s, I3312_LDRSWX, data_r, addr_r, otype, off_r); - } + tcg_out_ldst_r(s, I3312_LDRSWX, data_r, addr_r, otype, off_r); break; case MO_Q: tcg_out_ldst_r(s, I3312_LDRX, data_r, addr_r, otype, off_r); - if (bswap) { - tcg_out_rev64(s, data_r, data_r); - } break; default: tcg_abort(); @@ -1780,31 +1766,20 @@ static void tcg_out_qemu_st_direct(TCGContext *s, M= emOp memop, TCGReg data_r, TCGReg addr_r, TCGType otype, TCGReg off_r) { - const MemOp bswap =3D memop & MO_BSWAP; + /* Byte swapping is left to middle-end expansion. */ + tcg_debug_assert((memop & MO_BSWAP) =3D=3D 0); =20 switch (memop & MO_SIZE) { case MO_8: tcg_out_ldst_r(s, I3312_STRB, data_r, addr_r, otype, off_r); break; case MO_16: - if (bswap && data_r !=3D TCG_REG_XZR) { - tcg_out_rev16(s, TCG_REG_TMP, data_r); - data_r =3D TCG_REG_TMP; - } tcg_out_ldst_r(s, I3312_STRH, data_r, addr_r, otype, off_r); break; case MO_32: - if (bswap && data_r !=3D TCG_REG_XZR) { - tcg_out_rev32(s, TCG_REG_TMP, data_r); - data_r =3D TCG_REG_TMP; - } tcg_out_ldst_r(s, I3312_STRW, data_r, addr_r, otype, off_r); break; case MO_64: - if (bswap && data_r !=3D TCG_REG_XZR) { - tcg_out_rev64(s, TCG_REG_TMP, data_r); - data_r =3D TCG_REG_TMP; - } tcg_out_ldst_r(s, I3312_STRX, data_r, addr_r, otype, off_r); break; default: --=20 2.25.1 From nobody Fri May 3 21:59:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1623660990; cv=none; d=zohomail.com; s=zohoarc; b=Na942qzsDxJvU4osNwcqWawMhDDSWZfIBpNqtXJO5JJtiD/Y/tUSmMKpD/LZEehe5C70GZx+FxjQ5+665S+1/xz3fxZmcWSAEt4nB296BZ1QqFkRkOJqOomndI1dZAGqzJ2ZfGTNIu7c+NGQLJ2sZgCE3LJc48glZ/TZI0T+F6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623660990; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ujtnjSEKjc/8E8rHyRJKp/40jerX6TctpTGbnCUlGKA=; b=Q+32CKhj3B68eQxDWnwkppJWlBBRLFWz2qeUU7x8pfFL2MZ+X7cDXE+uTLcD2fXr8GUkHAVigQ5ZUjahtFftnN2s3SM0Vkef70ctVwZXDv3O2ecmr/Ag3O7kxtoy+p+bkKFlSoT6QqsrDESEnElv/C9XOgsEeo8RDu56fm4WQ+U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623660990151464.1970370346871; Mon, 14 Jun 2021 01:56:30 -0700 (PDT) Received: from localhost ([::1]:34820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsiOT-0003iw-2h for importer@patchew.org; Mon, 14 Jun 2021 04:56:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsi73-0002nT-Kg for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:29 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]:38632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsi6t-0003eG-ET for qemu-devel@nongnu.org; Mon, 14 Jun 2021 04:38:29 -0400 Received: by mail-pg1-x52e.google.com with SMTP id t17so8058927pga.5 for ; Mon, 14 Jun 2021 01:38:18 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id h20sm2242022pfh.24.2021.06.14.01.38.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 01:38:17 -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=ujtnjSEKjc/8E8rHyRJKp/40jerX6TctpTGbnCUlGKA=; b=zc3MQSgb8EYYdRAhQzvwdVFL82MWfYNvZglaUd/90IiGYKPqzJ4UMJeOvbGmWJE2aW v+K8CHFXJqmvYdOo7eLpIHhA+b/LmHKj2AsEp8UgvYtSRB54izdF6KIOQICijMZg2Fni CKxpQs8xi7trWHdXtp/hM6FajJ6W2eTc8dnW8y5lBAaLmvxPy+72ZdfIcpti4j9B5Big L2zjVzgkhuJKqTp2Q8oGNDqIrnGSdNJpbAF9gOwPDjmMBwodzAyzCEOtfgTGkVTRZdRX u8iXe2PXU77WzjkurZauyoSiZCzBPuTOjiTxoZ8ljNDJ/zCg7VEAhB/bVdFkjfD0TUdh yJSg== 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=ujtnjSEKjc/8E8rHyRJKp/40jerX6TctpTGbnCUlGKA=; b=kpmhAlH1e2BSYWqRq75A7e/MDf6qp/0kcVHO2QBn3qY0oTqHzcTjsIbwHsXKbSNVMo 5GbHG2E77wY1KeL0/HxGyzIgqRigNME6k+vbde9AIBE+MC+G0dweS20e9qzrrB6qJp94 HnoQMyGS3tBGm1PD+jLAt0mFNINFS5cRTGpYizKowb05ADEVfPXM9VMJFwUleJ2wqwhA yaJo0mp9v8aS90BNNe7C2OIeFgJyIEOYuFJcw2WlIk/mPTN40slW/oSi4dyHzADoUYLN no4Rf1/Hdmz3iviib/NS1E2lxAOYhYztNTzdXXV7PUKvKENP/FIe45U5/JTvBfJaA6a1 XDQQ== X-Gm-Message-State: AOAM5312KmFf1FeZ4m5b6splFtuttKPSY+S8wb7BBhHmoXUqEWe/fdHR pWTYpEFMV0EnuFqJjjjpCwUKxTtTcWF1Mw== X-Google-Smtp-Source: ABdhPJwaDStm07bdY5uuwRoB2rARU5wRq4YqW/iQhD5QORGDsSPta8m1KxhVqaMOU1OXWornpRKhSg== X-Received: by 2002:a65:63d2:: with SMTP id n18mr16011207pgv.447.1623659898145; Mon, 14 Jun 2021 01:38:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 28/28] tcg/riscv: Remove MO_BSWAP handling Date: Mon, 14 Jun 2021 01:38:00 -0700 Message-Id: <20210614083800.1166166-29-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614083800.1166166-1-richard.henderson@linaro.org> References: <20210614083800.1166166-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52e.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" TCG_TARGET_HAS_MEMORY_BSWAP is already unset for this backend, which means that MO_BSWAP be handled by the middle-end and will never be seen by the backend. Thus the indexes used with qemu_{ld,st}_helpers will always be zero. Tidy the comments and asserts in tcg_out_qemu_{ld,st}_direct. It is not that we do not handle bswap "yet", but never will. Signed-off-by: Richard Henderson Acked-by: Alistair Francis --- tcg/riscv/tcg-target.c.inc | 64 ++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc index da7eecafc5..c16f96b401 100644 --- a/tcg/riscv/tcg-target.c.inc +++ b/tcg/riscv/tcg-target.c.inc @@ -852,37 +852,43 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0) /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * TCGMemOpIdx oi, uintptr_t ra) */ -static void * const qemu_ld_helpers[16] =3D { - [MO_UB] =3D helper_ret_ldub_mmu, - [MO_SB] =3D helper_ret_ldsb_mmu, - [MO_LEUW] =3D helper_le_lduw_mmu, - [MO_LESW] =3D helper_le_ldsw_mmu, - [MO_LEUL] =3D helper_le_ldul_mmu, +static void * const qemu_ld_helpers[8] =3D { + [MO_UB] =3D helper_ret_ldub_mmu, + [MO_SB] =3D helper_ret_ldsb_mmu, +#ifdef HOST_WORDS_BIGENDIAN + [MO_UW] =3D helper_be_lduw_mmu, + [MO_SW] =3D helper_be_ldsw_mmu, + [MO_UL] =3D helper_be_ldul_mmu, #if TCG_TARGET_REG_BITS =3D=3D 64 - [MO_LESL] =3D helper_le_ldsl_mmu, + [MO_SL] =3D helper_be_ldsl_mmu, #endif - [MO_LEQ] =3D helper_le_ldq_mmu, - [MO_BEUW] =3D helper_be_lduw_mmu, - [MO_BESW] =3D helper_be_ldsw_mmu, - [MO_BEUL] =3D helper_be_ldul_mmu, + [MO_Q] =3D helper_be_ldq_mmu, +#else + [MO_UW] =3D helper_le_lduw_mmu, + [MO_SW] =3D helper_le_ldsw_mmu, + [MO_UL] =3D helper_le_ldul_mmu, #if TCG_TARGET_REG_BITS =3D=3D 64 - [MO_BESL] =3D helper_be_ldsl_mmu, + [MO_SL] =3D helper_le_ldsl_mmu, +#endif + [MO_Q] =3D helper_le_ldq_mmu, #endif - [MO_BEQ] =3D helper_be_ldq_mmu, }; =20 /* helper signature: helper_ret_st_mmu(CPUState *env, target_ulong addr, * uintxx_t val, TCGMemOpIdx oi, * uintptr_t ra) */ -static void * const qemu_st_helpers[16] =3D { - [MO_UB] =3D helper_ret_stb_mmu, - [MO_LEUW] =3D helper_le_stw_mmu, - [MO_LEUL] =3D helper_le_stl_mmu, - [MO_LEQ] =3D helper_le_stq_mmu, - [MO_BEUW] =3D helper_be_stw_mmu, - [MO_BEUL] =3D helper_be_stl_mmu, - [MO_BEQ] =3D helper_be_stq_mmu, +static void * const qemu_st_helpers[4] =3D { + [MO_8] =3D helper_ret_stb_mmu, +#ifdef HOST_WORDS_BIGENDIAN + [MO_16] =3D helper_be_stw_mmu, + [MO_32] =3D helper_be_stl_mmu, + [MO_64] =3D helper_be_stq_mmu, +#else + [MO_16] =3D helper_le_stw_mmu, + [MO_32] =3D helper_le_stl_mmu, + [MO_64] =3D helper_le_stq_mmu, +#endif }; =20 /* We don't support oversize guests */ @@ -997,7 +1003,7 @@ static bool tcg_out_qemu_ld_slow_path(TCGContext *s, T= CGLabelQemuLdst *l) tcg_out_movi(s, TCG_TYPE_PTR, a2, oi); tcg_out_movi(s, TCG_TYPE_PTR, a3, (tcg_target_long)l->raddr); =20 - tcg_out_call(s, qemu_ld_helpers[opc & (MO_BSWAP | MO_SSIZE)]); + tcg_out_call(s, qemu_ld_helpers[opc & MO_SSIZE]); tcg_out_mov(s, (opc & MO_SIZE) =3D=3D MO_64, l->datalo_reg, a0); =20 tcg_out_goto(s, l->raddr); @@ -1042,7 +1048,7 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, = TCGLabelQemuLdst *l) tcg_out_movi(s, TCG_TYPE_PTR, a3, oi); tcg_out_movi(s, TCG_TYPE_PTR, a4, (tcg_target_long)l->raddr); =20 - tcg_out_call(s, qemu_st_helpers[opc & (MO_BSWAP | MO_SSIZE)]); + tcg_out_call(s, qemu_st_helpers[opc & MO_SIZE]); =20 tcg_out_goto(s, l->raddr); return true; @@ -1052,10 +1058,8 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s,= TCGLabelQemuLdst *l) static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg lo, TCGReg hi, TCGReg base, MemOp opc, bool is_64) { - const MemOp bswap =3D opc & MO_BSWAP; - - /* We don't yet handle byteswapping, assert */ - g_assert(!bswap); + /* Byte swapping is left to middle-end expansion. */ + tcg_debug_assert((opc & MO_BSWAP) =3D=3D 0); =20 switch (opc & (MO_SSIZE)) { case MO_UB: @@ -1139,10 +1143,8 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCG= Arg *args, bool is_64) static void tcg_out_qemu_st_direct(TCGContext *s, TCGReg lo, TCGReg hi, TCGReg base, MemOp opc) { - const MemOp bswap =3D opc & MO_BSWAP; - - /* We don't yet handle byteswapping, assert */ - g_assert(!bswap); + /* Byte swapping is left to middle-end expansion. */ + tcg_debug_assert((opc & MO_BSWAP) =3D=3D 0); =20 switch (opc & (MO_SSIZE)) { case MO_8: --=20 2.25.1