From patchwork Wed Apr 10 07:22:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 787482 Delivered-To: patch@linaro.org Received: by 2002:adf:fdd2:0:b0:346:15ad:a2a with SMTP id i18csp570186wrs; Wed, 10 Apr 2024 00:37:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX2k9M9VBW8K7mXn/iQZ7r5lkgHn0M8tYX8iHOab65uMP1p/T5tbgWu+lmcgJvYIrVQ37P5V4fae6GXibDZTjLZ X-Google-Smtp-Source: AGHT+IFer4sjDb4ENGe12iXFOTWNtYfFIT+9QseI7gnSexFecAmhNRzMncJ3pRB/czSgqv4mQrdL X-Received: by 2002:a05:6808:201b:b0:3c6:b55:8acc with SMTP id q27-20020a056808201b00b003c60b558accmr1072063oiw.14.1712734661490; Wed, 10 Apr 2024 00:37:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712734661; cv=none; d=google.com; s=arc-20160816; b=CZWRcjLxp/dDdvsVh2+gpR46V/6OvNjqewtlNu6xo4sJtUK+J2A5ot8R+CUvvTo67P IXRuuIlPLIhpUbdN8kGq+sszlOLMtmULafzPIDvl2Ku/S+uF01butT/l7rmCZrkuNyd+ quKClZ8ptAE+i10+Nz8eVoJxNF3DCSaPOqhrzi13QT8sV/MX2mCNptn7doU/+3UTHdSM UoMWkhReY4AvolA61Bn/3RICCk2m1NOK8f6VRDV8x352+ipgXaSpBmwrqXxc+08BAynG jzFXnxD7+YHmH3WseTi+UQo+CGeLUCeI7om4V3dgV1Lrg+J4vJ0G99Q3ILhAy2wXB3c7 1tcg== 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; bh=HLUUr7BAmeMGzlFTWwdxehIP5/p+vUN/6xOR4DiO2FY=; fh=XPr16z7k4qYUwnp7MFr0Z2i5quBDvtkdSzZufoMjA6c=; b=mQQmmYOaf+1xF9HmwsFQbPrKypjn5Mm4NCFirM9xuEFzOumHfGx/DLxIRr/lNnobHB y71cppV4wBQ0xWYFeaxPRLoFjwXt/i0zL7Y2pma+oL1CT20j2URHrHN/UPUoBWPgNFEW 8r9ERsogRpmcoQ4MczQYW7VFH15YjVVxQx2EnW+WeaJThOhSRiBe679U0BFXw6V+Py6I dvlyW0+2wSMo/Z1BOhzUzlSI61ES63dfRBrdiqoaNxM4VT7/mEe4zasU0/qL3vz/YzH6 tDc6a3XRn+Lca63aVm5iKG0DoeERB7Y5nRxozzl2MN9zKb4R/VJkVz2I59IJ7AvYMLST yulg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id wh19-20020a05620a56d300b0078d673190fdsi5489722qkn.408.2024.04.10.00.37.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Apr 2024 00:37:41 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruSNA-0002oA-LR; Wed, 10 Apr 2024 03:27:57 -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 1ruSM3-0008Nk-1j; Wed, 10 Apr 2024 03:26:48 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruSM1-0004gC-68; Wed, 10 Apr 2024 03:26:46 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6A2265D699; Wed, 10 Apr 2024 10:25:05 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 025D6B02D9; Wed, 10 Apr 2024 10:23:07 +0300 (MSK) Received: (nullmailer pid 4191771 invoked by uid 1000); Wed, 10 Apr 2024 07:23:04 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Sven Schnelle , Helge Deller , Michael Tokarev Subject: [Stable-8.2.3 41/87] target/hppa: Fix assemble_16 insns for wide mode Date: Wed, 10 Apr 2024 10:22:14 +0300 Message-Id: <20240410072303.4191455-41-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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.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 From: Richard Henderson Reported-by: Sven Schnelle Reviewed-by: Helge Deller Signed-off-by: Richard Henderson (cherry picked from commit 72bace2d13cb427fde3bb50ae1a71a2abe9acc0f) Signed-off-by: Michael Tokarev 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 3ef39b1bd7..5d9f448acd 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) {