From patchwork Sun Mar 3 02:19:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 777643 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp2034512wrn; Sat, 2 Mar 2024 18:20:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW+eIxeDrbwACZB5W2aFFFd48rzOOnziYBEKriMyAK6J+G828rPnDBdwk0/Ua+De8KkFdQ3cwzlI7lWLCpyizt9 X-Google-Smtp-Source: AGHT+IEMj3L9T2gktQQMwv1dC/m+SLfnmd8/kMJU2blsLknOse48ggNN9jXmpvzPRqbV0JmBr++w X-Received: by 2002:a05:622a:315:b0:42e:ea30:f4c9 with SMTP id q21-20020a05622a031500b0042eea30f4c9mr1027929qtw.43.1709432412122; Sat, 02 Mar 2024 18:20:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709432412; cv=none; d=google.com; s=arc-20160816; b=aNgPxspM38ruS7CFtjktaOaQGpeyKsz6ty7OXhCydouYVSOdr1TmWDUBYSx9JsgRVT EXBrSZNvdA9BtgAhRLbzpYQDcs+KqgcvY4M+OTVJrg16giJ7ZcCudMdReedrEHON56mH DN1EAXYCaIsu2maoUVGH8OU0PDPLAB4exXfoLF6dawgWGIJNdzl4h/1EkerCPl1nYj+r gUnqXeCAOhB3klMAIybPjv60aw73oUItXZWimfjYZ5Y9N7aLkVhtgzMY/rzmB3XTI7g+ 5TAMd4pTa++BtrSw/mDaXHP/xI9z8eyhpaVTD1voNsBX9Z6BrH57nrIte0OW+bFTLVsF iHEA== 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=yvtR6Tkj4Ql8rJP4IqTS1f67x9pt9hVmnIoNey13RNI=; fh=odZjvFrgMDmfTa4Yn/jVKLPsclS8EzRuPmYcS/SNwLw=; b=UUUCjwg8IdDXCXNkXDEU9purxpuyDkp3SwyHDfDKfW1F75M8kUprHHgdikU/FqFLMR VXpvOXKt7dTbg59AaOMiJtABrQ6nvjphAk8hB3YGRcT7imMy4hbHI8dIo3MBa/l0kgSf GfJoIMQ0stVk+FIu1i2CicsidrU91D/7Tn47bZShfBcXsJJ5+OTVU4IGLetq4h6cqHCD k44kSWJST8XtN0rP4v+D4WycWTOEJsEHm5FKTtELngZKwpIv7al63PmEJBrhk9Mk7dGV 16zUpdVlBmsxKONoUSK1O8GRKIy8YxpBMcQgq5BIWaqifj5qyEzcQx89FrGo/3Rn+Ii3 d6nQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nzS9LAC1; 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 h11-20020ac8548b000000b0042eba376e7dsi6189512qtq.405.2024.03.02.18.20.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Mar 2024 18:20:12 -0800 (PST) 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=nzS9LAC1; 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 1rgbRu-0003EM-F0; Sat, 02 Mar 2024 21:19:34 -0500 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 1rgbRt-0003Dr-6W for qemu-devel@nongnu.org; Sat, 02 Mar 2024 21:19:33 -0500 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rgbRr-0002z7-Ll for qemu-devel@nongnu.org; Sat, 02 Mar 2024 21:19:32 -0500 Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-5e4613f2b56so3105703a12.1 for ; Sat, 02 Mar 2024 18:19:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709432370; x=1710037170; 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=yvtR6Tkj4Ql8rJP4IqTS1f67x9pt9hVmnIoNey13RNI=; b=nzS9LAC1hGCjGIfps6I0hNMDLqgL7Jy6Yza1fpJxuhOVT97WPB3LMb2pfSZ7RhKYXt JQ/OnNC6Gni86ZMfh4cUIhfVYbLqQJG9SxXF6EgFn4IW+9I+c5l12CI81PUabN8JRaa3 7nSDp+kQZEW8zN9UQuan5jsLid2u69128N9bUy0gvya0qYojlwDZbGgaBZJZ3R9eiLNa ATRHFrBBim33ED4Y5wRUINpN6T6rfumNitw7d1JnLRkwXjsBlhExKcOCyAWS0UloOjWY b5ziS9Lzy0ANRkzfLwwf3AMmDVTIBOXAQzyHc+952ezEWvLTh+CdAb5U5RBXnyKMX08+ ujAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709432370; x=1710037170; 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=yvtR6Tkj4Ql8rJP4IqTS1f67x9pt9hVmnIoNey13RNI=; b=W4lxu9UDM5uSov64Kb91drgNopRC2Mo2km9yq3STOmXD5Yl27MKdyq2UrGRM9+qHuC JqMZb2oUUT9w6Xv+In8cljf5NWHynAnTo9OOAVUNlx3C5ZyjsNRSignmZbZb5qycvc17 01jGkb1G/Llv2v1jiClVRSkBrX0JO4xi2ppFNLKnP/ec0IwwhELP6HuNp3JzmXYTveeD T5DgS4m1rJmf1PY6bjmyzlYQ5cy49Ekyu/txIT5zHN7JCukp5M/2tjELw8aOR4RsazOq pZ1DCMbOmCUGKgAwcbne9UXkxD1gDDgqFVJtxQVo3pRV4aCRgOD8Wt54cUICcBP7z4cp /luA== X-Gm-Message-State: AOJu0Yx3BRElAxhR5O8c1aDS9SnoDR+eojbGkLtNA4IUwjBBCJ6OTadf tsb9cSA2gNMqi3tzPFmsyqW0z7cqy7VTX8CYp06EFNvLLkYpWxbHd3eIYC34IyHnXNb713qxhdd / X-Received: by 2002:a17:902:e748:b0:1dd:d0b:6c07 with SMTP id p8-20020a170902e74800b001dd0d0b6c07mr28890plf.68.1709432370202; Sat, 02 Mar 2024 18:19:30 -0800 (PST) Received: from stoup.. (098-147-055-211.res.spectrum.com. [98.147.55.211]) by smtp.gmail.com with ESMTPSA id q15-20020a170902dacf00b001db5ecb2899sm3512578plx.162.2024.03.02.18.19.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Mar 2024 18:19:29 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: svens@stackframe.org, deller@gmx.de Subject: [PATCH 1/3] target/hppa: Fix assemble_16 insns for wide mode Date: Sat, 2 Mar 2024 16:19:23 -1000 Message-Id: <20240303021925.116609-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240303021925.116609-1-richard.henderson@linaro.org> References: <20240303021925.116609-1-richard.henderson@linaro.org> MIME-Version: 1.0 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, 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 --- target/hppa/insns.decode | 15 +++++++++------ target/hppa/translate.c | 21 +++++++++++++++++++++ 2 files changed, 30 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 01f3188656..585d836959 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -144,6 +144,27 @@ 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 i = (-(val & 1) << 13) | extract32(val, 1, 13); + + if (ctx->tb_flags & PSW_W) { + i ^= val & (3 << 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 Sun Mar 3 02:19:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 777645 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp2034594wrn; Sat, 2 Mar 2024 18:20:32 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCURyW5tTgFMaT4v8a7lvVF4CVEYn36tcMdPC/7+hmhzEKwt+Hi4PzPGNJ6Tz6Ymsd8ZDdJHAdqDNv1S+TSt1v4+ X-Google-Smtp-Source: AGHT+IF33ighRxoL4tVpc4Cx72VYmMxDVi9Qimm95H3x6bRjGLyBQ3ODYDLcx6omDyvyScy+MDDX X-Received: by 2002:a05:620a:2004:b0:787:1c2f:b12e with SMTP id c4-20020a05620a200400b007871c2fb12emr5961638qka.50.1709432431835; Sat, 02 Mar 2024 18:20:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709432431; cv=none; d=google.com; s=arc-20160816; b=0FSO2jWfeusgRmIOvw1+ZuzdAhYAd0edLNajhZLEPrytMwnUOHAAz7DuyN+Ln09T7e 4G2lf9WSlmDiG+5j3v1p/ObqyVvVDIgwqAeGWL7cDLWhpwV0n2OZty7l28SSemuDFrjO FIqsM0hc0zWsAPF3OQ8OpZcu0wicPomR+A46G26EtSIon5nvKIOBUy4aQ4HPPtecXqSJ mMkE/lVJaDHjufaCRbGg8WK1Jwkwlab4D7lYu9MMhfwtp/TTQvBPcki/HdWpQycWoKaf UNCOR5RhdJSZDlccZsOTXRJAJgY+oNnUlJZ2a5CNFhEEOrfo8TTH8lGPZuEMXeRn1KSt fZcg== 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=aiPhLFQiO4QN9hKUgYGuIcZ2MtHj3Vm7HTpPgirxlrI=; fh=odZjvFrgMDmfTa4Yn/jVKLPsclS8EzRuPmYcS/SNwLw=; b=VWNBYX6pdBDtGWUXSOVedwxhfHF30oFPIVIfSfh3KdHk/0G+RlrTs/VhD/JRM9gv4V NMaJROaC3Jvmi87gULDjlkNxm2p2E/xiVms3iLxrqnnCirgYkR9BbCXfAc9I9l9w3J46 1s6M5o75GnyvcV8unzg/1aAwiuI6VyNfE87c053Z8CwcwCONkNLgqVC+/3withBsi3/f iJcIVdjHDN8uKM3q0xiQuwHU5XmOcF6aNBSkg1GYi5iB7A5jMPSx5Bkj9S6KDEHFeK3J 9sRqsltvIRzyQZns/N8L9zongHG4n0fwhsHOx3WK2fvT3xc49eP7YPGmsKqZ9lzBYbFp 6DeA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ra8icspq; 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 bs20-20020a05620a471400b0078822f37d6dsi615872qkb.352.2024.03.02.18.20.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Mar 2024 18:20:31 -0800 (PST) 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=Ra8icspq; 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 1rgbRw-0003FA-FJ; Sat, 02 Mar 2024 21:19:36 -0500 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 1rgbRu-0003EN-MW for qemu-devel@nongnu.org; Sat, 02 Mar 2024 21:19:34 -0500 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rgbRt-0002zM-5L for qemu-devel@nongnu.org; Sat, 02 Mar 2024 21:19:34 -0500 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-5cddc5455aeso2774143a12.1 for ; Sat, 02 Mar 2024 18:19:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709432372; x=1710037172; 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=aiPhLFQiO4QN9hKUgYGuIcZ2MtHj3Vm7HTpPgirxlrI=; b=Ra8icspqLhv0v+KWLFeh8NhwIWBmiIyLbhz/Q+E6+DCnNjGKqV9QE8lGbHTABTFiJF CovR+xKTt7xCUKURWxOBrUBi15YBIjW19hp4Xmbo7MDN2YZHtTIjOEWKaCKP6Q63qSfY shNA5XSyxIZLmdsp7xvFnC/QUK+nUzaQWtEkR4+3/YiH9IWCdKn8+SoVMKR7L5LSc0A8 OncYMBuSFm7b3bbrTaDhTw0Bhs5nieM23gssw6Lj2t8yc1wyTvBStLRMuXRAykS7mVj/ GgxCB4dGFKTCbGGtpEdtnd01Ki/VsKxC5j/jo2kCe4iJKlWQHpL10hnc6sCejBvE1qAF tBzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709432372; x=1710037172; 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=aiPhLFQiO4QN9hKUgYGuIcZ2MtHj3Vm7HTpPgirxlrI=; b=qLiFHP3dBSpOEPt2E6NI5fsj60pEua0o4OdIj1kzAjptGKgcYaD7Jkusl00li3N8cG gfFBOcKQrN259EzkvOXNEkXGBuZvh0lMzrNiJn61iwQBc7cGZcX8jbnKeGYpqFaYUTag YQmdwUKGHL4UprkE49L/96GQfm3+UUacjWP79EYylRmn6w3lAZHMR0hyriSpBjVvvqUi 9oK0g+WLgO08+ARqJ/L76KX77uU1ciIT/qxdQk814UN7H9mmHoljK/djoY/SaSYopBoM k1FAbGPIngdpDfElnNu7sKE2V8bfBKB1ylVezFSFduv5B28CZ36u7qL8zlgHgdsJBAvi fKKA== X-Gm-Message-State: AOJu0YymMuNr41VH/vRraThuoaAKP5qXWCJC02YH1h4RXKdabZFFo6fn Cjujp9K1LhFalMmbr4qqhrGtX1SrLt+WhcMwluR3CGjEekbpDvUMwiPCfspYmD005d1pUk7G2Tm e X-Received: by 2002:a17:903:41ca:b0:1db:d66e:cd15 with SMTP id u10-20020a17090341ca00b001dbd66ecd15mr7469958ple.59.1709432371835; Sat, 02 Mar 2024 18:19:31 -0800 (PST) Received: from stoup.. (098-147-055-211.res.spectrum.com. [98.147.55.211]) by smtp.gmail.com with ESMTPSA id q15-20020a170902dacf00b001db5ecb2899sm3512578plx.162.2024.03.02.18.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Mar 2024 18:19:31 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: svens@stackframe.org, deller@gmx.de Subject: [PATCH 2/3] target/hppa: Fix assemble_11a insns for wide mode Date: Sat, 2 Mar 2024 16:19:24 -1000 Message-Id: <20240303021925.116609-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240303021925.116609-1-richard.henderson@linaro.org> References: <20240303021925.116609-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.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 Tested-by: Helge Deller Reviewed-by: Helge Deller --- 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 585d836959..6dcc74e681 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 sp = extract32(val, 11, 2); + int i = (-(val & 1) << 13) | (im10a << 3); + + if (ctx->tb_flags & PSW_W) { + i ^= sp << 13; + } + return i; +} + /* Expander for assemble_16(s,im14). */ static int expand_16(DisasContext *ctx, int val) { From patchwork Sun Mar 3 02:19:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 777646 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp2034659wrn; Sat, 2 Mar 2024 18:20:54 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWYs0zkowdPSk2TR5dQuRMp7GftYgkMmHHQmXByMfYymHraxw9fELLaeyVLfq/J02yoEbqSxtDGDWwhBmr1hJum X-Google-Smtp-Source: AGHT+IHhIx983Pr2YnHGVBeJoUoGLRlhYGDX6+9Ne8+edX6/FMgQT7byjWBj1YGEEpxG9JQKFmp1 X-Received: by 2002:a05:620a:27d4:b0:788:24d5:22c4 with SMTP id i20-20020a05620a27d400b0078824d522c4mr235534qkp.18.1709432454211; Sat, 02 Mar 2024 18:20:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709432454; cv=none; d=google.com; s=arc-20160816; b=ULxG/voDp1v1QTzC8c1L3P0vJlUBVmD0pKUwDEq80KbSElC1wbf4RPhQ9W71NQLT+q FJ36M4AYnSTF7qOBuAxlGcy6frtzu+Qcwg7sMhiLHc4xlNAP5sk+Bs762zBH6otEPE2x MxEaXORbURBtZ76juN8nHRInToiCSkA3nKa5uA+7Gp0MPxqZP3vXFzN9odpPqo/Vz8wJ L4DULcbJ6cednRxbbjI+3KI3O0/LEQE1ecjGrknAlQAoxg/2nnYCvHnA+XpAm8jd3NDm XW+fbrGGXqFA7dvUlen2aUgI0kRDfgIlGWG/ML3BmJNxLxyr8zAijheNXIPYCCQ8Iox5 Un3w== 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=8LKOglf5FLGNH3eaaGAUHPjoI3Xb2uqIPMKgbxeqQ8c=; fh=odZjvFrgMDmfTa4Yn/jVKLPsclS8EzRuPmYcS/SNwLw=; b=VabKhIKfDkdfLlgELIti5bgrlIVYt+qFAQSJOTIYSW+4TKarth2XLTRAdKGJVFKfkY coBbirC21JYQPx5FI+koHXAdhI3Bcztuj4i/rJB0zcO6MgxYKPnGZg1fo+SXK5LTgAyg Ggks94b0cXHIlXRYzqBAuYDSMIzzEft2/g4MxABo7MhVEqAs+MS+FoIko5R44PHKKlG9 6tJBRDw6zMrD1gqdA7fG/gZ7msBkGubk0bHfrOLg0j1PwFZDpZZM/2kKTC9/IKqHedRa SfMw551E64JK1S9sFNvnNuuPhWnj4NbjHOD9dqRemaNjQEZV9GktOINd3+3pkvN2T16z F0ZQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tMTuZwmj; 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 ya7-20020a05620a5e4700b0078823630fcfsi477305qkn.436.2024.03.02.18.20.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Mar 2024 18:20:54 -0800 (PST) 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=tMTuZwmj; 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 1rgbRx-0003FD-05; Sat, 02 Mar 2024 21:19:37 -0500 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 1rgbRw-0003Ep-1f for qemu-devel@nongnu.org; Sat, 02 Mar 2024 21:19:36 -0500 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rgbRu-0002zW-Cg for qemu-devel@nongnu.org; Sat, 02 Mar 2024 21:19:35 -0500 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-5cfd95130c6so2164717a12.1 for ; Sat, 02 Mar 2024 18:19:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709432373; x=1710037173; 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=8LKOglf5FLGNH3eaaGAUHPjoI3Xb2uqIPMKgbxeqQ8c=; b=tMTuZwmj10NM24NXStl1ew5nWUGdUiLvW9Ekyp0LTUoJ45nzuDEYAHUeNk6n4CB3oT l1v/WJcJkp4zjPDjx815fjJ9tf2BGBygqte4gOddtOxLF2IPKU8wD2iJsj9hzZe+WVBm KfcRl/sHowaYJLfoSHsXa4egdYGimc7mMVxBV9aSo4sJZ6JOPtJ2+tbb2Wiros1sfYGf yYqRtaggAF2KG+InYAFdnR1W+47TTI0VNj35lldVDW8DfnIBy+SmK0oG5ditiivLb78e dNTrD2rQmKS5sIpIdEwWR0g6gVTM+CFf1mnHmZgv8X6kqZAzxDSemN3/3Ov8D1nJX1Sn W3+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709432373; x=1710037173; 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=8LKOglf5FLGNH3eaaGAUHPjoI3Xb2uqIPMKgbxeqQ8c=; b=PYfUIp/EoIpOFY1kMaoRfPdM9w6ZAiXHrua0dOV0pzlmIGCFG4EZKea5TjQv164y/T zH5HZXnt3w3tFlvigcl4RGxpiUrsKq8FSv+hRp2bJN7EzDMJggCD0GvlpZHGXJo16hKL UcCSm6xR20bkoN7UP3vg3y4NIRR/8/cjzxnzf/cFtk1/acRFxBUWwzzfzhsUn4ZpjqQc Sh8cF0MeYlMTMSulWhIUSbj0PpuVFj1BOrt44OukT1w+rTm4i97bIZI80mobbS4jBLcs SiAEn8Rf/hucEkbKpnN8ODw3/CK2TjfoZ1xp1N/iN+6biYR1daV01sAkBo5miI+3tMFf Nn0Q== X-Gm-Message-State: AOJu0YyyGeBondThlSV8rKh+EcemgBtswElRQdLcq4qfxaqifda1dl8H ClViyc3EvGX/89xSNskDK5uHDNXJK/yW/zwusEMojDLgnRd0Y94yye3KxZwd/PTVKMpAzlM1Trv p X-Received: by 2002:a17:902:ccc2:b0:1dd:159:e2e7 with SMTP id z2-20020a170902ccc200b001dd0159e2e7mr1916922ple.39.1709432373142; Sat, 02 Mar 2024 18:19:33 -0800 (PST) Received: from stoup.. (098-147-055-211.res.spectrum.com. [98.147.55.211]) by smtp.gmail.com with ESMTPSA id q15-20020a170902dacf00b001db5ecb2899sm3512578plx.162.2024.03.02.18.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Mar 2024 18:19:32 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: svens@stackframe.org, deller@gmx.de Subject: [PATCH 3/3] target/hppa: Fix assemble_12a insns for wide mode Date: Sat, 2 Mar 2024 16:19:25 -1000 Message-Id: <20240303021925.116609-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240303021925.116609-1-richard.henderson@linaro.org> References: <20240303021925.116609-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.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 Tested-by: Helge Deller --- 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 6dcc74e681..1ef266c403 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 sp = extract32(val, 12, 2); + int i = (-(val & 1) << 13) | (im11a << 2); + + if (ctx->tb_flags & PSW_W) { + i ^= sp << 13; + } + return i; +} + /* Expander for assemble_16(s,im14). */ static int expand_16(DisasContext *ctx, int val) {