From patchwork Wed Mar 20 00:32:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 781352 Delivered-To: patch@linaro.org Received: by 2002:adf:cf01:0:b0:33e:7753:30bd with SMTP id o1csp65598wrj; Tue, 19 Mar 2024 17:34:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXDcu9SvPsyI2kobUUTWSylsDznEufHieCCgDruIMXs2cHQ1xzXpUIc8vgFIBa1AVHbocYkZqi82Q2sDTxWlu65 X-Google-Smtp-Source: AGHT+IGHzwZcuRsNK+Nh4H8SZmXLJAJm9wXZMtA2mb8jqCHWPguXnqxWXGr5nh1NPnEzUXh7mKmH X-Received: by 2002:a25:4657:0:b0:dcf:c086:dd43 with SMTP id t84-20020a254657000000b00dcfc086dd43mr10407341yba.14.1710894857589; Tue, 19 Mar 2024 17:34:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710894857; cv=none; d=google.com; s=arc-20160816; b=VoknnxsrJrEVlUoiQQUXKddKR2SWfW+moS/96Q7hKKWkanBRD9DR8aZolVaP0Zf3z3 3H8qf1NZr3a8ZwsHANfordQMXgU37SUabsmL1PJjJx5ra4HC90pNpIPfuAR7xOQqVZA6 m3AeHfwu9DAMfpDazAssDWw7xybuLLOq4RgUMDGTQ+cCY1PkXJ/6OmzPkBmz+soaPKZm NYCF8OscfYeZRSMZd0Pl352suoNPLAaDRihOoYMGRV6yc5Js5XNqNZ118MvKNYIbg/dv TKb6StSJBYUC1DYZUUdwHwK+qYRH1CP3vBa9Gy+VSDaZxtgj9L4smi/AhJpiTcpLP/U7 B3nQ== 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=AF/K0xxG5flIoeqYmAeLiTsMh85SPIBIGToclbtkT4pyXpgYEQtW7vm2/PGF7L+QNK pDFiEukCqeU0M//4kDK1SlnmBmW2vTQbcRrRpkR29DYzBHx5LkYmaPD2xWd6Uu5n+ADY 5w8M3R8hWkODOx3IW77c9RcY1WR1TWNFcrKG1G1VrlMlfddibFj/FEyD9wCIwIEuif4j SbHa7pXhocLkge5ClwiJe8dUyGIOyFec5RBO0hkBkB5whPacHd5q3V8jJvbCMreAZME7 K0CBpyvGizGwxYmAojpnvp8J3K1eHJYbsS569noyLnabqhQThhm82Q83Lo2UBLFrOcWK ntAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GyzHEBp6; 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 c4-20020ac87d84000000b00430ce7d3e6bsi6040263qtd.52.2024.03.19.17.34.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Mar 2024 17:34:17 -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=GyzHEBp6; 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 1rmjse-0008VE-H2; Tue, 19 Mar 2024 20:32:32 -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 1rmjsd-0008UX-Ei for qemu-devel@nongnu.org; Tue, 19 Mar 2024 20:32:31 -0400 Received: from mail-oi1-x22c.google.com ([2607:f8b0:4864:20::22c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rmjsb-0005WU-SR for qemu-devel@nongnu.org; Tue, 19 Mar 2024 20:32:31 -0400 Received: by mail-oi1-x22c.google.com with SMTP id 5614622812f47-3c39579af51so934250b6e.3 for ; Tue, 19 Mar 2024 17:32:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710894749; x=1711499549; 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=GyzHEBp6naIADOy44Q+stQboeD7n7ysIs6SiXWyMgr2/GGYImpe7CQReSZo6GbmrQX wKhotJu94egf4+iu8sMHjdPgL/mVw0vOq/fRPrOFtpLr6RtertWYdmpdKZbymuI4Z20/ TBhN6EYdgrhxHOSA20rqARdn4Asn226/41RuRgEG49oXvuF7potEe6Pgr0RAmtNuNAHv zXAZZauivVWknZEBIqWDbVtM3r86LVt3qdWGW8BRSnVKOVX0ETzGYgVNmxNejnxKHlIK Si7qyxCapYciBWUyHWC3aF16y32Cv7u64LOkcFvh5uspsmsR6bwtV8MPN67/q7aLmA7u /OYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710894749; x=1711499549; 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=pvsy15ynd/oy90IUorIgNgxo+YTZ++ZUKiYCT6VgQSvHWsDWtw6dSZ3rs1SrQIVGRG taEtxievAvmXR9TtMalj23ZyOOWVFAz3PIzLHJqBBmWB7HApfNN4RWNZo3pmN8Uzkd6L q+fbjItQvqHTmFp0VgWJa6ijFudy6gjQSNDiLEU2XyP1P9lsds1wJqbjEMK0qlSvfa1y jhtSe4x44sSE+N8gcmkrauyKzVostMAbiZiejtRhNfoYZsfRvXA8y6guKXsKprUlaF61 Hdezl3yuVi3lCpdR5lhfZBC4aHOt+/lya76XrJhiBlrsUTeTWhaPpapl+YWJRNCyhGQZ I1Dg== X-Gm-Message-State: AOJu0YxxGrgZoqf/3TlmrHP3wBuVHWQM5Ru9IIUj0i7Aa7AFIajjHJj4 CuJaAcLL+imP+pkd58VvOjqu+CTCm0eg6beC4hOiLf6r0c+iMstWA+3w5G2O/D09BrXIL8sKv6j A X-Received: by 2002:a05:6358:5207:b0:17e:76a1:8b7e with SMTP id b7-20020a056358520700b0017e76a18b7emr16489706rwa.4.1710894748706; Tue, 19 Mar 2024 17:32:28 -0700 (PDT) Received: from stoup.. (173-197-098-125.biz.spectrum.com. [173.197.98.125]) by smtp.gmail.com with ESMTPSA id d19-20020a63d653000000b005d553239b16sm8475645pgj.20.2024.03.19.17.32.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 17:32:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller , Sven Schnelle Subject: [PULL 2/9] target/hppa: Fix assemble_11a insns for wide mode Date: Tue, 19 Mar 2024 14:32:16 -1000 Message-Id: <20240320003223.554145-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320003223.554145-1-richard.henderson@linaro.org> References: <20240320003223.554145-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22c; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22c.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) {