From patchwork Wed Apr 10 07:22:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 787479 Delivered-To: patch@linaro.org Received: by 2002:adf:fdd2:0:b0:346:15ad:a2a with SMTP id i18csp567897wrs; Wed, 10 Apr 2024 00:29:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWoDw6qOF0t1LET7me4e26ildcRCucJBWcN0Z+P+lWqH5XCyRbCqqnSz1OSRTe5hkfQ2yACUAGpWUpsMxDDqT6h X-Google-Smtp-Source: AGHT+IEBNam2+iVTTGvQhw49FzYD18xy01vqpn3a+r5vIPHGjBeuJFMB9BUWwLcOyshTqwnMUwc1 X-Received: by 2002:a05:620a:1215:b0:78d:6a6b:414d with SMTP id u21-20020a05620a121500b0078d6a6b414dmr3169389qkj.17.1712734186199; Wed, 10 Apr 2024 00:29:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712734186; cv=none; d=google.com; s=arc-20160816; b=aQDMTyRrStfrmm21OiX7ypJmC/26uJIeFguqHaxi0yVH7C/fgIlISvHz7OnC0LIHkF A10d8v+ZGe4y+LuHuWRypeAu/3c6cZqDs7KC4R2gEhyKDJdcEfx12xgRzrEs6/D5fKc1 tUdGOacmif8B7UvMYeRSq3PlxtsZFjEYiglFNPc5T2MdfUxfWOAvQjhj3nM83asYSxGy BmeMumyv8LcKVIawYLSVT6Fg6+KiGCRYMNJsN6ZOGtAPClP9rHW+S+9f6iNquuu4FkZ5 JYNF0IKOthvfruCbx9v0gIS7oGglBbgLD51d4+B2eGywb4588bfQFc1929zogK+KTXPH BOPw== 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=y6KJXSWyVfmTJ6Oihpq/+7LspOVuRQrZAzRaiDK/F7o=; fh=4c0dVDgcFz/JWyzeqtGnfAJoQ7N0kMWHxCNsYhQ2EfY=; b=qsf640IWwAgmjzuT4hIrGqzEAqDfpl0gDXRZhZ+U5xgg6xLFTuZG577QcTsb/UNgX4 ZizWR1R50fJHW5BTiVkEw6jb5Gjo1mroA3BQ3AhGHq3sel/lBMoDwv6F/0sw9b0j0xd9 ONZ8AilgTWyOwuLRAVRUpoqIBaL0T0QnYqB46heaQAovr+TRP+8bio1ZEDQvHxLp70oH a35i0zDuFgYvpnqa+r6YNnEJ2tqAm9UgQZtP4xhfvObQ4bWCWta5zoMbaWxZnPNb5duY kuns3r1wq6LHXC4nylmZRyvAEMx5z55GhRZ2kdyXbcnJge/E3Q50NqgknX75pqjmFBjr 0HQw==; 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 k2-20020ae9f102000000b00788263f69afsi11367611qkg.313.2024.04.10.00.29.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Apr 2024 00:29:46 -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 1ruSNG-00035x-Vz; Wed, 10 Apr 2024 03:28:04 -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-0008Og-81; 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-0004gG-CA; 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 7AB5D5D69A; 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 1EC8FB02DA; Wed, 10 Apr 2024 10:23:07 +0300 (MSK) Received: (nullmailer pid 4191774 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 , Helge Deller , Sven Schnelle , Michael Tokarev Subject: [Stable-8.2.3 42/87] target/hppa: Fix assemble_11a insns for wide mode Date: Wed, 10 Apr 2024 10:22:15 +0300 Message-Id: <20240410072303.4191455-42-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 Tested-by: Helge Deller Reviewed-by: Helge Deller Reported-by: Sven Schnelle Signed-off-by: Richard Henderson (cherry picked from commit 4768c28edd4097ebef42822e15b4a43026b15376) Signed-off-by: Michael Tokarev 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 5d9f448acd..8c7a2fd331 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) {