From patchwork Wed Mar 13 22:51:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 780059 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp160082wrb; Wed, 13 Mar 2024 15:52:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWbXWGG8Zai05jF9wFwLQJhk6IltzLGfqC882F2/+Oz7ueGpIRZgh4y4Qc+hsOWqwKYygGhQWB0DAGFpncrgo3y X-Google-Smtp-Source: AGHT+IF9BaSzpSfzHhhRPViMnKoUq4fbb6FExqIUoEY2Si7SHCX3qz4k9FHIgdZnsB2lNe6pPSQ/ X-Received: by 2002:a0d:d403:0:b0:60a:16f:4c94 with SMTP id w3-20020a0dd403000000b0060a016f4c94mr45187ywd.17.1710370370810; Wed, 13 Mar 2024 15:52:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710370370; cv=none; d=google.com; s=arc-20160816; b=atZXo5pQkAcYO8WjcWe1kKimtA+9yh+EXDORzm87efz/TBquUOos3acaFZww+AwVph 5MSZE1nuC3DxwTIvRi/O4HquoEzC9vdWZNI055nmq/XIK0K3Pcf5K/WUjm0Qy5XTtO7f mlTIOHsyTPsYOZJS6YUYN7bCDjqX6v9S5ENA7Ld5/G4UooSnhNv1ljYGqC5U/1Ey+w2V 3UNP2jxDWqa2LmHl5/wAG/AEsu9jt3jY6mlt75cHSr9+TenvGIAA5RebwrFWgRrK4AMK u5n/PiZ0hCVSgeA+XtXmu3eORd0tgb2pFmF094r+JOE1mj5jP3yilbK62Q7cqoQTZ2IC PUWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8TW18i/SxaVapdFzWXSi5siyjYPKSm3YSkEGDE7UVwk=; fh=VrHP4sfoKA8I1LkS7u+zyL5sfQ9auI1Z6YYiaQiPlIc=; b=drGDEeEM/8mhQxP614cRIPoOFIhxuQEgq2MPo5Bm15sGAgVWC4ogk2tPLfICJgCEaT 8d1ab/UmI/IWjR/vOhPTNH/tgKRSKhi4NBCaSOhCkDR+HkwHbVcSiae1O1LUsEnEtP5d eMEY6uVTQlwnRX6DV6bD29W+h2asoTJ4ItK9NJPBgLlZJrywGFN13FjzlMRiK1tts9SH b9kCUhwrlfkwOfrZDcqRJkPVUe/He2GpPu5Iyz1bBeUkJYZIZIk2ri15i2L8nTkRiXbG CPjIiaqzhryXdAwVckT2rR2b6EziSCoMzoqwkoPqNS9aya6mt4cshW1J7nUVOv+7UNmq aCFw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M24bjKkH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z12-20020ac87f8c000000b0042edd2c7a15si183819qtj.146.2024.03.13.15.52.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 15:52:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M24bjKkH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkXRy-0002JQ-D2; Wed, 13 Mar 2024 18:51:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkXRv-0002Iz-0s for qemu-devel@nongnu.org; Wed, 13 Mar 2024 18:51:51 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkXRt-0004Gm-FH for qemu-devel@nongnu.org; Wed, 13 Mar 2024 18:51:50 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1dddad37712so3350155ad.3 for ; Wed, 13 Mar 2024 15:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710370308; x=1710975108; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8TW18i/SxaVapdFzWXSi5siyjYPKSm3YSkEGDE7UVwk=; b=M24bjKkHyZrd1RLkbzifAvhGpSr41auZ7wNxaCwU9LE403vS5GJyKe+cXuQhSORLZ1 VBXXc11DdDuCg+g21h9CQxeYx5CKtXx+v0ZfUElR2vcV4oXVR437IsM6jy6aTP3NU0jh Fj2N3eCaP0Uc5i+D0kotiPeohWTDHmPESVTL8FrwAb4We5DtAwsVAX33e9f9HuIlh1Hh 2NnhxjATdpy7vaZkeu+STjrc4Aca1W6LF1NQxp7ws0XqB1nYE5GPvbqbUO8gLhnE32X4 MVJmxcIpnyp6zVwqSsf8igutK6zHUkQoeF14x1wo9oYHAKPge0RM5sD0Lin34eoisGUg Ry3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710370308; x=1710975108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8TW18i/SxaVapdFzWXSi5siyjYPKSm3YSkEGDE7UVwk=; b=KrwC6HVmDMw3bl0XO3JwQU6EuWMHL7UHKA/lNSJg8JAxQMFVe9guOQ/Kz5yCBwDzRG Dg9cjHPiHzBhy+BhexhdWHgM6W6M48j4uobXrHKWMFu5nasOJZc89Ttd6iGTV6XbGS0+ a0DD/gghpDWmvWVnDBlweOY54Hachb0y3au4kZwkonVH7NXjo9b3GXwGX5GNpBzN8q3v COxZNNCdRgGkUxnYf1rsrJkOVuwUcVHFq/LrD5/kXxorPycKzREdZzf6bybzwpj/sMQB T7GBF/kcmoVjVNic/qbMdVsToV1/QDOjlofp+gip7lNsJckSYdqUgPynvSnZPKDoptOJ hKgA== X-Gm-Message-State: AOJu0YyghYYe7OBUKFF7CnYRpUBMAKdiMGAFGWIFycubaIol+jr3pF2g 6F2Z679y+4VzWHhPmbmcV/AMXG6S0P/YLrJ8WvAL80J6lKBccliB2DUSS0dZvgs2G3C00MatM1H B X-Received: by 2002:a17:903:11c6:b0:1db:8fd6:915e with SMTP id q6-20020a17090311c600b001db8fd6915emr175150plh.33.1710370308040; Wed, 13 Mar 2024 15:51:48 -0700 (PDT) Received: from stoup.. (173-197-098-125.biz.spectrum.com. [173.197.98.125]) by smtp.gmail.com with ESMTPSA id q13-20020a170902dacd00b001dcfc68e7desm137269plx.75.2024.03.13.15.51.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 15:51:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Sven Schnelle Subject: [PATCH v2 1/3] target/hppa: Fix assemble_16 insns for wide mode Date: Wed, 13 Mar 2024 12:51:38 -1000 Message-Id: <20240313225140.812202-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240313225140.812202-1-richard.henderson@linaro.org> References: <20240313225140.812202-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Reported-by: Sven Schnelle Signed-off-by: Richard Henderson Reviewed-by: Helge Deller --- target/hppa/insns.decode | 15 +++++++++------ target/hppa/translate.c | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index f5a3f02fd1..0d9f8159ec 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -27,13 +27,14 @@ %assemble_11a 0:s1 4:10 !function=expand_shl3 %assemble_12 0:s1 2:1 3:10 !function=expand_shl2 %assemble_12a 0:s1 3:11 !function=expand_shl2 +%assemble_16 0:16 !function=expand_16 %assemble_17 0:s1 16:5 2:1 3:10 !function=expand_shl2 %assemble_22 0:s1 16:10 2:1 3:10 !function=expand_shl2 +%assemble_sp 14:2 !function=sp0_if_wide %assemble_21 0:s1 1:11 14:2 16:5 12:2 !function=expand_shl11 %lowsign_11 0:s1 1:10 -%lowsign_14 0:s1 1:13 %sm_imm 16:10 !function=expand_sm_imm @@ -221,7 +222,7 @@ sub_b_tsv 000010 ..... ..... .... 110100 . ..... @rrr_cf_d ldil 001000 t:5 ..................... i=%assemble_21 addil 001010 r:5 ..................... i=%assemble_21 -ldo 001101 b:5 t:5 -- .............. i=%lowsign_14 +ldo 001101 b:5 t:5 ................ i=%assemble_16 addi 101101 ..... ..... .... 0 ........... @rri_cf addi_tsv 101101 ..... ..... .... 1 ........... @rri_cf @@ -306,10 +307,12 @@ fstd 001011 ..... ..... .. . 1 -- 100 0 . ..... @fldstdi @ldstim11 ...... b:5 t:5 sp:2 .............. \ &ldst disp=%assemble_11a m=%ma2_to_m x=0 scale=0 size=3 -@ldstim14 ...... b:5 t:5 sp:2 .............. \ - &ldst disp=%lowsign_14 x=0 scale=0 m=0 -@ldstim14m ...... b:5 t:5 sp:2 .............. \ - &ldst disp=%lowsign_14 x=0 scale=0 m=%neg_to_m +@ldstim14 ...... b:5 t:5 ................ \ + &ldst sp=%assemble_sp disp=%assemble_16 \ + x=0 scale=0 m=0 +@ldstim14m ...... b:5 t:5 ................ \ + &ldst sp=%assemble_sp disp=%assemble_16 \ + x=0 scale=0 m=%neg_to_m @ldstim12m ...... b:5 t:5 sp:2 .............. \ &ldst disp=%assemble_12a x=0 scale=0 m=%pos_to_m diff --git a/target/hppa/translate.c b/target/hppa/translate.c index eb2046c5ad..cbe44ef75a 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -144,6 +144,28 @@ static int assemble_6(DisasContext *ctx, int val) return (val ^ 31) + 1; } +/* Expander for assemble_16(s,im14). */ +static int expand_16(DisasContext *ctx, int val) +{ + /* + * @val is bits [0:15], containing both im14 and s. + * Swizzle thing around depending on PSW.W. + */ + int s = extract32(val, 14, 2); + int i = (-(val & 1) << 13) | extract32(val, 1, 13); + + if (ctx->tb_flags & PSW_W) { + i ^= s << 13; + } + return i; +} + +/* The sp field is only present with !PSW_W. */ +static int sp0_if_wide(DisasContext *ctx, int sp) +{ + return ctx->tb_flags & PSW_W ? 0 : sp; +} + /* Translate CMPI doubleword conditions to standard. */ static int cmpbid_c(DisasContext *ctx, int val) { From patchwork Wed Mar 13 22:51:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 780060 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp160136wrb; Wed, 13 Mar 2024 15:53:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW+KazBinY0kA+WJ8pLSB498lo7ZnhbIDxn3ZH1bDt4/us+dEVGS4RU1Nv9jITc/n7deXuFQWQHZbA6OHKcCiTA X-Google-Smtp-Source: AGHT+IGr9ZruwUyHgXQeWwdDc14WS+cHJOkheXo3CXbn5DsaWDmnoGTJcyGXvca7CztmNvbFjJKp X-Received: by 2002:ac8:7e95:0:b0:430:87ec:e667 with SMTP id w21-20020ac87e95000000b0043087ece667mr51130qtj.51.1710370382246; Wed, 13 Mar 2024 15:53:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710370382; cv=none; d=google.com; s=arc-20160816; b=JyDPLOl4RQPKQtAvotMBK1emJM5I4utxijqOXsr25RsJVC5UlneTPMG5SGo8IfEMVz Drzj4pJEr/Dyy1Khn8wSR1ZjQb0+PIML6jCeDRssQ10+Jgd/Sx/MiX38xYfYGaqlm8xl f9WLn6dmCiaPgkpXFxOZ+HCIWzilJbOJFyHxM86D5ouO0YT9D9tvwNtPz3kJpSaAyeC0 orhtdbuehp3QzX68Uvxu40IR/LTYs5ljrC+Ak3b1iYZ8xPhf0xDrJVImtdLBYBVnuS75 RYWaEsbUYK4trtgHrJlrspxy3rCHl/PZuQZPnTpphUTkA0Agw3jn4QBq644gQUQku2KR aNYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ukEfuyWQnP9Sb76LI5tjGbSBopWDatLwKjWYccct6BU=; fh=hkbyWW5xZRw3ri7c5jPpVmtujBERfGCXX51JsOQjOVE=; b=qSUg0s9/EmZRGcHIqrvH+sBY9DXhDX94GVOMb+x01gf48cvnuZ9dmYeGAwBOPEMNVB 6O5yGyyv+pKtHX9ImhpA0nMaN9ghYUigwJtwLJoo76xr2DTskYS/WZZL0KE+TuFNOETB RPeMWTa571LGrBqNCuFCjLJVZwcZeApkkMKpwqDyNJUg9ruYRWavd0uxmIu0ojdGgQBH AwVKJXgD0gnQ30pL3IaKFNJ1PC0xXFMv6OLF7IYVCf2ajbDJI6h9JybhGvFCciYkQ7ur y+L/5gKQCEMRxDzKNeAmCtVGtX7/oOa4RT1W3FKnOMrRQP39wjSYvneKzSv9vW7gObeO ujWQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LA0GZvKl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x18-20020ac85f12000000b0042ee2b88e40si161689qta.727.2024.03.13.15.53.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 15:53:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LA0GZvKl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkXS4-0002Jp-4P; Wed, 13 Mar 2024 18:52:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkXRx-0002JR-3S for qemu-devel@nongnu.org; Wed, 13 Mar 2024 18:51:54 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkXRv-0004Gz-Ie for qemu-devel@nongnu.org; Wed, 13 Mar 2024 18:51:52 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-6e6c0098328so363464b3a.3 for ; Wed, 13 Mar 2024 15:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710370310; x=1710975110; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ukEfuyWQnP9Sb76LI5tjGbSBopWDatLwKjWYccct6BU=; b=LA0GZvKlzwcpTymnbO1qOYbzjXijZgnlihNnPA9b/I3xXrzLzbX5udBGBJgBZfq3aU K+9x0yl2Z1bZMw/O/xceGkaceNIFuhfg4iFW/D1g5AsCSPAU2MpgL9vGA5vN9p073KYu rXR20oylgD3gPS4r8Dm2CScOO7xpxo4Bc83w75BJhjoqFeXYR/c+HPwFHcBumQbW7zYH LC6RG3uRDBGe8qHFlIO/5SlUtMYx3fqqthSc3HnomeVKwKv/AYwaRLdhWeIac8PYaArq rDFu3k2sHqMRPIWjkQ3x3tAC2NKNd0YjdH99834jXzJzmo2glrTEFOIsW9WuxczfipMK 8n5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710370310; x=1710975110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ukEfuyWQnP9Sb76LI5tjGbSBopWDatLwKjWYccct6BU=; b=Eton46vJy9E+xaTfqywhzM09hEQq7CECjyzvW/ckcjPmjAu7UN0e3Z0MDSlnXZXYcU +phmgTmaVT1BlowEQkH5k8IRjRy+FdZx1FswE5IddfLRI9podo+DI4pknfzB+JnIZaIu crYvQiXmhD76NLWYzxUyQpWYLDFX3ag/J0htIDF4OWtY7JCOvwLknDnd3BKLgrM4uzuD Vzu2dZdriToywpmweAElihrtmOWLdyyRQtubQEI1JJHX5uym6iH8+BKDJWyHqUvkKQaI hVGf/qaWIg2mWjD+ktwD9sGeFPJV8grgYqnmhwfl/PHvUHaPsXJg9SBnRJdNmw4Y2OL9 j0tg== X-Gm-Message-State: AOJu0YwBM92RXdb5E2vC75Rt49JerwJ8RSdxCEnlbB3i/SpLueSi8+38 Oa2c3lCnFcoMqPezOFRLs5IhHhrhq77HCgJpOzh5DtYrcgidFF3ylbkaKZs6TYZIgJtyUZeVkOu V X-Received: by 2002:a05:6a20:9150:b0:1a0:cd54:6d9f with SMTP id x16-20020a056a20915000b001a0cd546d9fmr410103pzc.23.1710370310338; Wed, 13 Mar 2024 15:51:50 -0700 (PDT) Received: from stoup.. (173-197-098-125.biz.spectrum.com. [173.197.98.125]) by smtp.gmail.com with ESMTPSA id q13-20020a170902dacd00b001dcfc68e7desm137269plx.75.2024.03.13.15.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 15:51:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller , Sven Schnelle Subject: [PATCH v2 2/3] target/hppa: Fix assemble_11a insns for wide mode Date: Wed, 13 Mar 2024 12:51:39 -1000 Message-Id: <20240313225140.812202-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240313225140.812202-1-richard.henderson@linaro.org> References: <20240313225140.812202-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Tested-by: Helge Deller Reviewed-by: Helge Deller Reported-by: Sven Schnelle Signed-off-by: Richard Henderson --- target/hppa/insns.decode | 7 ++++--- target/hppa/translate.c | 23 +++++++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index 0d9f8159ec..9c6f92444c 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -24,7 +24,7 @@ %assemble_sr3 13:1 14:2 %assemble_sr3x 13:1 14:2 !function=expand_sr3x -%assemble_11a 0:s1 4:10 !function=expand_shl3 +%assemble_11a 4:12 0:1 !function=expand_11a %assemble_12 0:s1 2:1 3:10 !function=expand_shl2 %assemble_12a 0:s1 3:11 !function=expand_shl2 %assemble_16 0:16 !function=expand_16 @@ -305,8 +305,9 @@ fstd 001011 ..... ..... .. . 1 -- 100 0 . ..... @fldstdi # Offset Mem #### -@ldstim11 ...... b:5 t:5 sp:2 .............. \ - &ldst disp=%assemble_11a m=%ma2_to_m x=0 scale=0 size=3 +@ldstim11 ...... b:5 t:5 ................ \ + &ldst sp=%assemble_sp disp=%assemble_11a \ + m=%ma2_to_m x=0 scale=0 size=3 @ldstim14 ...... b:5 t:5 ................ \ &ldst sp=%assemble_sp disp=%assemble_16 \ x=0 scale=0 m=0 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index cbe44ef75a..40b9ff6d59 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -121,12 +121,6 @@ static int expand_shl2(DisasContext *ctx, int val) return val << 2; } -/* Used for fp memory ops. */ -static int expand_shl3(DisasContext *ctx, int val) -{ - return val << 3; -} - /* Used for assemble_21. */ static int expand_shl11(DisasContext *ctx, int val) { @@ -144,6 +138,23 @@ static int assemble_6(DisasContext *ctx, int val) return (val ^ 31) + 1; } +/* Expander for assemble_16a(s,cat(im10a,0),i). */ +static int expand_11a(DisasContext *ctx, int val) +{ + /* + * @val is bit 0 and bits [4:15]. + * Swizzle thing around depending on PSW.W. + */ + int im10a = extract32(val, 1, 10); + int s = extract32(val, 11, 2); + int i = (-(val & 1) << 13) | (im10a << 3); + + if (ctx->tb_flags & PSW_W) { + i ^= s << 13; + } + return i; +} + /* Expander for assemble_16(s,im14). */ static int expand_16(DisasContext *ctx, int val) { From patchwork Wed Mar 13 22:51:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 780062 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp160228wrb; Wed, 13 Mar 2024 15:53:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQe3MS/OroWkfOBce1YF7CyASbvqDc7fN30EX1CkOUwXZa+miAs2+7wExSsBlXeriwJt20443lgPHk3rkoUQpj X-Google-Smtp-Source: AGHT+IFmoEdheGU9YUmWaJSzCT/2AoVHloEsDMPm3Xa/9vDHiK3rXq9i2jY+dJ7rhTuqUueMjNBz X-Received: by 2002:a05:6870:e251:b0:222:a3:4034 with SMTP id d17-20020a056870e25100b0022200a34034mr205503oac.21.1710370401681; Wed, 13 Mar 2024 15:53:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710370401; cv=none; d=google.com; s=arc-20160816; b=M+Fr4Um5DWpG4REHq4BT0OmltifYFZul8YMMmKI9/M0/wy7fx6iZ3uwr1td4Dcj4ju MJMAxp52G4mR9cRp7o6wDbc4GdOVTuU+eqro0M61cXRBQ6sp/bV6+9zEp4kC4KxB+tU6 z8Su7bThXTk2kYz6dL+oEjWA5SgeKK3nJfNh0cX52yODVPot80xUqtfIh05vJopCAYyE D3LUwInG5GvCaIeDnMWdHNMpiaWZ76LXT+DKeXFm4yAUhrPYdNEoIev1xJ96D7QMAWnJ gnpaxmRuhtDOrlFpkEzfzMQhijnmHWNMbbNkSHVeQOqVOfbTAFCFpI9Flb6iUsXpXRZi cNRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Q6aglnROJwkY+5hRbPbUV1QnS5K81iLfR/yfvt3Y7ig=; fh=hkbyWW5xZRw3ri7c5jPpVmtujBERfGCXX51JsOQjOVE=; b=hVClMyzAmLtNvGmfGOHHzQ6zw2dqwQ3UwVQ2MKTGytO9tWpixaPbL2PqL9YdLA1Pl+ m5TuRXZhMGzclRjeRfpFDu92Qqd/+AXWx+Yx/rwONb3VAPMnLsQ0p1wdO7RJWxWRR7TV yaAQQ/V7rg42KkuyJlFtzeOA/erUhU3v1FT+gcKhMFE+kooKhDD4Nj01W2aIeBYZHPrW 2gDJSGMAnpVtINLtEEmuqorZ/aWc1p8iOOHuhOHZ62vL/WNliKQWKSgZCW8kIrvNX5KV rCCnTZbSBBBr3PyI4xLaERCc+quIK0s/XOVpDOiv+YD1MnNY1NEIebvilxxBM/X7WHoN bF4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BJEuGdmW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o15-20020a05620a228f00b007881c30f7c9si203105qkh.592.2024.03.13.15.53.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 15:53:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BJEuGdmW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkXSK-0002N1-8P; Wed, 13 Mar 2024 18:52:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkXS2-0002Jq-NW for qemu-devel@nongnu.org; Wed, 13 Mar 2024 18:52:00 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkXS0-0004HJ-AS for qemu-devel@nongnu.org; Wed, 13 Mar 2024 18:51:58 -0400 Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-5d4d15ec7c5so283160a12.1 for ; Wed, 13 Mar 2024 15:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710370315; x=1710975115; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q6aglnROJwkY+5hRbPbUV1QnS5K81iLfR/yfvt3Y7ig=; b=BJEuGdmWu+/PL4i0GjXHfbti/YVoEX0umjbV0r1LxOz119N0BEmKUYl5D0eltQwM5P Y/QNeQUYXyRgogK+bX/qRelGmztxq0E59Vi5rJfyppmyliKuDToce0buHYpDdfl4ZVaY pNuMTQjr+YvPtzmu92RXNbZW8EO/b8UvpM2lrKfZ9bG201icmHkIXyqL6VD1BSKlPv4y kciqr/GhV5MUaRKmuaIgvbWX4fYbT4bIB5NK1T1SrFkCwIIs2JFry7b+mrIxKQtwqfPb oOZYLtCffK2WJDJ/U901+OaspeNe0/RRzpndsv15JV0C6pH0zJZYSpBRxT3bpED1IzDz /b7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710370315; x=1710975115; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q6aglnROJwkY+5hRbPbUV1QnS5K81iLfR/yfvt3Y7ig=; b=K9ZTgjystZ+zVlqsVfhAcAdoJoKpipkuswBzKWmK58d+NgvHFJAGu05WHSEVrjVB0P 1YTD6S4LwpIh9ksiVv6N38tpmAWpO6POo6x6o7cv0ODXdE5cMyqpcsTCZ6jwo5+Ju7pc lUYpksZE4CIPckfCrS0JNr6KZErs91nTlGEYIo+XYKsrQovjfAvC9pG5Xd+T1l8VuAg7 3qNABPC5jd3a3/BjmFV4lfdzGVdKOy1PY7OSBX4y2P5XBPkoCbdRp3AvZLNTtTlqaxke +FCjL+MpfstAU3OH9MrDzJY1msB7Hcak5Hfn5TTlVj29GSGEjwxSgaEZ7dbTBjEvT1eM LraQ== X-Gm-Message-State: AOJu0YxeLHfyGLVObykMYKBoeodGLU/T/r3Yfs0rPrS80TGzI4O1nOar cb5WgA1gNWqi30wKRU1ytvQ/7UuQ61yj9OPE3msO0objNzWL2Vu3C9664JBtX703jgmhTq4d58Z y X-Received: by 2002:a17:902:e852:b0:1dd:b45f:4d02 with SMTP id t18-20020a170902e85200b001ddb45f4d02mr235219plg.22.1710370315013; Wed, 13 Mar 2024 15:51:55 -0700 (PDT) Received: from stoup.. (173-197-098-125.biz.spectrum.com. [173.197.98.125]) by smtp.gmail.com with ESMTPSA id q13-20020a170902dacd00b001dcfc68e7desm137269plx.75.2024.03.13.15.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 15:51:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller , Sven Schnelle Subject: [PATCH v2 3/3] target/hppa: Fix assemble_12a insns for wide mode Date: Wed, 13 Mar 2024 12:51:40 -1000 Message-Id: <20240313225140.812202-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240313225140.812202-1-richard.henderson@linaro.org> References: <20240313225140.812202-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Tested-by: Helge Deller Reported-by: Sven Schnelle Signed-off-by: Richard Henderson --- target/hppa/insns.decode | 27 ++++++++++++++++----------- target/hppa/translate.c | 17 +++++++++++++++++ 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index 9c6f92444c..5412ff9836 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -26,7 +26,7 @@ %assemble_11a 4:12 0:1 !function=expand_11a %assemble_12 0:s1 2:1 3:10 !function=expand_shl2 -%assemble_12a 0:s1 3:11 !function=expand_shl2 +%assemble_12a 3:13 0:1 !function=expand_12a %assemble_16 0:16 !function=expand_16 %assemble_17 0:s1 16:5 2:1 3:10 !function=expand_shl2 %assemble_22 0:s1 16:10 2:1 3:10 !function=expand_shl2 @@ -314,8 +314,9 @@ fstd 001011 ..... ..... .. . 1 -- 100 0 . ..... @fldstdi @ldstim14m ...... b:5 t:5 ................ \ &ldst sp=%assemble_sp disp=%assemble_16 \ x=0 scale=0 m=%neg_to_m -@ldstim12m ...... b:5 t:5 sp:2 .............. \ - &ldst disp=%assemble_12a x=0 scale=0 m=%pos_to_m +@ldstim12m ...... b:5 t:5 ................ \ + &ldst sp=%assemble_sp disp=%assemble_12a \ + x=0 scale=0 m=%pos_to_m # LDB, LDH, LDW, LDWM ld 010000 ..... ..... .. .............. @ldstim14 size=0 @@ -331,15 +332,19 @@ st 011010 ..... ..... .. .............. @ldstim14 size=2 st 011011 ..... ..... .. .............. @ldstim14m size=2 st 011111 ..... ..... .. ...........10. @ldstim12m size=2 -fldw 010110 b:5 ..... sp:2 .............. \ - &ldst disp=%assemble_12a t=%rm64 m=%a_to_m x=0 scale=0 size=2 -fldw 010111 b:5 ..... sp:2 ...........0.. \ - &ldst disp=%assemble_12a t=%rm64 m=0 x=0 scale=0 size=2 +fldw 010110 b:5 ..... ................ \ + &ldst disp=%assemble_12a sp=%assemble_sp \ + t=%rm64 m=%a_to_m x=0 scale=0 size=2 +fldw 010111 b:5 ..... .............0.. \ + &ldst disp=%assemble_12a sp=%assemble_sp \ + t=%rm64 m=0 x=0 scale=0 size=2 -fstw 011110 b:5 ..... sp:2 .............. \ - &ldst disp=%assemble_12a t=%rm64 m=%a_to_m x=0 scale=0 size=2 -fstw 011111 b:5 ..... sp:2 ...........0.. \ - &ldst disp=%assemble_12a t=%rm64 m=0 x=0 scale=0 size=2 +fstw 011110 b:5 ..... ................ \ + &ldst disp=%assemble_12a sp=%assemble_sp \ + t=%rm64 m=%a_to_m x=0 scale=0 size=2 +fstw 011111 b:5 ..... .............0.. \ + &ldst disp=%assemble_12a sp=%assemble_sp \ + t=%rm64 m=0 x=0 scale=0 size=2 ld 010100 ..... ..... .. ............0. @ldstim11 fldd 010100 ..... ..... .. ............1. @ldstim11 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 40b9ff6d59..be0b0494d0 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -155,6 +155,23 @@ static int expand_11a(DisasContext *ctx, int val) return i; } +/* Expander for assemble_16a(s,im11a,i). */ +static int expand_12a(DisasContext *ctx, int val) +{ + /* + * @val is bit 0 and bits [3:15]. + * Swizzle thing around depending on PSW.W. + */ + int im11a = extract32(val, 1, 11); + int s = extract32(val, 12, 2); + int i = (-(val & 1) << 13) | (im11a << 2); + + if (ctx->tb_flags & PSW_W) { + i ^= s << 13; + } + return i; +} + /* Expander for assemble_16(s,im14). */ static int expand_16(DisasContext *ctx, int val) {