From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751547; cv=none; d=zohomail.com; s=zohoarc; b=JzcP7OelMmogKZuQStr/w8rVrtfkcYARsDS3oqZkS0yPWxvVQ3VIabcU2dDi7X8wlCDmrEqQzG48myWgXYZys2QGyR38AmoMkaEyXEmqP5hvWK/9XgbIX+ryXlYUHGW0CRh+ZIrvW1i5gzBSpF4g31+heiJ/B1yMp+SR2sRRQJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751547; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3kIU3JSkECGRrhdZz70XwC7c17Krm7Zw1Xd8qBgKizs=; b=HVRP5q4aXlWMJAu+4h6nu6LFGIUzEvS7xPNr58TzkXwrFPHJfvdjAnUVA8tCEdU+26mwUwktMvxKD54U906a+eTy/MkcjMO08unpJDxZ5+Fk6u0ctOytwEepvLCZFv73JBFyV2Mt4I28pGnWuyD3JrpQ4aF+qdB+CjK2dk8tJcQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751547573300.1696258666351; Fri, 29 Mar 2024 15:32:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKkz-0002XI-UT; Fri, 29 Mar 2024 18:31:36 -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 1rqKkr-0002Va-8I for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:21 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKko-0003Ug-1J for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:21 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1e00d1e13acso17037965ad.0 for ; Fri, 29 Mar 2024 15:31:17 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751476; x=1712356276; 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=3kIU3JSkECGRrhdZz70XwC7c17Krm7Zw1Xd8qBgKizs=; b=hIedfRjeT+5TI3n4efkyBI4fnygGBLhxUxepwd/3tf4eqgigko1aStEgsu7LHZV1Xz kxaryZFGKatWFR+bGiBjBKHd0R9tCKNNmqeLlt+YFeFswEYS9db1bCSvVUgh4VYIldaX UiErhFXh/bseotkxcim4V7WhIQxsjaXyptgagcLxgevyrHUoKGKWuq2Yj8N2h4nONxVE /624cNa1GWs1pBf3JXZPtSNN5S/7OC3jI9QOlLtaeDwBhgOvPpckuqXfReX6U6SKz+SI n0BZz07mZkzoAUABP8ndj7C5rzdAc8gJM3yA64zKR0HK6XeQriY7pCYngdgUosYd4URb cyjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751476; x=1712356276; 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=3kIU3JSkECGRrhdZz70XwC7c17Krm7Zw1Xd8qBgKizs=; b=V/UVuTBNntisEdTnIy8ujd6Nraio2inRLvPHfVq1A2fXU1VERMNvxKgvS4QgtDmBoa hb4xBU6pYLwm0XNfYX+5mss7PX2R2DNn8soPB48XI1+bAq3JNxG6Y/ttgatdAlcILxjl 7+pWpYYvuU5bEj4IizqiHb3+oJhLCpJM2Nbe2Wtni5v17x8KBOMu6OevCYAUuo+8Eoyc A7vEYYQ77LynGLj2I42p2CU/iOEcLp2xyTp353887EFW5hLC9SzbasVd0FNKGhFr6BMM vAe0u5LbEOaCVVUObukoZQJZoAQe9lyIj0G1C69VQEAI06MiuEiUOH11AEqm5PrGGxmW m7qA== X-Gm-Message-State: AOJu0YxldacCD6GjGpZM4+2inSZQL4g13XLknetsPHXAAoqvGhVHlNqT wPdAkcm2Ci9OJa7MttMzGOuWeyxpQ04q7XDamFWXYurXNdh3TCqI99KY6CMjpPOU6aYkFqh3mpe k X-Google-Smtp-Source: AGHT+IEPSMBaFLftXti90DEYSinR1KWyC41wq9D8uOkg8MDpdgXWaiEy1RDUtFKQABa8QDbdR4oiCQ== X-Received: by 2002:a17:903:444:b0:1e0:b04c:ec60 with SMTP id iw4-20020a170903044400b001e0b04cec60mr3514278plb.51.1711751476527; Fri, 29 Mar 2024 15:31:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 01/18] target/hppa: Fix BE,L set of sr0 Date: Fri, 29 Mar 2024 12:30:54 -1000 Message-Id: <20240329223111.1735826-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751549632100013 Content-Type: text/plain; charset="utf-8" The return address comes from IA*Q_Next, and IASQ_Next is always equal to IASQ_Back, not IASQ_Front. Tested-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 19594f917e..1766a63001 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -3817,7 +3817,7 @@ static bool trans_be(DisasContext *ctx, arg_be *a) load_spr(ctx, new_spc, a->sp); if (a->l) { copy_iaoq_entry(ctx, cpu_gr[31], ctx->iaoq_n, ctx->iaoq_n_var); - tcg_gen_mov_i64(cpu_sr[0], cpu_iasq_f); + tcg_gen_mov_i64(cpu_sr[0], cpu_iasq_b); } if (a->n && use_nullify_skip(ctx)) { copy_iaoq_entry(ctx, cpu_iaoq_f, -1, tmp); --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751547; cv=none; d=zohomail.com; s=zohoarc; b=ANCXYaX01jYE6jrYopv/kfkUPE3EUlKvrfVJoEMzAEOxyJ2aBg0Pg3HcujYGKk5xU2/Op/4TXKlkQZvSq0/WxbjzTrBs0FOZOw1Sp3tKixMcKz7VwFyWkOfAciWFo/XBH56ZWwWZzbdILf+6MdjWbZvevSdRpw9JSZ5Mcu2MVT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751547; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zUaBJKSO6H1bbGryp1PQTqH1TE2lEnHyVoVrY4Z6LJ4=; b=W1qmI97h4iHyyYTrJErGawbUaJxVumiDaQY1w7XVjz1yQBGyMqFRHM3pbj9wRLhiooWGDiR5ZB2OSH5pyoV1qQ3oGoquGYw618EVbR4l70p23DDsqnRlnZCP3dS5XO4BoHgChQl+YeJUiYG6WpzuhkxZtPcHCKC71uc+68gAej0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751547272311.98292131796745; Fri, 29 Mar 2024 15:32:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKkz-0002XH-UT; Fri, 29 Mar 2024 18:31:36 -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 1rqKkt-0002Vz-TF for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:25 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKkp-0003Uq-Us for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:22 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1e00d1e13acso17038075ad.0 for ; Fri, 29 Mar 2024 15:31:19 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751478; x=1712356278; 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=zUaBJKSO6H1bbGryp1PQTqH1TE2lEnHyVoVrY4Z6LJ4=; b=YMbDbEwa44L2LhoZinm+P7gyCr76Y1QyIPMHQ3yw2mHqmERJsfQOLG4NDOMt92ixhl ZhcylLUlPH8zmyvISWYquIsB/4mZuBFDqU3N6h5ylxJQFLfZ7kwaC/QL6Ucl2ie/cyj9 8l1ky79rqj20dlb0wMUW5zjum16YSrus1uGcke7cE16aq6LquAyBny72QVQQvcmLt2AJ dUWH0XW3aFxu+hhqeML6E5moYi4vwOzmEk3xZNnDJB6BgacWNDGHg76K7wEsnnVhVWNE OH7Wl0A3l4doPB5dE4fGFemVXBh+02xXmNcLgM8wlKbdqn/iNWQPcaY9ZMFJcFkiSfFp nngA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751478; x=1712356278; 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=zUaBJKSO6H1bbGryp1PQTqH1TE2lEnHyVoVrY4Z6LJ4=; b=uy7L3kdZ7njYibtL7iuZMlJUFMkZSizCwMqOQneYS0Gwog+Lke48WqPv3M/Au4OeZ3 4vhwwv/NeZ7VhY3zJ767FxPXjgusfIS3P4zG5QMTnfouvpgrHmCf/yMPWUPeyPFWYhcI TaF313aDbu3h1koeKnUVGUaOI7kBaQuaobzQlg/ua9trkPTk6zbWzyJVYKH5Wz781Z3t FIR5LKW+RKMFkbklZYzRUnWe2KBMhDKkohcDgEf7sidxHYD5nOdTNrq6i7HwCXqhgfKE y/htjJzX/fyHgE0sv0QA+ZwzCp9i93l6tdLBTt46m4GyAl/WVE4G74irHbMS+HDEiEmb ELNw== X-Gm-Message-State: AOJu0Yywz+NOJZ7US0DO8Za/fzFOIl0nJQwduUnVyFSPExvwDZdOiUV8 EpNTwGmfUHbCxZA36ywq4SKvpHnYgIq/BE5XXji6qLSe3qWZ2hK27RDF9By+PjcsbfYDTorh78c 2 X-Google-Smtp-Source: AGHT+IH6uQQKd06nVO8zs1OKfCZxzzXj/fc3gGvrXNcGBRV5LsGwBooSKsXY0n8EBn4uIPf0w5Pz1A== X-Received: by 2002:a17:902:6546:b0:1e0:a326:e89e with SMTP id d6-20020a170902654600b001e0a326e89emr3307183pln.37.1711751477989; Fri, 29 Mar 2024 15:31:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 02/18] target/hppa: Fix B,GATE for wide mode Date: Fri, 29 Mar 2024 12:30:55 -1000 Message-Id: <20240329223111.1735826-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751547686100001 Do not clobber the high bits of the address by using a 32-bit deposit. Reviewed-by: Helge Deller Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- target/hppa/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 1766a63001..f875d76a23 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -3880,7 +3880,7 @@ static bool trans_b_gate(DisasContext *ctx, arg_b_gat= e *a) } /* No change for non-gateway pages or for priv decrease. */ if (type >=3D 4 && type - 4 < ctx->privilege) { - dest =3D deposit32(dest, 0, 2, type - 4); + dest =3D deposit64(dest, 0, 2, type - 4); } } else { dest &=3D -4; /* priv =3D 0 */ --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751579; cv=none; d=zohomail.com; s=zohoarc; b=nt6qO2C4u3h7DGczn1ko1IlM6jlKAGUWupPfpE46oIiFaPaMI0VuIyjzk4yI6B/Wo/47JPx9q7NJz/vQr+kwJcMwXdSJHK1gw5K/dEjLySe/0louZFsvN3iIJ1mvB3PGAFR7WPJYXWDgPYcmXiE6LyAGryeAE4hoxDDl3wFQ34I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751579; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=S0QfsALuaN0+wWbot0bFHlDdwooZi0EKVcDM5oK6qSA=; b=PurRoaqPMrFqaiIF+v1Sz4MBJxYUiIvoJvJXZQw3fcO9uhUsZJ39tlS0Jl9czABV39N7WLT5emtuxGu1OrhdnZPjoVWCBOC3CnyE9iNzaKidQwY4ig3R+jB5fie1TQl6ypMqMCL4PhG9DcqPX9RPiDHDqnCHylZ4DCITqrATOA8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171175157942597.35313015541578; Fri, 29 Mar 2024 15:32:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKl8-0002aH-Bf; Fri, 29 Mar 2024 18:31:41 -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 1rqKkt-0002Vy-TD for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:25 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKkr-0003Uy-0b for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:22 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1e0b213efa3so21814295ad.0 for ; Fri, 29 Mar 2024 15:31:20 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751479; x=1712356279; 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=S0QfsALuaN0+wWbot0bFHlDdwooZi0EKVcDM5oK6qSA=; b=E2BZFz8X9Ll812UVTMSHE+x1+FFkAY8CiSNNE4lozFAve7Bq0y37R0+5uojWS3G9/J qAY/9aapIWp19VuG4IyUMyhJRS/hOT1wgh9Q9YFSDXSrZ15RObouXfCZgBCz9BHJHrWZ Jm2x+Ki/AIAO6T2lo9xoMIHvOVvqFMs+jlM5QSTUzYoIHaqdIiqQ5aebyQ9oOjYPN95t UXc11kTREtCikPGVYATwk/ua+p0zErKcmyn5gFBLdOXNRj+YmOY+BUtqDXTjyKs48tIg /f/eFuHY7Yzdag0e+UkMHR3rLL+4JxQ2m8wbMM6hpvwbmnVERPtYSOSuOiPphg1LpDOi /CXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751479; x=1712356279; 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=S0QfsALuaN0+wWbot0bFHlDdwooZi0EKVcDM5oK6qSA=; b=l7Ii9C24xM9qaJf1eVb5EcUam0vTJiFtEZzjPTKLARcvSJCEKtffMI9aJHCOhm3c2T RB+58dKnraAQALBrboLcAIRKdBQQUmABn1kSDe6IpFiv4h41jSf+XBFBQwcY6XKrbCCG veWfJa3qVxKrtUQikP7Lx6nGcFIgLaJRNG4uIcBrF0Y2dj8dfydoGZc9mGkTHlSp/5IM cTnnjuMjJTc8//zyNkhQ5CogzZUz8mls352IDEQngEWPD/3L5ttEpiMz0gTu8shN4QN0 7tDqtSoT4B0atLn2ab+55+iJZwSIddAB1irn9qv8GSTFhpGUjF+H6gmulPmGHmZSL6iA qWUQ== X-Gm-Message-State: AOJu0YwOxusN/LnwLS6b5u/dWev7hkQ0GNL05hvSBqWOFYbqoHlwzlSu +4iKH0R0SuOu2kUHys+telAPGw4fiahqD9WFsWUltcQdFho1EbHvx8NM3VRflM4pmJSDzeHMkxO s X-Google-Smtp-Source: AGHT+IHUL0UQkStIFR8EEn8tksKpQw+pyMGfzB4ERbnaiud/Bdf/8vf+lc0OWKteXtpIrOnGtNIKUg== X-Received: by 2002:a17:902:d508:b0:1e0:cdbf:24c2 with SMTP id b8-20020a170902d50800b001e0cdbf24c2mr4463190plg.29.1711751479284; Fri, 29 Mar 2024 15:31:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Sven Schnelle Subject: [PULL 03/18] target/hppa: Handle unit conditions for wide mode Date: Fri, 29 Mar 2024 12:30:56 -1000 Message-Id: <20240329223111.1735826-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751579729100001 Content-Type: text/plain; charset="utf-8" From: Sven Schnelle Wide mode provides two more conditions, add them. Fixes: 59963d8fdf42 ("target/hppa: Pass d to do_unit_cond") Signed-off-by: Sven Schnelle Reviewed-by: Richard Henderson Message-Id: <20240321184228.611897-1-svens@stackframe.org> Signed-off-by: Richard Henderson --- target/hppa/translate.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index f875d76a23..2cb91956da 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -967,11 +967,22 @@ static DisasCond do_unit_cond(unsigned cf, bool d, TC= Gv_i64 res, =20 switch (cf >> 1) { case 0: /* never / TR */ - case 1: /* undefined */ - case 5: /* undefined */ cond =3D cond_make_f(); break; =20 + case 1: /* SBW / NBW */ + if (d) { + tmp =3D tcg_temp_new_i64(); + tcg_gen_subi_i64(tmp, res, d_repl * 0x00000001u); + tcg_gen_andc_i64(tmp, tmp, res); + tcg_gen_andi_i64(tmp, tmp, d_repl * 0x80000000u); + cond =3D cond_make_0(TCG_COND_NE, tmp); + } else { + /* undefined */ + cond =3D cond_make_f(); + } + break; + case 2: /* SBZ / NBZ */ /* See hasless(v,1) from * https://graphics.stanford.edu/~seander/bithacks.html#ZeroInWord @@ -996,6 +1007,16 @@ static DisasCond do_unit_cond(unsigned cf, bool d, TC= Gv_i64 res, cond =3D cond_make_0(TCG_COND_NE, cb); break; =20 + case 5: /* SWC / NWC */ + if (d) { + tcg_gen_andi_i64(cb, cb, d_repl * 0x80000000u); + cond =3D cond_make_0(TCG_COND_NE, cb); + } else { + /* undefined */ + cond =3D cond_make_f(); + } + break; + case 6: /* SBC / NBC */ tcg_gen_andi_i64(cb, cb, d_repl * 0x80808080u); cond =3D cond_make_0(TCG_COND_NE, cb); --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751548; cv=none; d=zohomail.com; s=zohoarc; b=DF6woZyG0hF+ZPi+0hkxSBfVF3/n37T2ZkpwfbjiMt1Qx+hQJ46SIJj3O/dv5dnKrWCa90fKlETu0Dh/UJlugpvwi38SO2eObsJ8FRZCAR+Ex+S2FIxfLlj6TmgI0Iz5c3W0dZY5SH4mHH2qzoFuh79Q53SvQ7/oeEXW837HMYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751548; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iCXMa8NXK4SslxAJzO8oJ4YsLhlZ/FlXinB3WAZag7c=; b=cqfJRi0r/Tjzt87eyxWyS4RCEbLPxHWPNgAmzaQk719+8aeuwRqGxk7lZDYzfVtbXkSW8vo/t6O8Par86F7AowPujRgZ5MKurXfC02yyZFqtPzqiOiupGw8dUufQERiGq2354dorhwO0sVXQuvrTYzqCB/Z79t009u8VBXYUmAM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751548805203.34682433903788; Fri, 29 Mar 2024 15:32:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKl7-0002Zq-27; Fri, 29 Mar 2024 18:31:37 -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 1rqKkv-0002W3-3V for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:25 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKks-0003VH-1p for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:24 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-5d4d15ec7c5so1734906a12.1 for ; Fri, 29 Mar 2024 15:31:21 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751480; x=1712356280; 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=iCXMa8NXK4SslxAJzO8oJ4YsLhlZ/FlXinB3WAZag7c=; b=tLImgu+58HnflaRw5SS2lfQQZs06avrVcNc9Burbqh84B3sRVJoiAzumDMW6zeQJMV jJ8dbVdV+ezqCjF2Sb8BQHpGmN7z/wYbqMj1VvT/Xsc8QUglzjKIITxbg2RRzDhTni3x UFZaJNoBsmwAxE/+mwNvfFEdZPmQm85C4FC5FRyFIj+/M0OKTat8dnpaZOp0RHxMNwuo R69SRPeXKGyZLEBjVg2RqZkDBlupj9rj4oYI7oWLUVJGtmQFo7LoLyEeBc+DS7G5I7l4 DHGUw695U/zpx1s2Q8QeZv2FMLDi/TtmnAmyptMRJSiZeQvXifwsHnlw0iNUu6SDqbYS JP8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751480; x=1712356280; 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=iCXMa8NXK4SslxAJzO8oJ4YsLhlZ/FlXinB3WAZag7c=; b=Yy6vtj98HtZPCqo3l/86cEbqjI/tQ2XZGkl+WK9bBg0Lmw5dT0/wdk8BvmbMoGpgpZ 527zHqsRUXuBPGX3NC48cHKDRnRYj9nsWAFuT1PH58cE2wegU73dqYhQdyL4khyYsi06 42BHupxEqhZuTfIav8CHc9Ma0P38QN5XAaMa27VFFIk4CQYi/ApkDJZPElzxheFq+Qa4 oqrEbQgAEPxdz99DTHNq0M+fbi1ycGKZ9yhvwMmuDUEPwJTbwWpcXyuzGHmDmhwQlrVX BOjKUTiuRsoutOiFpsD3jLqyDBc9m8r13XXJQZgMzpQKsCzYQJBKrg7Jp1MCHpHjCskS W4hQ== X-Gm-Message-State: AOJu0Yyt+7ECMJaMieK/eAmCMNrfVjgwWPq7iqF6YinLlGYk2JA6elFj s3ROXNpoC1oQvRcy6O5nPMBVOYs2i9+POno2BdNCJ0QmpMpa0JpwNPh+Uzh09d7xP2Dd1p13DG9 x X-Google-Smtp-Source: AGHT+IFQjIqPyEOKv8xWalwOwxsuCGQlqPv7NbrQhcjSlhCvUvsPHctVqPGMoXLd/AlTzfWPo6ywRA== X-Received: by 2002:a17:902:6506:b0:1e2:1dda:262f with SMTP id b6-20020a170902650600b001e21dda262fmr3552634plk.32.1711751480562; Fri, 29 Mar 2024 15:31:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Sven Schnelle Subject: [PULL 04/18] target/hppa: Fix ADD/SUB trap on overflow for narrow mode Date: Fri, 29 Mar 2024 12:30:57 -1000 Message-Id: <20240329223111.1735826-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x531.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751549694100018 Content-Type: text/plain; charset="utf-8" From: Sven Schnelle Fixes: c53e401ed9ff ("target/hppa: Remove TARGET_REGISTER_BITS") Signed-off-by: Sven Schnelle Reviewed-by: Richard Henderson Message-Id: <20240321184228.611897-2-svens@stackframe.org> Signed-off-by: Richard Henderson --- target/hppa/translate.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 2cb91956da..ceb739c54a 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -1126,6 +1126,9 @@ static void do_add(DisasContext *ctx, unsigned rt, TC= Gv_i64 in1, if (is_tsv || cond_need_sv(c)) { sv =3D do_add_sv(ctx, dest, in1, in2); if (is_tsv) { + if (!d) { + tcg_gen_ext32s_i64(sv, sv); + } /* ??? Need to include overflow from shift. */ gen_helper_tsv(tcg_env, sv); } @@ -1217,6 +1220,9 @@ static void do_sub(DisasContext *ctx, unsigned rt, TC= Gv_i64 in1, if (is_tsv || cond_need_sv(c)) { sv =3D do_sub_sv(ctx, dest, in1, in2); if (is_tsv) { + if (!d) { + tcg_gen_ext32s_i64(sv, sv); + } gen_helper_tsv(tcg_env, sv); } } --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751574; cv=none; d=zohomail.com; s=zohoarc; b=j+NQcudo7FXIrXis6t8tYilCYaF1JP5uMDxoYT+EpyhNF+RuAkAHG0KqCeFywcLwhjQDm7jjVOx2B7LDD+xy/TcBjSucg2odDYuWZvygX1VTQMqE6ugx3h0xfkCiGPepPvyersQiy9sM0NLe/0aLbFofzYAgH3CHkldaLnOycVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751574; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4HCtEnOimuoA4trumoTnA/CP5fOcqoSfBq8bXqNwYa0=; b=nb5PtEXWbsGyES44++w4YiaPlSwvMgZuJGcml8S1DRfqC3b4X66sQJYBiZkSmFaRK//octqw/nd3PsXnaU7DjPeKmVrVkjvj9qpuwMfjXVzKDaCC4gQs9u4fj4B7pJYDzhcEu6qmTJOcRZaCcyDEWxRHngbD13BigcZdO7Y7TQM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751574171717.6617107027928; Fri, 29 Mar 2024 15:32:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKl7-0002Zr-1m; Fri, 29 Mar 2024 18:31:37 -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 1rqKkv-0002W7-5H for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:25 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKkt-0003VV-M8 for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:24 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1e0ae065d24so21059115ad.1 for ; Fri, 29 Mar 2024 15:31:22 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751482; x=1712356282; 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=4HCtEnOimuoA4trumoTnA/CP5fOcqoSfBq8bXqNwYa0=; b=nRFtev9E4MYBmpSupyLNQR7Dk+3wfBjLJMQdAXsWpyuell2JQCsGSjK3ciDTotVVfl J0duTcIhCQtypLAHSovrnRaar/0UsKM1eoxQlsebBrt9h1esywaMxv9DUqSCMY7747Zn n7UL7obZaJqxLa5t7fYXODj06MGtSLZJMu55L1gJNnMKWYT1PjKudDYJyh4zKVXvXXyd xephYatKRdBlsYm18NE/VFT4naO6/YfNnTfXg2k4cKE3JDhZPkJhIDaijQKwU3Vd7nvc SqfJL7r41AIzEGCRV0NHE0dOtvCtji91wALytnSvzniFUMSNfGHudhPsyt3htV3Lz0B6 8q2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751482; x=1712356282; 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=4HCtEnOimuoA4trumoTnA/CP5fOcqoSfBq8bXqNwYa0=; b=k0bTBZTBVrIjmM/rc1eC0ifGROKGqTYFcXq/8h+np/bYU/K+IS4+1sP+i5cpx9xDzh 3uvOA0aslNE2C2eXZhcCiRwFXBQ4fOuoYouTMBFx73HqLtm6vFQj94gHAu7UvZY89lQv NApAffdShEB+nCPp45x2hcC7L0MswBwyYy3Jfkvz90N58ACarcsPEUbg/sBup0T/hkkh PVJu9mdDantgV+PELzWMFdSf+ZMtnIMwUlrgLXMm9BmkvIA0Z4HABSuldq3vHujf0Mt2 jiExIzC2pBSgJ4aUmCwDphKABYMLi0WKQpE+ElKbnbVsWzq0sq2XdCpxdSVTCzXqSvx7 +q8A== X-Gm-Message-State: AOJu0YzV6TybjD8edwxrAK8JqYWEgzf6xKJ8OGiUxA+Gg2vCAxXE3tru bpUzXzGjapAxHVFwWmm8vRLP/zEm+eJZxPJ09f34h6MTDcmI8gFK87+6fhDITP2ydQwgOlamzvT U X-Google-Smtp-Source: AGHT+IH3K5ssB3JDYEYORgQuF5kJ6ajhsshPqKO8AUG6KHHCybY2EVo2/UZFVi5z21GkdADbeMdVrg== X-Received: by 2002:a17:902:bf04:b0:1e0:115c:e03c with SMTP id bi4-20020a170902bf0400b001e0115ce03cmr3345989plb.53.1711751481781; Fri, 29 Mar 2024 15:31:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 05/18] target/hppa: Mark interval timer write as io Date: Fri, 29 Mar 2024 12:30:58 -1000 Message-Id: <20240329223111.1735826-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751575710100001 Content-Type: text/plain; charset="utf-8" Reviewed-by: Helge Deller Tested-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/translate.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index ceb739c54a..8c1a564c5d 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2162,6 +2162,9 @@ static bool trans_mtctl(DisasContext *ctx, arg_mtctl = *a) =20 switch (ctl) { case CR_IT: + if (translator_io_start(&ctx->base)) { + ctx->base.is_jmp =3D DISAS_IAQ_N_STALE; + } gen_helper_write_interval_timer(tcg_env, reg); break; case CR_EIRR: --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751568; cv=none; d=zohomail.com; s=zohoarc; b=Hdyq8th3vroJwpPFtoSiZ5Ied8iJzzjkOXp5OC7lMbVyl/D3PM45RtUJpsKkkBY25gCqrO1Oer37tyXj0koqP/yQez52MKUbw8otdrYxh7VsnRUtQkUvgrNDzbx5xeKsCqzS5Ws/T8fa8EBODPgi7xI1sqOtG0Rzhuam/yUn8L0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751568; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rTAbsZOgycJ6347QzcFwwaG8+pgXG7uj80wvUu+rRqA=; b=bfFe1gmv/yBz4ZETsBFfvO4G17z9bBM4HSDgRVoB/oXFZbQb2vroDSJ4/0wV/90Rp/cOp5eqQ4VTsqc4BG42BOwTuZvULP+lC92ZwZZynyhtgOPfSOwXwQ99nFZyeSqYlC5OFLkY3YyWqYYfycRTZ9Clk7zOxlr2oH6l2EUXKiw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751568918485.3356194105098; Fri, 29 Mar 2024 15:32:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKlG-0002bI-0P; Fri, 29 Mar 2024 18:31:46 -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 1rqKkw-0002X0-ET for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:26 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKku-0003Va-Ey for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:26 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1e0fa980d55so20854405ad.3 for ; Fri, 29 Mar 2024 15:31:24 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751483; x=1712356283; 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=rTAbsZOgycJ6347QzcFwwaG8+pgXG7uj80wvUu+rRqA=; b=mhaiQmMI0Ot0cDeEYTl33jugXqoui9H+0aq/0IljP54efufFGzv9EMu26uGOarG18/ V/tq7dtq2N6EBM7BskpdocEl7krlM1cAfSJzgfl8CoaDOGgeHD0KCZ403lbgIxgNRvjV J8n8uVd/ZDzgphOtiJnZHTnnZDcPlhf+zAaTOqk+HzLCLybG1jpR2aYPXer7n7+fs/CJ 7A5yxmooZHBimK+8KCWiJ3OkkEvXbljDVgQPM8ATQ3bTqlqtiCT37dfXWF94U6iz9xBy 6Xd+oVwZT+aSR+UrnudSpZ55PcwQQnpYYquRIJFmUdruC+8uxi/DA6sVru8gOktZhbV3 FjDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751483; x=1712356283; 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=rTAbsZOgycJ6347QzcFwwaG8+pgXG7uj80wvUu+rRqA=; b=MQlv1mAubfVrkcB1xCzc0HYr94YC0fp0GwkNWKNjUXhUsavW6RILNBlyCizHwCohPV Adp6CbbdEX4GF7I13JasX3z2/iEQ1Zf5w22vAIL7QIvtaDJvAP5xpHdUf+Ccvr/Y3d8U 43gA0XC8uJkIA1CykNpPRPEvkWlsZaGGX3OIPFF4VuFWW/inRVFD0xv6tJVjSZdkUM0F srJ7Q08bzEd/jLuW+oALY8rQAoSCAdtyLPf4no3kcNH697TdHdeH31BvmVSKw7xQaN/g TYF9MWZ2Sj+1kjMvtFtDHJU0c6K6Z+q9s8tS6+Rz9tRuaa1/YJT4DDHueASJ5TMeVvjJ gCBA== X-Gm-Message-State: AOJu0YyTmIbwFnklRq6xoGk85EQNRRa/p6Rr7o2rEGTxN+2W6Vcw94XB FgCSeM4WCXFynojPDy8q4gyyK7wyns3s+NbTgy2aEsKKhmEPbFGn1GeZkKYAWBXncTrTdgm1U1T d X-Google-Smtp-Source: AGHT+IE0D/s7lct38ADwCqw97UzkeGmGWLLdFzHnzvhju1z2j75McBU/bZP5JKIEiLNsCbI6Fg8qgw== X-Received: by 2002:a17:902:c406:b0:1de:eac5:9294 with SMTP id k6-20020a170902c40600b001deeac59294mr4119264plk.13.1711751483094; Fri, 29 Mar 2024 15:31:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 06/18] target/hppa: Tidy read of interval timer Date: Fri, 29 Mar 2024 12:30:59 -1000 Message-Id: <20240329223111.1735826-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751569695100001 Content-Type: text/plain; charset="utf-8" The call to gen_helper_read_interval_timer is identical on both sides of the IF. Reviewed-by: Helge Deller Tested-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/translate.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 8c1a564c5d..5b8c1b06c3 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2082,11 +2082,9 @@ static bool trans_mfctl(DisasContext *ctx, arg_mfctl= *a) nullify_over(ctx); tmp =3D dest_gpr(ctx, rt); if (translator_io_start(&ctx->base)) { - gen_helper_read_interval_timer(tmp); ctx->base.is_jmp =3D DISAS_IAQ_N_STALE; - } else { - gen_helper_read_interval_timer(tmp); } + gen_helper_read_interval_timer(tmp); save_gpr(ctx, rt, tmp); return nullify_end(ctx); case 26: --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751615; cv=none; d=zohomail.com; s=zohoarc; b=foM4KkDN1eDyRMTc5Wi0uXwwFJqWagkEOBfSSWGKw8LmDmq71U8eYjERo9mMtFRPBedZnvtDaKGvBBbJnNEEZbXyYq3JMuVloagEE8imTUgG6hqlw/526IhkOFlxSRL75VFy+eExM7Ul/pGCOQJuwOkoLV5PDTfilkYX/Gw4Y9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751615; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+aKcsx9JEOh52ndAdHyeqzgetKk3eTEnbQJ4vqbujCg=; b=mPfojmP/UrHilBSd6RXdma5VwxRY4KxyVb3Y7FYV95Gin/lVHM4lCb/eeddPagcSzM20V2jFqDKqXdDh+B7m+1oNjg+3kH+YQ1nHKQrF7q6W0FxOQUKe/zATwBa+zSHI45nGwOF+HVsDZ7pCg0NoBUXpbbPqMhBxHnY1G8ESQVU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751615699371.73050326836733; Fri, 29 Mar 2024 15:33:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKl7-0002Zv-Qp; Fri, 29 Mar 2024 18:31:37 -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 1rqKkx-0002XK-Kg for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:28 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKkv-0003Vr-L8 for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:27 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1e0bfc42783so20766435ad.0 for ; Fri, 29 Mar 2024 15:31:25 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751484; x=1712356284; 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=+aKcsx9JEOh52ndAdHyeqzgetKk3eTEnbQJ4vqbujCg=; b=wMA0iGpu2cLOuysjP68A9Al3LryRGIua/rbMTOTHgdtw+vwMd1SdFbIywEUAV1PfJ0 qoPFd0HPb+2FOrwliPKv3g+tM6bxWh9jrfamh2Y/GjXtfFaCRso6bATzaSxhwdzG71TQ A8dGHn44WaOAm9g1PV5I/wwsFvbLsZ8b+cZ3vwnAa+fmMxiHobYhgsKsFIkKNGpCTqHq SWO+A4ZiyNJRW6kCecgI5Rw0kEoVlgHeoB9qP+d0EKCLlQ9+Bd/AWcbImespMJMe1Q6a u5p6rP88pxKczzvh36leQ5FlLk6/b27rrb7ge3HO7QveUwAxzqo5pk/RQgJ+3c3uxiNl qqNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751484; x=1712356284; 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=+aKcsx9JEOh52ndAdHyeqzgetKk3eTEnbQJ4vqbujCg=; b=p4yJ8/XXIi8OeFrNbFpJaZ9hRiPaunHQpll2UTDmwD2F55JIU0Pi69CFfnIG7HGhF6 rNXOFdShs1EeWXRHLBgTKirKiIPfz2msqK0w3MT0Nc1ch7KT/MIE/3uaHQ9vZpgjCFSS eG4BXwVWZyLyjlF214qrfqntMqi/cQVnOefm2IePTE++wRW/1pETBlS34NcUXIMMXR// p4gDs/R8BBOztzgzgWvlJ0HVVn72DA7Zq3gU3xTTzC9NdOvMPHOxDhhIGtLYTeixsYAu DQtxbRsniFVvPAEZ5hNMsNCbfeymWtn0zVuzkbl3l2Gn55qsBAMa5MkVlmn+7qofYLlf bAWg== X-Gm-Message-State: AOJu0Yyi4fALZReB+YBkzVze6jCARQfzT3bFDoXzy38O70PXIlMArGAn 8vIIdFro83ppprwqyFIq1Yg6MyKjQsVd1geJRDGMjgJzcvHEpu0SlagV6o5Ek+JipExRQvPmfRx j X-Google-Smtp-Source: AGHT+IFXcT/cv617vs94V0olUk1qtvB+asP3RutnVEut1XBYxIxnfg2HWbuT+MfbO611UJ0kqXe2YQ== X-Received: by 2002:a17:902:d2cf:b0:1dd:5f85:1191 with SMTP id n15-20020a170902d2cf00b001dd5f851191mr4433009plc.53.1711751484466; Fri, 29 Mar 2024 15:31:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 07/18] target/hppa: Fix EIRR, EIEM versus icount Date: Fri, 29 Mar 2024 12:31:00 -1000 Message-Id: <20240329223111.1735826-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751617814100004 Content-Type: text/plain; charset="utf-8" Call translator_io_start before write to EIRR. Move evaluation of EIRR vs EIEM to hppa_cpu_exec_interrupt. Exit TB after write to EIEM, but otherwise use a straight store. Reviewed-by: Helge Deller Tested-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/helper.h | 1 - target/hppa/int_helper.c | 14 ++++---------- target/hppa/translate.c | 10 +++++++--- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/target/hppa/helper.h b/target/hppa/helper.h index 1bdbcd8f98..8fd7ba65d8 100644 --- a/target/hppa/helper.h +++ b/target/hppa/helper.h @@ -91,7 +91,6 @@ DEF_HELPER_1(rfi, void, env) DEF_HELPER_1(rfi_r, void, env) DEF_HELPER_FLAGS_2(write_interval_timer, TCG_CALL_NO_RWG, void, env, tl) DEF_HELPER_FLAGS_2(write_eirr, TCG_CALL_NO_RWG, void, env, tl) -DEF_HELPER_FLAGS_2(write_eiem, TCG_CALL_NO_RWG, void, env, tl) DEF_HELPER_FLAGS_2(swap_system_mask, TCG_CALL_NO_RWG, tl, env, tl) DEF_HELPER_FLAGS_3(itlba_pa11, TCG_CALL_NO_RWG, void, env, tl, tl) DEF_HELPER_FLAGS_3(itlbp_pa11, TCG_CALL_NO_RWG, void, env, tl, tl) diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c index efe638b36e..90437a92cd 100644 --- a/target/hppa/int_helper.c +++ b/target/hppa/int_helper.c @@ -28,7 +28,7 @@ static void eval_interrupt(HPPACPU *cpu) { CPUState *cs =3D CPU(cpu); - if (cpu->env.cr[CR_EIRR] & cpu->env.cr[CR_EIEM]) { + if (cpu->env.cr[CR_EIRR]) { cpu_interrupt(cs, CPU_INTERRUPT_HARD); } else { cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); @@ -89,14 +89,6 @@ void HELPER(write_eirr)(CPUHPPAState *env, target_ulong = val) bql_unlock(); } =20 -void HELPER(write_eiem)(CPUHPPAState *env, target_ulong val) -{ - env->cr[CR_EIEM] =3D val; - bql_lock(); - eval_interrupt(env_archcpu(env)); - bql_unlock(); -} - void hppa_cpu_do_interrupt(CPUState *cs) { HPPACPU *cpu =3D HPPA_CPU(cs); @@ -280,7 +272,9 @@ bool hppa_cpu_exec_interrupt(CPUState *cs, int interrup= t_request) } =20 /* If interrupts are requested and enabled, raise them. */ - if ((env->psw & PSW_I) && (interrupt_request & CPU_INTERRUPT_HARD)) { + if ((interrupt_request & CPU_INTERRUPT_HARD) + && (env->psw & PSW_I) + && (env->cr[CR_EIRR] & env->cr[CR_EIEM])) { cs->exception_index =3D EXCP_EXT_INTERRUPT; hppa_cpu_do_interrupt(cs); return true; diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 5b8c1b06c3..46b2d6508d 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2166,10 +2166,10 @@ static bool trans_mtctl(DisasContext *ctx, arg_mtct= l *a) gen_helper_write_interval_timer(tcg_env, reg); break; case CR_EIRR: + /* Helper modifies interrupt lines and is therefore IO. */ + translator_io_start(&ctx->base); gen_helper_write_eirr(tcg_env, reg); - break; - case CR_EIEM: - gen_helper_write_eiem(tcg_env, reg); + /* Exit to re-evaluate interrupts in the main loop. */ ctx->base.is_jmp =3D DISAS_IAQ_N_STALE_EXIT; break; =20 @@ -2195,6 +2195,10 @@ static bool trans_mtctl(DisasContext *ctx, arg_mtctl= *a) #endif break; =20 + case CR_EIEM: + /* Exit to re-evaluate interrupts in the main loop. */ + ctx->base.is_jmp =3D DISAS_IAQ_N_STALE_EXIT; + /* FALLTHRU */ default: tcg_gen_st_i64(reg, tcg_env, offsetof(CPUHPPAState, cr[ctl])); break; --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751641; cv=none; d=zohomail.com; s=zohoarc; b=jL0oDN6Id6iAbO6+OfP9yTUv+62FSVWf35PQ6EGw7PWnc4bG3xFI6ZgYea+ow8ijAfkZI+I0wnpnWdmtNwylVJeV01NCzlrW/JGFKMS+Q8FSBn0MINX/IunU9O5GHdBo05qWuwlvBRV8CWAOtmRDeOJhp6asTTS7z7cCUZ2/PjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751641; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ejHwqcq7dcii+cbZ+/7NcB0t83Y0TWbs/BL3Pfvrwv8=; b=Vm5jGlDqU/I/QYTH/EkWU/sX+QwKbaX6BujY+nfxpeWFRn7b2SNYh4OpSUo8p/L+kqpGDqbzgBz2Gwe0hTmFlLlzQtLfLSMDnKBzOmLcofy9s2Hi1zMNT58tF86Hpo+/JOqP8sqygweeqnVRlluSBe9msafk26vnZq60YOrpiZ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751641928140.90981360479282; Fri, 29 Mar 2024 15:34:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKlD-0002b4-Nq; Fri, 29 Mar 2024 18:31:44 -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 1rqKky-0002Xd-Vf for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:29 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKkx-0003WG-Ek for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:28 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-5d3912c9a83so1389060a12.3 for ; Fri, 29 Mar 2024 15:31:26 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751486; x=1712356286; 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=ejHwqcq7dcii+cbZ+/7NcB0t83Y0TWbs/BL3Pfvrwv8=; b=NY67hsNfLI40yG49X5YV8qvr0STHr/wUqWQTwGCwpEv58Pwm/Xu3K/aYofgq9vjhAt PsEjSr96vQCVM2CYQHkEs0X1HtzEQHUnxwtkh+pkGzVSt/KfZ1CZCteks74MLCn4Pj85 wxJnWVgzqR68mwCT/YrKU+6j1riOfQxnYIsAHAJ3fyxOCW0L8Kl/Ncou2bC5JUzI9SAn AcvziNVG1ieHyetJY/ZmERBFUjjIRFmlV96JeBiU7tVw3U0j1RWpM/7FiJG0hhDvWDev jAzIVq4nDqUBCLvueHDLeo0pOOdtSoVUzf5ts8VfPI4o4Tw0ScJY50qxxj+Dt5NdnzcK Opyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751486; x=1712356286; 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=ejHwqcq7dcii+cbZ+/7NcB0t83Y0TWbs/BL3Pfvrwv8=; b=FQSPDTbv14wm1TYcVf39Z9LkQtXe3fPrmsx4efYX3LhKmHykMf2m5AA2ewdTQ9IdTT MLHGyqkKnVueFSvtOhm+tuNxP0m+Ks08NZ3CVbg6EB3D1BYdyNBjg9h3w8YQ8IF4wzlI Ci21KjaJ9WlcIg9fYOM47m3+ctZJoK2XmhnQZN77WbYUkmloyfiBETAOlTotl2Cwj68C y5znbkKVymaSJGb6dsHwNrP5upEfuK4VRsd/zZ62qZqYBQXWCVrivYRAuIlQce0V/Boj UPVseuczpst8iHwuF+vq7qgRr2XCWziwxbtpFCpOFN377IAuxDRGoCTWgja2XFEHECQg 4I8g== X-Gm-Message-State: AOJu0YzrdO7hhxPsWSvu2J38t511sxeQjbUjAWO/wnwCwCZ+OekdksiM VtUpT0/ZEeSeKpmM1MMzpHTmg/ieGNM8eqqhc6mVn6VjHakXNjZdQQriLHCZWZfbqgBJ/WdpDaI T X-Google-Smtp-Source: AGHT+IHhwo9S/Drdqgzvf4LqVDOO+EpW7ilYiNT2s9f6yhdZk2QnrInJRnNzjES5b+NUvRdAa100KQ== X-Received: by 2002:a17:902:e789:b0:1e2:408c:776f with SMTP id cp9-20020a170902e78900b001e2408c776fmr935276plb.0.1711751485860; Fri, 29 Mar 2024 15:31:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Sven Schnelle , Helge Deller Subject: [PULL 08/18] target/hppa: Use gva_offset_mask() everywhere Date: Fri, 29 Mar 2024 12:31:01 -1000 Message-Id: <20240329223111.1735826-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52e.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751643868100009 Content-Type: text/plain; charset="utf-8" From: Sven Schnelle Move it to cpu.h, so it can also be used in hppa_form_gva_psw(). Signed-off-by: Sven Schnelle Reviewed-by: Helge Deller Reviewed-by: Richard Henderson Message-Id: <20240324080945.991100-2-svens@stackframe.org> Signed-off-by: Richard Henderson --- target/hppa/cpu.h | 10 ++++++++-- target/hppa/translate.c | 12 +++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index a92dc352cb..a072d0bb63 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -285,14 +285,20 @@ void hppa_translate_init(void); =20 #define CPU_RESOLVING_TYPE TYPE_HPPA_CPU =20 +static inline uint64_t gva_offset_mask(target_ulong psw) +{ + return (psw & PSW_W + ? MAKE_64BIT_MASK(0, 62) + : MAKE_64BIT_MASK(0, 32)); +} + static inline target_ulong hppa_form_gva_psw(target_ulong psw, uint64_t sp= c, target_ulong off) { #ifdef CONFIG_USER_ONLY return off; #else - off &=3D psw & PSW_W ? MAKE_64BIT_MASK(0, 62) : MAKE_64BIT_MASK(0, 32); - return spc | off; + return spc | (off & gva_offset_mask(psw)); #endif } =20 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 46b2d6508d..e041310207 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -586,17 +586,10 @@ static bool nullify_end(DisasContext *ctx) return true; } =20 -static uint64_t gva_offset_mask(DisasContext *ctx) -{ - return (ctx->tb_flags & PSW_W - ? MAKE_64BIT_MASK(0, 62) - : MAKE_64BIT_MASK(0, 32)); -} - static void copy_iaoq_entry(DisasContext *ctx, TCGv_i64 dest, uint64_t ival, TCGv_i64 vval) { - uint64_t mask =3D gva_offset_mask(ctx); + uint64_t mask =3D gva_offset_mask(ctx->tb_flags); =20 if (ival !=3D -1) { tcg_gen_movi_i64(dest, ival & mask); @@ -1430,7 +1423,8 @@ static void form_gva(DisasContext *ctx, TCGv_i64 *pgv= a, TCGv_i64 *pofs, =20 *pofs =3D ofs; *pgva =3D addr =3D tcg_temp_new_i64(); - tcg_gen_andi_i64(addr, modify <=3D 0 ? ofs : base, gva_offset_mask(ctx= )); + tcg_gen_andi_i64(addr, modify <=3D 0 ? ofs : base, + gva_offset_mask(ctx->tb_flags)); #ifndef CONFIG_USER_ONLY if (!is_phys) { tcg_gen_or_i64(addr, addr, space_select(ctx, sp, base)); --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751571; cv=none; d=zohomail.com; s=zohoarc; b=EpIrbMorRbIfM3+zF+bqVUk+/QoMgjg2FBzLt4HAxu2XumvKktXDmOjCBCXKh3eMEbak27+8/0R39Q2gwZ8xW68Z399f3Jo2fEK6nd0+ImbK/l4qyqbDZkiTbIcuL8sB/jqOYN2VjxRwo/qFeaTOOX9CtBksm0U1VDemeS2WLxE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751571; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dPcM7F+bIMm+kpOtGS43p2VNPDZH3BZ56mw6e1fyEkk=; b=T6tSL29FCtVjyezqGfC8mOA4K1Ll1BqfJ3XAXsTEp/ZKiN7onyzfgvuJK6tFiAtz5tDJH0kch2eUOcyzezk9qGgK9kEeySGe3plRZ7PgI1WINJOPMUi1kTzS58Y4lpmSjbCncsXnMCurjHWBhnFbx9UJk/MoAbC1KIaJtHkRWrs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751571483677.1113344431271; Fri, 29 Mar 2024 15:32:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKlK-0002c0-KX; Fri, 29 Mar 2024 18:31:50 -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 1rqKkz-0002Xl-RP for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:34 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKky-0003WW-BL for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:29 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1e243ccbffbso283835ad.3 for ; Fri, 29 Mar 2024 15:31:27 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751487; x=1712356287; 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=dPcM7F+bIMm+kpOtGS43p2VNPDZH3BZ56mw6e1fyEkk=; b=txzeo8Il11JmWps6LjORNB7JrGAPN8jnYbCWQ4yx46bh8g+j2PrZs3B07MPs6U5ak9 ASpbWKcmMa/9PDP1PbskxLrPLyKQzLJ7WpzAwfE9fojcpbD8fKkLyO83alpy0EPOELgP F6xEL2Kh1+5sN+OrbHsW/dAhFK6aSyPW07v18FC6yDPMpps+Hps72va0KiRb+E5MtgwO Y2pSDdH1c1fZe3MfnRbUbznI6lxQcO9nH3qGwVf4lODZV+6iItTFM92Zo5RyB35zSzlb 3IG+mEUCJ8+IDJ8OqUDHZwJTb8v9LCAWz+dPFhWWkEU9F8XpLAlVlaOp7xzONAPL2MAx oFpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751487; x=1712356287; 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=dPcM7F+bIMm+kpOtGS43p2VNPDZH3BZ56mw6e1fyEkk=; b=X6ef3rG855Z4Znbx1Sio1F2V8PcSrqaxwEGCkJGmslbAIChRiJzramfWilYqinpqjg LbKNFeuIvxC0Ja2APcz/AxiA9AgAjQCN63fk2T720xNdMEO4CpzAkNcCmJetKwQ8VBit xgMwyYKQV8TcKvmu1PNttIuyTlnO0rFKhNP59zNQeliIAW6SDmLhqhTThf8gRuZ0Ks9h ERJry/vTBj/Qm8X+7mKEmrPxJIRq1wasTI+ZgLoXK8zTZYw07DWBLdATGUibwO9qX8Lo /EbVnxCm1ph+vt+96E36IBSmjqtsZdEO17g4kqE+YAsDuZKCY5ywdDGxU7t+cjqUN0wL 5vZw== X-Gm-Message-State: AOJu0YyFFPdk1oNWt83F0vR1Hj77F+j8ytsPmW7OkNAX6IGt0J6XDBND 68x7OFr7/OedUxbb33zX6zKeocALPHXSbI+8VtCtRbzfO7/MMurjyhnXdUNbSapeM6x4u4Koaa3 d X-Google-Smtp-Source: AGHT+IGfaSCSHzixvDrzuy4wFSPTQ7LegI5x/qe5cHjPlkIiUB8NjCpNSR8z9MMM9GPQXISyxKgdGQ== X-Received: by 2002:a17:902:e495:b0:1e0:afa0:d515 with SMTP id i21-20020a170902e49500b001e0afa0d515mr2767567ple.29.1711751487100; Fri, 29 Mar 2024 15:31:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 09/18] target/hppa: Fix DCOR reconstruction of carry bits Date: Fri, 29 Mar 2024 12:31:02 -1000 Message-Id: <20240329223111.1735826-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751571684100005 Content-Type: text/plain; charset="utf-8" The carry bits for each nibble N are located in bit (N+1)*4, so the shift by 3 was off by one. Furthermore, the carry bit for the most significant carry bit is indeed located in bit 64, which is located in a different storage word. Use a double-word shift-right to reassemble into a single word and place them all at bit 0 of their respective nibbles. Tested-by: Helge Deller Reviewed-by: Helge Deller Fixes: b2167459ae4 ("target-hppa: Implement basic arithmetic") Signed-off-by: Richard Henderson --- target/hppa/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index e041310207..a3f425d861 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2791,7 +2791,7 @@ static bool do_dcor(DisasContext *ctx, arg_rr_cf_d *a= , bool is_i) nullify_over(ctx); =20 tmp =3D tcg_temp_new_i64(); - tcg_gen_shri_i64(tmp, cpu_psw_cb, 3); + tcg_gen_extract2_i64(tmp, cpu_psw_cb, cpu_psw_cb_msb, 4); if (!is_i) { tcg_gen_not_i64(tmp, tmp); } --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751641; cv=none; d=zohomail.com; s=zohoarc; b=ZCLVL5OpTGCvbcnjcsx3wYEocWE072BvNSqBqDhjOlTLbjAWQZntyFjgLQuBTJCeOVledDIrbZInGvLiPmEdjuzzxFojs5dN/TGCSH1FSfRG4v+nB47MRM1gKL6J2QyKv8grnaPooHjdhmCdUU3mJ1cWhIVF6o7kjqjoIL+vyvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751641; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vnjhMc8AFUnASgt/GDELAcE24oYis+MaL1Mj1wovAY4=; b=I2dFD5hLOIamhIvfYvDSATXedzbEew/rnZBlDNnRAV4Cb6h50gpTM9iVVc4O7TxDDV/Vst7lkHim5v0X5l3tLktnuXKLYW9yyEwctMIxkawfxxvSmQ5s5tgadZBqB7OKwyJnNr4r9tMx5WFQ/qK/RYnj0NNymgVhBzaC4Q7kzaM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751641976731.0442324251387; Fri, 29 Mar 2024 15:34:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKlD-0002av-5y; Fri, 29 Mar 2024 18:31:43 -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 1rqKl1-0002Y6-Uf for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:36 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKkz-0003Wc-HF for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:30 -0400 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-5bdbe2de25fso1672392a12.3 for ; Fri, 29 Mar 2024 15:31:29 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751488; x=1712356288; 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=vnjhMc8AFUnASgt/GDELAcE24oYis+MaL1Mj1wovAY4=; b=RG1tjgffITsdDVYuB3zO8zD0pkUa30msVIMRLpIs9x17/FIVL4FkF722biIW8w1iuv 5M8JiKvwjZSAPWppEvFbj44jhuityzume5REoaqjn36yf0XORA0DTiI117g6DM6lTpY1 oUFyCr09YMpuV90KzXMeHNNVCv4ROxq2jI1Qu+Z6Gvoxn0FSHI+WOinyUFTvwLt4K/ri rL7a3wrPVwiro69sRhtxRrN0QwXpKMdXFZRlfsnR/jAc4OkfzeqbOBfN8Sp1xiJTdHig VnFQPF44WNohC67z571Ub2lDJnj/5/wwK8HPM9RlkfQ9WutZHyMopejpMLkipWp36rpA IOFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751488; x=1712356288; 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=vnjhMc8AFUnASgt/GDELAcE24oYis+MaL1Mj1wovAY4=; b=D+8ZTfsvJsHwvn/zhj2cg9fMSGhX5TDISO4xBhrSN09LfzrDM8zh/mkSvafDjN+MuY OWGMLmUUYVicwV41v9/0Twi/kk0+WR42oEl6oj3YgSTarmjLJz7uUO+1vLgFK9d1HHCZ zIJhS5C2qgV4orD6T0BqSF4bRlBP57GItdikLFT5p7oqmDD5jhzThWZ1FapbX9uHJaul 2nJOA7C35a9w+Zcxk/Q6pWfXMI30DE8kHRzNunMroZCnbxrhCZqrUZVllkaZXOj6qXiA ue/uXJG7PFSI1a7A/7bO+PUH8xjhbgtgETjbHqUVfF/ldoOaJ97E+fOM3CuD/ausNxs4 CGRw== X-Gm-Message-State: AOJu0YwbsaO2pX6CcuMzzoVlLGmvxrkjPdnbPtXmSufvGHL312V3u2am q85xUOGQKtx0Fjl2/86l3oAG3yXp6fItxIB32jxKujWdEcObTKmZOhvrCkKjm7rutQChnMbhTEB 5 X-Google-Smtp-Source: AGHT+IG5sO14QMlmmrAfi8c1a+u0ntJLcJopT6SNzYxOuLD9zobw6DNgMXCi3nkKpl9fqw71yLP1bA== X-Received: by 2002:a17:902:e94f:b0:1e2:306c:32e3 with SMTP id b15-20020a170902e94f00b001e2306c32e3mr4188941pll.2.1711751488327; Fri, 29 Mar 2024 15:31:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 10/18] target/hppa: Optimize UADDCM with no condition Date: Fri, 29 Mar 2024 12:31:03 -1000 Message-Id: <20240329223111.1735826-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52a.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751643877100010 Content-Type: text/plain; charset="utf-8" With r1 as zero is by far the most common usage of UADDCM, as the easiest way to invert a register. The compiler does occasionally use the addition step as well, and we can simplify that to avoid a temp and write directly into the destination. Tested-by: Helge Deller Reviewed-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/translate.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index a3f425d861..3fc3e7754c 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2763,9 +2763,29 @@ static bool do_uaddcm(DisasContext *ctx, arg_rrr_cf_= d *a, bool is_tc) { TCGv_i64 tcg_r1, tcg_r2, tmp; =20 - if (a->cf) { - nullify_over(ctx); + if (a->cf =3D=3D 0) { + tcg_r2 =3D load_gpr(ctx, a->r2); + tmp =3D dest_gpr(ctx, a->t); + + if (a->r1 =3D=3D 0) { + /* UADDCM r0,src,dst is the common idiom for dst =3D ~src. */ + tcg_gen_not_i64(tmp, tcg_r2); + } else { + /* + * Recall that r1 - r2 =3D=3D r1 + ~r2 + 1. + * Thus r1 + ~r2 =3D=3D r1 - r2 - 1, + * which does not require an extra temporary. + */ + tcg_r1 =3D load_gpr(ctx, a->r1); + tcg_gen_sub_i64(tmp, tcg_r1, tcg_r2); + tcg_gen_subi_i64(tmp, tmp, 1); + } + save_gpr(ctx, a->t, tmp); + cond_free(&ctx->null_cond); + return true; } + + nullify_over(ctx); tcg_r1 =3D load_gpr(ctx, a->r1); tcg_r2 =3D load_gpr(ctx, a->r2); tmp =3D tcg_temp_new_i64(); --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751623; cv=none; d=zohomail.com; s=zohoarc; b=jHw90fisiFaB7mHD89qIuOF9v/m4iL4Ga3sUq/fuEDIzwvKVfwB79SMQ97kaOTMyI4/wzg/F2S3A1p9T4/ZFRfsGOg7gt0AnDvB8HLHSho1QhaaqJ2DpNUpul1FwkiLv2K/UAN52mQzs5nG5An+XetE12tfYEwa5ngrx5TFMU5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751623; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aRxvFx4jyf1OvdOEJQeIUF5yPpRtSfNlC9jIwIYW+p0=; b=WeWxuk25MJqOg+pb2+UuAMa6uOi/H3fnjiaojBy6zdcsYduAYMv/G0Pcyo02TQmZGlynw4lTpMy9MTUcOFXJmLwhzE6UsdwgtEpNXGj3ry5MzoKPun7/6CdwlCG7Fpzr4b02nXVhqpiz4mb85OOr7HQOuQh+0EEHHQ+ovcHobrQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751623977497.24825643553424; Fri, 29 Mar 2024 15:33:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKl7-0002Zu-OO; Fri, 29 Mar 2024 18:31:37 -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 1rqKl3-0002YE-NT for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:36 -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 1rqKl1-0003Wt-O1 for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:33 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1e0fa980d55so20854865ad.3 for ; Fri, 29 Mar 2024 15:31:30 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751489; x=1712356289; 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=aRxvFx4jyf1OvdOEJQeIUF5yPpRtSfNlC9jIwIYW+p0=; b=u8FrQ0L8gJMnm/vauE6RRBniAX3ldTibOnBhmOO9eNcNUGKfp9A/RQBNtgDLON+aPt 6Td9A75W5vS2MmZpOrOq9CKtyEj++TGnp8k5TYKE7P+NhGSCm4IDM6MWD6y1FQT6cSrs iRRQyJ/F75OS7vGDQ890eBD80cnPWLvSCCkcQKzPZKvIbqxWiL5agFLaCIYxeNHP6+6d g9Nu641OKosef6iiXF7vROyUpBiF+miuipiKTs+TgaEOMEphmbVLLJiOpZwh7wFd9W2t aMLEbyflQbX7uZz3jxR1RnYVpcc2ofoaESx4upeb+TCnC6k3yfSGc73e+YfF3WrcxuWr Zaog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751489; x=1712356289; 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=aRxvFx4jyf1OvdOEJQeIUF5yPpRtSfNlC9jIwIYW+p0=; b=hhxrHS355SD5nNnVOpDMQAX40soRJfoEwnSJaB5Lft18VsyjyV0gJsJT4DieUuuJlF 00ufYPyIN69HiSlgJNE8bfyzf8RKEnVeZz0/OGaDokPrfDqLjYwzox4ba3y2HB+2S3WE emyGT+FaoDPqU0L0bZrjlubSbMFPLPToG9taABYQNtxpHyyoHyNGDJYYnl5gvN/44K7k obiMGK8oaDt6UzRiZaFEAVw/P9y3Ue2uPmaihTCXSjpT1jrTO7HdWc5wMYOKJpsKfOjM 8sW/Q5Xs45e22GNLo5AfupRMa9Cbb5JI1B62zKEvP+3s5eDU1e7B9CyBMSMTA3BYI6U5 nzHg== X-Gm-Message-State: AOJu0YzENm5mC+Naba+h4jblTI/pDHZN/mES48/cUY08cd1XAx2Wuojc IAgJguh2FaY3MvNVTjUZrNRr+HCl/4ZET/rJBLfmBeva6QeWjYEr9ILcks4Crxx8X02dBed4DUK o X-Google-Smtp-Source: AGHT+IHq4pR0RmeXBMUV2UpHEn4HSjcr8+uVaZJr2yghEZZziW8z9K4vR6fI6vxy8220rrD0MA0t2A== X-Received: by 2002:a17:903:2cb:b0:1e0:b2d5:5f46 with SMTP id s11-20020a17090302cb00b001e0b2d55f46mr4164789plk.46.1711751489593; Fri, 29 Mar 2024 15:31:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 11/18] target/hppa: Fix unit carry conditions Date: Fri, 29 Mar 2024 12:31:04 -1000 Message-Id: <20240329223111.1735826-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751625857100010 Content-Type: text/plain; charset="utf-8" Split do_unit_cond to do_unit_zero_cond to only handle conditions versus zero. These are the only ones that are legal for UXOR. Simplify trans_uxor accordingly. Rename do_unit to do_unit_addsub, since xor has been split. Properly compute carry-out bits for add and subtract, mirroring the code in do_add and do_sub. Tested-by: Helge Deller Reviewed-by: Helge Deller Fixes: b2167459ae4 ("target-hppa: Implement basic arithmetic") Signed-off-by: Richard Henderson --- target/hppa/translate.c | 218 +++++++++++++++++++++------------------- 1 file changed, 113 insertions(+), 105 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 3fc3e7754c..99c5c4cbca 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -936,98 +936,44 @@ static DisasCond do_sed_cond(DisasContext *ctx, unsig= ned orig, bool d, return do_log_cond(ctx, c * 2 + f, d, res); } =20 -/* Similar, but for unit conditions. */ - -static DisasCond do_unit_cond(unsigned cf, bool d, TCGv_i64 res, - TCGv_i64 in1, TCGv_i64 in2) +/* Similar, but for unit zero conditions. */ +static DisasCond do_unit_zero_cond(unsigned cf, bool d, TCGv_i64 res) { - DisasCond cond; - TCGv_i64 tmp, cb =3D NULL; + TCGv_i64 tmp; uint64_t d_repl =3D d ? 0x0000000100000001ull : 1; - - if (cf & 8) { - /* Since we want to test lots of carry-out bits all at once, do not - * do our normal thing and compute carry-in of bit B+1 since that - * leaves us with carry bits spread across two words. - */ - cb =3D tcg_temp_new_i64(); - tmp =3D tcg_temp_new_i64(); - tcg_gen_or_i64(cb, in1, in2); - tcg_gen_and_i64(tmp, in1, in2); - tcg_gen_andc_i64(cb, cb, res); - tcg_gen_or_i64(cb, cb, tmp); - } + uint64_t ones =3D 0, sgns =3D 0; =20 switch (cf >> 1) { - case 0: /* never / TR */ - cond =3D cond_make_f(); - break; - case 1: /* SBW / NBW */ if (d) { - tmp =3D tcg_temp_new_i64(); - tcg_gen_subi_i64(tmp, res, d_repl * 0x00000001u); - tcg_gen_andc_i64(tmp, tmp, res); - tcg_gen_andi_i64(tmp, tmp, d_repl * 0x80000000u); - cond =3D cond_make_0(TCG_COND_NE, tmp); - } else { - /* undefined */ - cond =3D cond_make_f(); + ones =3D d_repl; + sgns =3D d_repl << 31; } break; - case 2: /* SBZ / NBZ */ - /* See hasless(v,1) from - * https://graphics.stanford.edu/~seander/bithacks.html#ZeroInWord - */ - tmp =3D tcg_temp_new_i64(); - tcg_gen_subi_i64(tmp, res, d_repl * 0x01010101u); - tcg_gen_andc_i64(tmp, tmp, res); - tcg_gen_andi_i64(tmp, tmp, d_repl * 0x80808080u); - cond =3D cond_make_0(TCG_COND_NE, tmp); + ones =3D d_repl * 0x01010101u; + sgns =3D ones << 7; break; - case 3: /* SHZ / NHZ */ - tmp =3D tcg_temp_new_i64(); - tcg_gen_subi_i64(tmp, res, d_repl * 0x00010001u); - tcg_gen_andc_i64(tmp, tmp, res); - tcg_gen_andi_i64(tmp, tmp, d_repl * 0x80008000u); - cond =3D cond_make_0(TCG_COND_NE, tmp); + ones =3D d_repl * 0x00010001u; + sgns =3D ones << 15; break; - - case 4: /* SDC / NDC */ - tcg_gen_andi_i64(cb, cb, d_repl * 0x88888888u); - cond =3D cond_make_0(TCG_COND_NE, cb); - break; - - case 5: /* SWC / NWC */ - if (d) { - tcg_gen_andi_i64(cb, cb, d_repl * 0x80000000u); - cond =3D cond_make_0(TCG_COND_NE, cb); - } else { - /* undefined */ - cond =3D cond_make_f(); - } - break; - - case 6: /* SBC / NBC */ - tcg_gen_andi_i64(cb, cb, d_repl * 0x80808080u); - cond =3D cond_make_0(TCG_COND_NE, cb); - break; - - case 7: /* SHC / NHC */ - tcg_gen_andi_i64(cb, cb, d_repl * 0x80008000u); - cond =3D cond_make_0(TCG_COND_NE, cb); - break; - - default: - g_assert_not_reached(); } - if (cf & 1) { - cond.c =3D tcg_invert_cond(cond.c); + if (ones =3D=3D 0) { + /* Undefined, or 0/1 (never/always). */ + return cf & 1 ? cond_make_t() : cond_make_f(); } =20 - return cond; + /* + * See hasless(v,1) from + * https://graphics.stanford.edu/~seander/bithacks.html#ZeroInWord + */ + tmp =3D tcg_temp_new_i64(); + tcg_gen_subi_i64(tmp, res, ones); + tcg_gen_andc_i64(tmp, tmp, res); + tcg_gen_andi_i64(tmp, tmp, sgns); + + return cond_make_0_tmp(cf & 1 ? TCG_COND_EQ : TCG_COND_NE, tmp); } =20 static TCGv_i64 get_carry(DisasContext *ctx, bool d, @@ -1330,34 +1276,86 @@ static bool do_log_reg(DisasContext *ctx, arg_rrr_c= f_d *a, return nullify_end(ctx); } =20 -static void do_unit(DisasContext *ctx, unsigned rt, TCGv_i64 in1, - TCGv_i64 in2, unsigned cf, bool d, bool is_tc, - void (*fn)(TCGv_i64, TCGv_i64, TCGv_i64)) +static void do_unit_addsub(DisasContext *ctx, unsigned rt, TCGv_i64 in1, + TCGv_i64 in2, unsigned cf, bool d, + bool is_tc, bool is_add) { - TCGv_i64 dest; + TCGv_i64 dest =3D tcg_temp_new_i64(); + uint64_t test_cb =3D 0; DisasCond cond; =20 - if (cf =3D=3D 0) { - dest =3D dest_gpr(ctx, rt); - fn(dest, in1, in2); - save_gpr(ctx, rt, dest); - cond_free(&ctx->null_cond); - } else { - dest =3D tcg_temp_new_i64(); - fn(dest, in1, in2); - - cond =3D do_unit_cond(cf, d, dest, in1, in2); - - if (is_tc) { - TCGv_i64 tmp =3D tcg_temp_new_i64(); - tcg_gen_setcond_i64(cond.c, tmp, cond.a0, cond.a1); - gen_helper_tcond(tcg_env, tmp); + /* Select which carry-out bits to test. */ + switch (cf >> 1) { + case 4: /* NDC / SDC -- 4-bit carries */ + test_cb =3D dup_const(MO_8, 0x88); + break; + case 5: /* NWC / SWC -- 32-bit carries */ + if (d) { + test_cb =3D dup_const(MO_32, INT32_MIN); + } else { + cf &=3D 1; /* undefined -- map to never/always */ } - save_gpr(ctx, rt, dest); - - cond_free(&ctx->null_cond); - ctx->null_cond =3D cond; + break; + case 6: /* NBC / SBC -- 8-bit carries */ + test_cb =3D dup_const(MO_8, INT8_MIN); + break; + case 7: /* NHC / SHC -- 16-bit carries */ + test_cb =3D dup_const(MO_16, INT16_MIN); + break; } + if (!d) { + test_cb =3D (uint32_t)test_cb; + } + + if (!test_cb) { + /* No need to compute carries if we don't need to test them. */ + if (is_add) { + tcg_gen_add_i64(dest, in1, in2); + } else { + tcg_gen_sub_i64(dest, in1, in2); + } + cond =3D do_unit_zero_cond(cf, d, dest); + } else { + TCGv_i64 cb =3D tcg_temp_new_i64(); + + if (d) { + TCGv_i64 cb_msb =3D tcg_temp_new_i64(); + if (is_add) { + tcg_gen_add2_i64(dest, cb_msb, in1, ctx->zero, in2, ctx->z= ero); + tcg_gen_xor_i64(cb, in1, in2); + } else { + /* See do_sub, !is_b. */ + TCGv_i64 one =3D tcg_constant_i64(1); + tcg_gen_sub2_i64(dest, cb_msb, in1, one, in2, ctx->zero); + tcg_gen_eqv_i64(cb, in1, in2); + } + tcg_gen_xor_i64(cb, cb, dest); + tcg_gen_extract2_i64(cb, cb, cb_msb, 1); + } else { + if (is_add) { + tcg_gen_add_i64(dest, in1, in2); + tcg_gen_xor_i64(cb, in1, in2); + } else { + tcg_gen_sub_i64(dest, in1, in2); + tcg_gen_eqv_i64(cb, in1, in2); + } + tcg_gen_xor_i64(cb, cb, dest); + tcg_gen_shri_i64(cb, cb, 1); + } + + tcg_gen_andi_i64(cb, cb, test_cb); + cond =3D cond_make_0_tmp(cf & 1 ? TCG_COND_EQ : TCG_COND_NE, cb); + } + + if (is_tc) { + TCGv_i64 tmp =3D tcg_temp_new_i64(); + tcg_gen_setcond_i64(cond.c, tmp, cond.a0, cond.a1); + gen_helper_tcond(tcg_env, tmp); + } + save_gpr(ctx, rt, dest); + + cond_free(&ctx->null_cond); + ctx->null_cond =3D cond; } =20 #ifndef CONFIG_USER_ONLY @@ -2748,14 +2746,24 @@ static bool trans_cmpclr(DisasContext *ctx, arg_rrr= _cf_d *a) =20 static bool trans_uxor(DisasContext *ctx, arg_rrr_cf_d *a) { - TCGv_i64 tcg_r1, tcg_r2; + TCGv_i64 tcg_r1, tcg_r2, dest; =20 if (a->cf) { nullify_over(ctx); } + tcg_r1 =3D load_gpr(ctx, a->r1); tcg_r2 =3D load_gpr(ctx, a->r2); - do_unit(ctx, a->t, tcg_r1, tcg_r2, a->cf, a->d, false, tcg_gen_xor_i64= ); + dest =3D dest_gpr(ctx, a->t); + + tcg_gen_xor_i64(dest, tcg_r1, tcg_r2); + save_gpr(ctx, a->t, dest); + + cond_free(&ctx->null_cond); + if (a->cf) { + ctx->null_cond =3D do_unit_zero_cond(a->cf, a->d, dest); + } + return nullify_end(ctx); } =20 @@ -2790,7 +2798,7 @@ static bool do_uaddcm(DisasContext *ctx, arg_rrr_cf_d= *a, bool is_tc) tcg_r2 =3D load_gpr(ctx, a->r2); tmp =3D tcg_temp_new_i64(); tcg_gen_not_i64(tmp, tcg_r2); - do_unit(ctx, a->t, tcg_r1, tmp, a->cf, a->d, is_tc, tcg_gen_add_i64); + do_unit_addsub(ctx, a->t, tcg_r1, tmp, a->cf, a->d, is_tc, true); return nullify_end(ctx); } =20 @@ -2817,8 +2825,8 @@ static bool do_dcor(DisasContext *ctx, arg_rr_cf_d *a= , bool is_i) } tcg_gen_andi_i64(tmp, tmp, (uint64_t)0x1111111111111111ull); tcg_gen_muli_i64(tmp, tmp, 6); - do_unit(ctx, a->t, load_gpr(ctx, a->r), tmp, a->cf, a->d, false, - is_i ? tcg_gen_add_i64 : tcg_gen_sub_i64); + do_unit_addsub(ctx, a->t, load_gpr(ctx, a->r), tmp, + a->cf, a->d, false, is_i); return nullify_end(ctx); } =20 --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751557; cv=none; d=zohomail.com; s=zohoarc; b=ffq62rYEkI2MfA/o02iiWumEil6aFROFvF66fy8m98+fIOHOA87OwDbeSBy7Dr+g5ZEHcPlRmCXUTjASfqzsSvZGbOtOg3l2+/tJQ9CMjnxt9TFL3s+9yOFybCCu1RJca7WRogIG9wgO6V9Wig4vOMJtoa9qONFffHRmDHLL3eg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751557; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KMxM9BbQqKkbLwVKQwHtbDKmzoAaG7uKsKCnvfYND6Q=; b=SMSiHDHqjKiETU3LixowfFduPoRrl/kTw7pkoJtQTnyiwW2IkBZfMHTFB88HRQARuyoH1iqT1niyE7R6A45Iqisbo3025YrhkLY4d6JaSm4VIF24tfwO1exkmfbSHUNzjrO+E5bZH800ME4NzW5nVSuh5wOt4pzjO3cVKsPOb98= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751557184147.55843371266485; Fri, 29 Mar 2024 15:32:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKl7-0002Zy-Vn; Fri, 29 Mar 2024 18:31:38 -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 1rqKl4-0002YU-BS for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:36 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKl2-0003Wz-De for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:33 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1def89f0cfdso26332425ad.0 for ; Fri, 29 Mar 2024 15:31:32 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751491; x=1712356291; 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=KMxM9BbQqKkbLwVKQwHtbDKmzoAaG7uKsKCnvfYND6Q=; b=J/oSCaGfW2OYnQUJcirGJ1b4ue8Bih9nmdnjRKzAK724ru8KDKkzs+IYrHHBFu70IM uhTRd1G8AZGRyLaInYAuz8t3fV+axxfZ9p4XaeqT4tx5IVH6+/1ekxa1nH8UHBLJ5KC+ 7z+XnXmZP13AHzPbhYMZTpV8Gf600maHwltVKfTnXkppzKnso4ZWSZb/yB8gl8+xip0M yeoS06YMR/64kLwGAz+nJPwvUwJONKpvXzp70e1be0eF5ZL5EC5EP3M75/o2zLjYi8HI THHsjSl5/XYpm61v73FOyXY7jvLim1edcNXsplY5CUC+NPb0oUEbnAXuGwksXDrqpV9t zsxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751491; x=1712356291; 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=KMxM9BbQqKkbLwVKQwHtbDKmzoAaG7uKsKCnvfYND6Q=; b=lQytqXXMZnT9RVbdTkfkh5yYx+p+NHb1ReVLcXSdcOCeW6J81jcpZHULSekVSZXnjp RCq/z3bmrJdASR6Vuu2JwIu6cr+BcdAD20qZYGtHnOctISr8ZtAEvJeYvx5Cy5lr1Fhh FRuLd/5DOeKAlqoE7qDaQnogbZVHoK496oXgDgKLRWvb/DbJCIbn8soRCWIf/T/ZXJtL X5XWWXdd1k6i+dQ1G6kxhXBnTfjq0cAbV4trQAGeOYFnYmfSpLVYcn7b9DA3O7FsnZFv wj+JE/Edkd45Laav1/qaB5EGTyiJpLlg++jRm+3X7gOF+jtsyGonyKfOnTmSS6ZQMs6I OqCw== X-Gm-Message-State: AOJu0YyaWMOOrmkpPKEBWfId9GpfUyXkpKHtORV1oNG8+QRI1ziXNu8a ETY2cJRPLVaKNOHrUS3ZajnLEQMm6zhl4/sBcXYaGsbqMr7mrPOYBl/qdNAj2GvCVw2rWkKE9bf e X-Google-Smtp-Source: AGHT+IGOChND8cuZHt2ATEb6NXlBQvDebMm4JrDdHpX7MexxftbguuBFGFCgvew70H8gn09f4hgVcg== X-Received: by 2002:a17:902:e5d0:b0:1e0:c88f:654f with SMTP id u16-20020a170902e5d000b001e0c88f654fmr9713486plf.33.1711751490945; Fri, 29 Mar 2024 15:31:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 12/18] target/hppa: Squash d for pa1.x during decode Date: Fri, 29 Mar 2024 12:31:05 -1000 Message-Id: <20240329223111.1735826-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751557674100001 Content-Type: text/plain; charset="utf-8" The cond_need_ext predicate was created while we still had a 32-bit compilation mode. It now makes more sense to treat D as an absolute indicator of a 64-bit operation. Tested-by: Helge Deller Reviewed-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/insns.decode | 20 +++++++++++++------- target/hppa/translate.c | 38 ++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index f58455dfdb..6a74cf23cd 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -57,6 +57,9 @@ %neg_to_m 0:1 !function=3Dneg_to_m %a_to_m 2:1 !function=3Dneg_to_m %cmpbid_c 13:2 !function=3Dcmpbid_c +%d_5 5:1 !function=3Dpa20_d +%d_11 11:1 !function=3Dpa20_d +%d_13 13:1 !function=3Dpa20_d =20 #### # Argument set definitions @@ -84,15 +87,16 @@ # Format definitions #### =20 -@rr_cf_d ...... r:5 ..... cf:4 ...... d:1 t:5 &rr_cf_d +@rr_cf_d ...... r:5 ..... cf:4 ...... . t:5 &rr_cf_d d=3D%d_5 @rrr ...... r2:5 r1:5 .... ....... t:5 &rrr @rrr_cf ...... r2:5 r1:5 cf:4 ....... t:5 &rrr_cf -@rrr_cf_d ...... r2:5 r1:5 cf:4 ...... d:1 t:5 &rrr_cf_d +@rrr_cf_d ...... r2:5 r1:5 cf:4 ...... . t:5 &rrr_cf_d d=3D%d_5 @rrr_sh ...... r2:5 r1:5 ........ sh:2 . t:5 &rrr_sh -@rrr_cf_d_sh ...... r2:5 r1:5 cf:4 .... sh:2 d:1 t:5 &rrr_cf_d_sh -@rrr_cf_d_sh0 ...... r2:5 r1:5 cf:4 ...... d:1 t:5 &rrr_cf_d_sh sh=3D0 +@rrr_cf_d_sh ...... r2:5 r1:5 cf:4 .... sh:2 . t:5 &rrr_cf_d_sh d=3D%= d_5 +@rrr_cf_d_sh0 ...... r2:5 r1:5 cf:4 ...... . t:5 &rrr_cf_d_sh d=3D%= d_5 sh=3D0 @rri_cf ...... r:5 t:5 cf:4 . ........... &rri_cf i=3D%lowsi= gn_11 -@rri_cf_d ...... r:5 t:5 cf:4 d:1 ........... &rri_cf_d i=3D%low= sign_11 +@rri_cf_d ...... r:5 t:5 cf:4 . ........... \ + &rri_cf_d d=3D%d_11 i=3D%lowsign_11 =20 @rrb_cf ...... r2:5 r1:5 c:3 ........... n:1 . \ &rrb_c_f disp=3D%assemble_12 @@ -368,8 +372,10 @@ fmpysub_d 100110 ..... ..... ..... ..... 1 .....= @mpyadd # Conditional Branches #### =20 -bb_sar 110000 00000 r:5 c:1 1 d:1 ........... n:1 . disp=3D%assem= ble_12 -bb_imm 110001 p:5 r:5 c:1 1 d:1 ........... n:1 . disp=3D%assem= ble_12 +bb_sar 110000 00000 r:5 c:1 1 . ........... n:1 . \ + disp=3D%assemble_12 d=3D%d_13 +bb_imm 110001 p:5 r:5 c:1 1 . ........... n:1 . \ + disp=3D%assemble_12 d=3D%d_13 =20 movb 110010 ..... ..... ... ........... . . @rrb_cf f=3D0 movbi 110011 ..... ..... ... ........... . . @rib_cf f=3D0 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 99c5c4cbca..a70d644c0b 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -200,6 +200,14 @@ static int cmpbid_c(DisasContext *ctx, int val) return val ? val : 4; /* 0 =3D=3D "*<<" */ } =20 +/* + * In many places pa1.x did not decode the bit that later became + * the pa2.0 D bit. Suppress D unless the cpu is pa2.0. + */ +static int pa20_d(DisasContext *ctx, int val) +{ + return ctx->is_pa20 & val; +} =20 /* Include the auto-generated decoder. */ #include "decode-insns.c.inc" @@ -693,12 +701,6 @@ static bool cond_need_cb(int c) return c =3D=3D 4 || c =3D=3D 5; } =20 -/* Need extensions from TCGv_i32 to TCGv_i64. */ -static bool cond_need_ext(DisasContext *ctx, bool d) -{ - return !(ctx->is_pa20 && d); -} - /* * Compute conditional for arithmetic. See Page 5-3, Table 5-1, of * the Parisc 1.1 Architecture Reference Manual for details. @@ -715,7 +717,7 @@ static DisasCond do_cond(DisasContext *ctx, unsigned cf= , bool d, cond =3D cond_make_f(); break; case 1: /* =3D / <> (Z / !Z) */ - if (cond_need_ext(ctx, d)) { + if (!d) { tmp =3D tcg_temp_new_i64(); tcg_gen_ext32u_i64(tmp, res); res =3D tmp; @@ -725,7 +727,7 @@ static DisasCond do_cond(DisasContext *ctx, unsigned cf= , bool d, case 2: /* < / >=3D (N ^ V / !(N ^ V) */ tmp =3D tcg_temp_new_i64(); tcg_gen_xor_i64(tmp, res, sv); - if (cond_need_ext(ctx, d)) { + if (!d) { tcg_gen_ext32s_i64(tmp, tmp); } cond =3D cond_make_0_tmp(TCG_COND_LT, tmp); @@ -742,7 +744,7 @@ static DisasCond do_cond(DisasContext *ctx, unsigned cf= , bool d, */ tmp =3D tcg_temp_new_i64(); tcg_gen_eqv_i64(tmp, res, sv); - if (cond_need_ext(ctx, d)) { + if (!d) { tcg_gen_sextract_i64(tmp, tmp, 31, 1); tcg_gen_and_i64(tmp, tmp, res); tcg_gen_ext32u_i64(tmp, tmp); @@ -760,13 +762,13 @@ static DisasCond do_cond(DisasContext *ctx, unsigned = cf, bool d, tmp =3D tcg_temp_new_i64(); tcg_gen_neg_i64(tmp, cb_msb); tcg_gen_and_i64(tmp, tmp, res); - if (cond_need_ext(ctx, d)) { + if (!d) { tcg_gen_ext32u_i64(tmp, tmp); } cond =3D cond_make_0_tmp(TCG_COND_EQ, tmp); break; case 6: /* SV / NSV (V / !V) */ - if (cond_need_ext(ctx, d)) { + if (!d) { tmp =3D tcg_temp_new_i64(); tcg_gen_ext32s_i64(tmp, sv); sv =3D tmp; @@ -827,7 +829,7 @@ static DisasCond do_sub_cond(DisasContext *ctx, unsigne= d cf, bool d, if (cf & 1) { tc =3D tcg_invert_cond(tc); } - if (cond_need_ext(ctx, d)) { + if (!d) { TCGv_i64 t1 =3D tcg_temp_new_i64(); TCGv_i64 t2 =3D tcg_temp_new_i64(); =20 @@ -904,7 +906,7 @@ static DisasCond do_log_cond(DisasContext *ctx, unsigne= d cf, bool d, g_assert_not_reached(); } =20 - if (cond_need_ext(ctx, d)) { + if (!d) { TCGv_i64 tmp =3D tcg_temp_new_i64(); =20 if (ext_uns) { @@ -979,7 +981,7 @@ static DisasCond do_unit_zero_cond(unsigned cf, bool d,= TCGv_i64 res) static TCGv_i64 get_carry(DisasContext *ctx, bool d, TCGv_i64 cb, TCGv_i64 cb_msb) { - if (cond_need_ext(ctx, d)) { + if (!d) { TCGv_i64 t =3D tcg_temp_new_i64(); tcg_gen_extract_i64(t, cb, 32, 1); return t; @@ -3448,12 +3450,12 @@ static bool trans_bb_sar(DisasContext *ctx, arg_bb_= sar *a) =20 tmp =3D tcg_temp_new_i64(); tcg_r =3D load_gpr(ctx, a->r); - if (cond_need_ext(ctx, a->d)) { + if (a->d) { + tcg_gen_shl_i64(tmp, tcg_r, cpu_sar); + } else { /* Force shift into [32,63] */ tcg_gen_ori_i64(tmp, cpu_sar, 32); tcg_gen_shl_i64(tmp, tcg_r, tmp); - } else { - tcg_gen_shl_i64(tmp, tcg_r, cpu_sar); } =20 cond =3D cond_make_0_tmp(a->c ? TCG_COND_GE : TCG_COND_LT, tmp); @@ -3470,7 +3472,7 @@ static bool trans_bb_imm(DisasContext *ctx, arg_bb_im= m *a) =20 tmp =3D tcg_temp_new_i64(); tcg_r =3D load_gpr(ctx, a->r); - p =3D a->p | (cond_need_ext(ctx, a->d) ? 32 : 0); + p =3D a->p | (a->d ? 0 : 32); tcg_gen_shli_i64(tmp, tcg_r, p); =20 cond =3D cond_make_0(a->c ? TCG_COND_GE : TCG_COND_LT, tmp); --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751547; cv=none; d=zohomail.com; s=zohoarc; b=I8Q+N5mXTUptxza6jxxy3fx7KIE3jrXUVAx94vK90FZzQQmOYXnkTxdY+GyCksEt8/WT9q7vSgErEigg7iE9rvChUQDxLpXlSyf8VqXmgyUfUCzBjmXbN4A8fGSZPhfAuX6ILqiLrj4cs2Yo0r0FQiCNEekBpVcQWDvmHOsTT14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751547; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gQ+m60fTouB/z1dl63SfVFQPMFAMSTWz5wWftzZofAQ=; b=fp+mEGbOAiS5As7wa4PXZ/2O5+E9NT/sc5pfaBE75yLi+cFvtFMR5F/rcVAmqJv0xCJsCQkysrOZVbiP2W76Pmz8e9x7ppaopj/ddJCvEzkcXIzcCPf0c7F9LNGuYAxQ58yBgAXj0egTeZsdhl99aiqRpwM/d3Evx/4Jg1YSmxw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751547733507.8354386739999; Fri, 29 Mar 2024 15:32:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKlK-0002cl-MU; Fri, 29 Mar 2024 18:31:51 -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 1rqKl5-0002Yh-Ta for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:36 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKl3-0003XG-T2 for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:35 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1e0fa980d55so20855055ad.3 for ; Fri, 29 Mar 2024 15:31:33 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751492; x=1712356292; 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=gQ+m60fTouB/z1dl63SfVFQPMFAMSTWz5wWftzZofAQ=; b=jA7plFwNEpab3qwlR02+D9TLzBussiynHPlVK9xBHhTNcX2Ylfs6G6d3wQRM90jDQC jiTGarw09WOAeJvKBc4+WTG8ft8hh8eC/gs/1ifRyoCSJ/YT0Ss8TMwPSxuBHV8z3P0U 63p6FPz6MwkMlbMBe3PiVXyu1Ic+rzAyc6ARa6FrN/58YonjwenV1t69h4GhG/j1TAgS jWFzUQdEhWbMvEtzCWPeUjb1h/m8xqdo81e/Uooalw2RZf5qc+k3B6hZ8UO50u6rsFZ/ L+HBbLlN7PGEE1U7vQYsRU/RwiVwKJ+As5qTAlN8+puC40UroiAl6FTVmfltpnLe6Rnb iJTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751492; x=1712356292; 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=gQ+m60fTouB/z1dl63SfVFQPMFAMSTWz5wWftzZofAQ=; b=n/lsxHFXzHpzMO1gjD8E6W7s+Ns+qQfe/Xpba3n3sYqzHfYBvjIPMPB9SLWfqf/o1T +q3ofsOhkSZLyJgYkSvTCrlnxIWvF90F0YQDJIIOGBQuFpmmGl9U6jd0S1N9I7Y2yfGU kBGWuDpYKJp7jccoXWnUz6krYuQkzE2GrycwL4Tzt+Pvc+yN3zXT68Wj7fWP2a77YlPV RtmZOzPiHrVH1yFxUNbI6Ub8HPJkHgrYyYEUBMQwcAWc2+m5MXu8hzVzprcYJnmu4o9H Z4cx5VGTX5y/0hG1n4D+rT3C9EudmoLujiKaI7pC+YsMoVDkDA8jG/LMSvpxPzZZeDD/ fXkw== X-Gm-Message-State: AOJu0YwqkRifa7FZ5geq4p6NGgeir7QG6uwhvU+ACZ7Nmgfl4MJwXV+J 2y4S73HKCsAruQd/jBhYIJq3rIUZK1YqyNWKXXxtuO5pbJb5lPWOr2rtXmXb+rid9Ju8Z1BJV01 H X-Google-Smtp-Source: AGHT+IHUJIZP4SnNn+e8TZXA2Qv15Gd1Q3twIlnohkGr05IhlUt3U7grEo2ODkg2APWT8V8SjlqdNw== X-Received: by 2002:a17:902:e54d:b0:1dd:c288:899f with SMTP id n13-20020a170902e54d00b001ddc288899fmr4360935plf.18.1711751492617; Fri, 29 Mar 2024 15:31:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 13/18] target/hppa: Replace c with uv in do_cond Date: Fri, 29 Mar 2024 12:31:06 -1000 Message-Id: <20240329223111.1735826-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751549669100016 Content-Type: text/plain; charset="utf-8" Prepare for proper indication of shladd unsigned overflow. The UV indicator will be zero/not-zero instead of a single bit. Tested-by: Helge Deller Reviewed-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/translate.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index a70d644c0b..9d31ef5764 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -707,7 +707,7 @@ static bool cond_need_cb(int c) */ =20 static DisasCond do_cond(DisasContext *ctx, unsigned cf, bool d, - TCGv_i64 res, TCGv_i64 cb_msb, TCGv_i64 sv) + TCGv_i64 res, TCGv_i64 uv, TCGv_i64 sv) { DisasCond cond; TCGv_i64 tmp; @@ -754,14 +754,12 @@ static DisasCond do_cond(DisasContext *ctx, unsigned = cf, bool d, } cond =3D cond_make_0_tmp(TCG_COND_EQ, tmp); break; - case 4: /* NUV / UV (!C / C) */ - /* Only bit 0 of cb_msb is ever set. */ - cond =3D cond_make_0(TCG_COND_EQ, cb_msb); + case 4: /* NUV / UV (!UV / UV) */ + cond =3D cond_make_0(TCG_COND_EQ, uv); break; - case 5: /* ZNV / VNZ (!C | Z / C & !Z) */ + case 5: /* ZNV / VNZ (!UV | Z / UV & !Z) */ tmp =3D tcg_temp_new_i64(); - tcg_gen_neg_i64(tmp, cb_msb); - tcg_gen_and_i64(tmp, tmp, res); + tcg_gen_movcond_i64(TCG_COND_EQ, tmp, uv, ctx->zero, ctx->zero, re= s); if (!d) { tcg_gen_ext32u_i64(tmp, tmp); } --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751547; cv=none; d=zohomail.com; s=zohoarc; b=k9e1WZ90f70R52nXGHR//eF6qtaezj1ROIiEbsy/tVuGz7ZpG+FPbVtexUU9MAFCbumWbl5gLjpriwy2QsQnNaaW0oLuubdnCj+V/Eqyutq/rJxnwW37DG+vhDM5XGOS1EgUPdp1mMQOpy62j/iU7c3pDY/u2TMrAQ3tSCGA08A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751547; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=K8E6cou+7Nj72A3SF6Jpjpj6zfeFiz5qaUOwtzCNxnY=; b=AD9KkfupuhHg7oZ0665DouSQXamvv3FF5aSLBuQTuT1eO73Lqltr9F9W8tdRc9avHiQHPgVm75rxC4L/y9tolTOa6hRV89uF2jzmAaUP+5rk7GLFbwT8BLCpfNipNRJFWLnL8wwjS1p4Y0Cp9J0GnG3CVPO3TlOOx/ULZu3c9Gc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751547668259.8475259127962; Fri, 29 Mar 2024 15:32:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKlQ-0002fi-W7; Fri, 29 Mar 2024 18:31: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 1rqKl8-0002a5-4D for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:38 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKl6-0003Xf-7Z for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:37 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1e2178b2cf2so17512295ad.0 for ; Fri, 29 Mar 2024 15:31:35 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751494; x=1712356294; 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=K8E6cou+7Nj72A3SF6Jpjpj6zfeFiz5qaUOwtzCNxnY=; b=sbLoLvQ4meffAwa/3OP4Q4/XIthPczmUpUQ+c8zbRYrsu8MZZIM+x1ZsHXo807b4ft OvflfvLgglaXH0EX7iQllzaRir88FtD6/2jtzg4oqbmTGpKxguTAhiHgChybNP7C11Oe vg5DcTQrINgOVWG/jhK9iCbSwiK2/h2K1Ib+dJk8j9tmhgTK8hHnV3/ugpGf3ZXW+Px0 jiEiky0G5+Xm3bFeC68St//E4f7KYz6Zb8xKBWWTEp4X2OkV9ArEHkr6jm+XWC9UZCYh r1gC1l5ws1pUUpcz+0rpZ/CH/bd00cjpZwI5osGRc30BRg9/An8ZWh5G2YbfgqtQ9qd7 ux6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751494; x=1712356294; 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=K8E6cou+7Nj72A3SF6Jpjpj6zfeFiz5qaUOwtzCNxnY=; b=wdVGMGT2vKw4SUSY5bsnFuV4hO3UzuaVdjq45ZKhk1p0aMLpfsFMbCrgWPxbEmGDMc odBsz8kQwWsfrBfQihhfxeIpKkQQgdHj73HzRmc3hELfjLqZ+WotEvJvSEZ6oJSRy+an OP5zmjJVf8JzqJnWmHZ0pEHGRMKrpdrg169RJAcQ/TGgkioE0aVxVjwAG+gyqvfwv64l klMOFh7UaraHPAm8NbomRVEStbbFLfd7+M2crgb69WDBQ6cSV4b/TaA7H/v6dkquwKcN Pxf2h+Zod+x0OLzy+jsiUqS/dpTDRJwRN2G0j3e3kKmYOo6eApil9hFhJiYKAcZNFM1h hHJA== X-Gm-Message-State: AOJu0YxjUO+Casyif6S5EtN7hWH/I30hbE21lUR02l9ttNPMOcTD+yET JI0281xFR0SaAUU+nAZDBFwneDQjtg7CVz+PHgM4rvzMvFMhEvGNvEscCKTFBwzOesYUqHfBpXF t X-Google-Smtp-Source: AGHT+IG+dd2TqL55Gck2AGNqkWGm7KFsNo7soPqjI1lyUNZGNCyj1+Dgf6f79l8+2BRt++Fr+tr+3g== X-Received: by 2002:a17:902:7848:b0:1e2:a70:247e with SMTP id e8-20020a170902784800b001e20a70247emr3635508pln.18.1711751494632; Fri, 29 Mar 2024 15:31:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 14/18] target/hppa: Fix overflow computation for shladd Date: Fri, 29 Mar 2024 12:31:07 -1000 Message-Id: <20240329223111.1735826-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751549670100017 Content-Type: text/plain; charset="utf-8" Overflow indicator should include the effect of the shift step. We had previously left ??? comments about the issue. Tested-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/translate.c | 84 +++++++++++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 19 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 9d31ef5764..6da9503f33 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -994,7 +994,8 @@ static TCGv_i64 get_psw_carry(DisasContext *ctx, bool d) =20 /* Compute signed overflow for addition. */ static TCGv_i64 do_add_sv(DisasContext *ctx, TCGv_i64 res, - TCGv_i64 in1, TCGv_i64 in2) + TCGv_i64 in1, TCGv_i64 in2, + TCGv_i64 orig_in1, int shift, bool d) { TCGv_i64 sv =3D tcg_temp_new_i64(); TCGv_i64 tmp =3D tcg_temp_new_i64(); @@ -1003,9 +1004,49 @@ static TCGv_i64 do_add_sv(DisasContext *ctx, TCGv_i6= 4 res, tcg_gen_xor_i64(tmp, in1, in2); tcg_gen_andc_i64(sv, sv, tmp); =20 + switch (shift) { + case 0: + break; + case 1: + /* Shift left by one and compare the sign. */ + tcg_gen_add_i64(tmp, orig_in1, orig_in1); + tcg_gen_xor_i64(tmp, tmp, orig_in1); + /* Incorporate into the overflow. */ + tcg_gen_or_i64(sv, sv, tmp); + break; + default: + { + int sign_bit =3D d ? 63 : 31; + + /* Compare the sign against all lower bits. */ + tcg_gen_sextract_i64(tmp, orig_in1, sign_bit, 1); + tcg_gen_xor_i64(tmp, tmp, orig_in1); + /* + * If one of the bits shifting into or through the sign + * differs, then we have overflow. + */ + tcg_gen_extract_i64(tmp, tmp, sign_bit - shift, shift); + tcg_gen_movcond_i64(TCG_COND_NE, sv, tmp, ctx->zero, + tcg_constant_i64(-1), sv); + } + } return sv; } =20 +/* Compute unsigned overflow for addition. */ +static TCGv_i64 do_add_uv(DisasContext *ctx, TCGv_i64 cb, TCGv_i64 cb_msb, + TCGv_i64 in1, int shift, bool d) +{ + if (shift =3D=3D 0) { + return get_carry(ctx, d, cb, cb_msb); + } else { + TCGv_i64 tmp =3D tcg_temp_new_i64(); + tcg_gen_extract_i64(tmp, in1, (d ? 63 : 31) - shift, shift); + tcg_gen_or_i64(tmp, tmp, get_carry(ctx, d, cb, cb_msb)); + return tmp; + } +} + /* Compute signed overflow for subtraction. */ static TCGv_i64 do_sub_sv(DisasContext *ctx, TCGv_i64 res, TCGv_i64 in1, TCGv_i64 in2) @@ -1020,19 +1061,19 @@ static TCGv_i64 do_sub_sv(DisasContext *ctx, TCGv_i= 64 res, return sv; } =20 -static void do_add(DisasContext *ctx, unsigned rt, TCGv_i64 in1, +static void do_add(DisasContext *ctx, unsigned rt, TCGv_i64 orig_in1, TCGv_i64 in2, unsigned shift, bool is_l, bool is_tsv, bool is_tc, bool is_c, unsigned cf, bool d) { - TCGv_i64 dest, cb, cb_msb, cb_cond, sv, tmp; + TCGv_i64 dest, cb, cb_msb, in1, uv, sv, tmp; unsigned c =3D cf >> 1; DisasCond cond; =20 dest =3D tcg_temp_new_i64(); cb =3D NULL; cb_msb =3D NULL; - cb_cond =3D NULL; =20 + in1 =3D orig_in1; if (shift) { tmp =3D tcg_temp_new_i64(); tcg_gen_shli_i64(tmp, in1, shift); @@ -1050,9 +1091,6 @@ static void do_add(DisasContext *ctx, unsigned rt, TC= Gv_i64 in1, } tcg_gen_xor_i64(cb, in1, in2); tcg_gen_xor_i64(cb, cb, dest); - if (cond_need_cb(c)) { - cb_cond =3D get_carry(ctx, d, cb, cb_msb); - } } else { tcg_gen_add_i64(dest, in1, in2); if (is_c) { @@ -1063,18 +1101,23 @@ static void do_add(DisasContext *ctx, unsigned rt, = TCGv_i64 in1, /* Compute signed overflow if required. */ sv =3D NULL; if (is_tsv || cond_need_sv(c)) { - sv =3D do_add_sv(ctx, dest, in1, in2); + sv =3D do_add_sv(ctx, dest, in1, in2, orig_in1, shift, d); if (is_tsv) { if (!d) { tcg_gen_ext32s_i64(sv, sv); } - /* ??? Need to include overflow from shift. */ gen_helper_tsv(tcg_env, sv); } } =20 + /* Compute unsigned overflow if required. */ + uv =3D NULL; + if (cond_need_cb(c)) { + uv =3D do_add_uv(ctx, cb, cb_msb, orig_in1, shift, d); + } + /* Emit any conditional trap before any writeback. */ - cond =3D do_cond(ctx, cf, d, dest, cb_cond, sv); + cond =3D do_cond(ctx, cf, d, dest, uv, sv); if (is_tc) { tmp =3D tcg_temp_new_i64(); tcg_gen_setcond_i64(cond.c, tmp, cond.a0, cond.a1); @@ -2843,7 +2886,6 @@ static bool trans_dcor_i(DisasContext *ctx, arg_rr_cf= _d *a) static bool trans_ds(DisasContext *ctx, arg_rrr_cf *a) { TCGv_i64 dest, add1, add2, addc, in1, in2; - TCGv_i64 cout; =20 nullify_over(ctx); =20 @@ -2880,19 +2922,23 @@ static bool trans_ds(DisasContext *ctx, arg_rrr_cf = *a) tcg_gen_xor_i64(cpu_psw_cb, add1, add2); tcg_gen_xor_i64(cpu_psw_cb, cpu_psw_cb, dest); =20 - /* Write back PSW[V] for the division step. */ - cout =3D get_psw_carry(ctx, false); - tcg_gen_neg_i64(cpu_psw_v, cout); + /* + * Write back PSW[V] for the division step. + * Shift cb{8} from where it lives in bit 32 to bit 31, + * so that it overlaps r2{32} in bit 31. + */ + tcg_gen_shri_i64(cpu_psw_v, cpu_psw_cb, 1); tcg_gen_xor_i64(cpu_psw_v, cpu_psw_v, in2); =20 /* Install the new nullification. */ if (a->cf) { - TCGv_i64 sv =3D NULL; + TCGv_i64 sv =3D NULL, uv =3D NULL; if (cond_need_sv(a->cf >> 1)) { - /* ??? The lshift is supposed to contribute to overflow. */ - sv =3D do_add_sv(ctx, dest, add1, add2); + sv =3D do_add_sv(ctx, dest, add1, add2, in1, 1, false); + } else if (cond_need_cb(a->cf >> 1)) { + uv =3D do_add_uv(ctx, cpu_psw_cb, NULL, in1, 1, false); } - ctx->null_cond =3D do_cond(ctx, a->cf, false, dest, cout, sv); + ctx->null_cond =3D do_cond(ctx, a->cf, false, dest, uv, sv); } =20 return nullify_end(ctx); @@ -3419,7 +3465,7 @@ static bool do_addb(DisasContext *ctx, unsigned r, TC= Gv_i64 in1, tcg_gen_add_i64(dest, in1, in2); } if (cond_need_sv(c)) { - sv =3D do_add_sv(ctx, dest, in1, in2); + sv =3D do_add_sv(ctx, dest, in1, in2, in1, 0, d); } =20 cond =3D do_cond(ctx, c * 2 + f, d, dest, cb_cond, sv); --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751639; cv=none; d=zohomail.com; s=zohoarc; b=b8z33eVNV6K1CHqvLH1PlguSfAUwer+ierDARFTb4z/ZiTxCsVZLZfGS9Nwlm44vQWnPIFvHpfr8LjV30wsQx3kscljtWYQpxfhnQ9ZCgP6vvDNq0KaSBCUWDXR5YasTUniIJT8fC/kias1To9hnZWgc1rLPx8SjL4WhEq3FCQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751639; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zvYdGosSJzx/q33wx/CPl4VQF18FxpEZiKeNYnXcRT0=; b=ez5PI6AtwOoeLI78j6H46UvBii/+fueSGuoyAoyOcEVVUP3gtP+Ac4Wvy4M855W9QcIrCcAcogi5bpBp18421v7wIGNEB43bRX/NC5zeZtGzi6yYxDqAEsqwgOZsJlFMu++vH5otFKdv/GfZgDfGpntQ9XewqlPDmqsB/raKWyk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751639408325.18224470641155; Fri, 29 Mar 2024 15:33:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKlR-0002gE-Jm; Fri, 29 Mar 2024 18:31: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 1rqKl9-0002aO-0D for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:41 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKl7-0003Xv-FA for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:38 -0400 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-5d8b70b39efso1864554a12.0 for ; Fri, 29 Mar 2024 15:31:37 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751496; x=1712356296; 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=zvYdGosSJzx/q33wx/CPl4VQF18FxpEZiKeNYnXcRT0=; b=uW0yAgHdKw3RL8yHmHUuVMeIb2CnAfgQLKTUWz3/Lk8NT0kc2u7170bwQOVT4UPDAO 0EIHiQ55XPN5MZnCXiqWeDBOMlvKIVCIg4KFnegpxKGzM/rdgLaSTvgbxK++LC2xB0sO 9p5nZtm3bQ7+C2I55nuSB+3mjb8w9fUPvEv6CMhKGnGQJDDYyeICTuZAYTHnhaDqHoM5 7F4OSBuasxx5oZz4hn0nV9ejrzQwBwM7Y0+3qcRQWJkUZQIDwkiys3Ns3VnVXt/IeTSq C7O/jiiJrupnyORjsEu0ZRk63LmfQgtdqwicq6I78nUUFGVF7Bq7xNzp263r4TX/cSBY H6VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751496; x=1712356296; 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=zvYdGosSJzx/q33wx/CPl4VQF18FxpEZiKeNYnXcRT0=; b=ps6e/Fa/syplU72dBjAkEWL45n0wDibo0sMdgPfG8mrADPbIJYBYbFG9CPgCv7e0Db SCumxjeje+/RSIMs0ntjwEDN1m6zqjqNkRiX5pVIjh/zUu2HMIQe5yr5mvUhKVuAWJsB e5Pj3VjFeVOiHXldJG3x0qBb0UQXP/PCFoUHLuB59gHCHmFRj0jZe3huueXi64NzuQmZ fyMqyPkrGyVw1r6SWRaTVX2BNQySlzSwA0fhcPrseF5I4fBQR+dBdDW/jTpZ+R0/XfRA C16XetZ9N7id5z+CqqkCSHGphUiBZ4WeYWoJnavs5NCd1p+D7LY8Y21HZzz59PIdY4Lg J5xQ== X-Gm-Message-State: AOJu0Yzno7sK/sIizEeIxPI/1KPSxAxcxWKShxHAreW3GaEVZarVhN5+ fZ8VrqAWu5Joy2739CN0rNaiL3xRmvlJP0DWAi/7XhQNgW1S3qEt7GrSms6FgQpCX5dAoRXBPmb E X-Google-Smtp-Source: AGHT+IEzx0eKXkUhJxxXgts34Av8eqk1BrGIv1lJ9gLiwDIf9yI6p5a14UoAffntv3qNGDRQJfoo6Q== X-Received: by 2002:a17:902:db0e:b0:1e0:fdc6:e4d3 with SMTP id m14-20020a170902db0e00b001e0fdc6e4d3mr4170025plx.49.1711751495975; Fri, 29 Mar 2024 15:31:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 15/18] target/hppa: Generate getshadowregs inline Date: Fri, 29 Mar 2024 12:31:08 -1000 Message-Id: <20240329223111.1735826-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::530; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x530.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751639888100001 Content-Type: text/plain; charset="utf-8" This operation is trivial and does not require a helper. Reviewed-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/helper.h | 1 - target/hppa/sys_helper.c | 4 ++-- target/hppa/translate.c | 17 +++++++++++++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/target/hppa/helper.h b/target/hppa/helper.h index 8fd7ba65d8..5900fd70bc 100644 --- a/target/hppa/helper.h +++ b/target/hppa/helper.h @@ -86,7 +86,6 @@ DEF_HELPER_FLAGS_0(read_interval_timer, TCG_CALL_NO_RWG, = tl) #ifndef CONFIG_USER_ONLY DEF_HELPER_1(halt, noreturn, env) DEF_HELPER_1(reset, noreturn, env) -DEF_HELPER_1(getshadowregs, void, env) DEF_HELPER_1(rfi, void, env) DEF_HELPER_1(rfi_r, void, env) DEF_HELPER_FLAGS_2(write_interval_timer, TCG_CALL_NO_RWG, void, env, tl) diff --git a/target/hppa/sys_helper.c b/target/hppa/sys_helper.c index 4a31748342..208e51c086 100644 --- a/target/hppa/sys_helper.c +++ b/target/hppa/sys_helper.c @@ -95,7 +95,7 @@ void HELPER(rfi)(CPUHPPAState *env) cpu_hppa_put_psw(env, env->cr[CR_IPSW]); } =20 -void HELPER(getshadowregs)(CPUHPPAState *env) +static void getshadowregs(CPUHPPAState *env) { env->gr[1] =3D env->shadow[0]; env->gr[8] =3D env->shadow[1]; @@ -108,7 +108,7 @@ void HELPER(getshadowregs)(CPUHPPAState *env) =20 void HELPER(rfi_r)(CPUHPPAState *env) { - helper_getshadowregs(env); + getshadowregs(env); helper_rfi(env); } =20 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 6da9503f33..29e4a64e40 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2385,14 +2385,23 @@ static bool trans_reset(DisasContext *ctx, arg_rese= t *a) #endif } =20 -static bool trans_getshadowregs(DisasContext *ctx, arg_getshadowregs *a) +static bool do_getshadowregs(DisasContext *ctx) { CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR); -#ifndef CONFIG_USER_ONLY nullify_over(ctx); - gen_helper_getshadowregs(tcg_env); + tcg_gen_ld_i64(cpu_gr[1], tcg_env, offsetof(CPUHPPAState, shadow[0])); + tcg_gen_ld_i64(cpu_gr[8], tcg_env, offsetof(CPUHPPAState, shadow[1])); + tcg_gen_ld_i64(cpu_gr[9], tcg_env, offsetof(CPUHPPAState, shadow[2])); + tcg_gen_ld_i64(cpu_gr[16], tcg_env, offsetof(CPUHPPAState, shadow[3])); + tcg_gen_ld_i64(cpu_gr[17], tcg_env, offsetof(CPUHPPAState, shadow[4])); + tcg_gen_ld_i64(cpu_gr[24], tcg_env, offsetof(CPUHPPAState, shadow[5])); + tcg_gen_ld_i64(cpu_gr[25], tcg_env, offsetof(CPUHPPAState, shadow[6])); return nullify_end(ctx); -#endif +} + +static bool trans_getshadowregs(DisasContext *ctx, arg_getshadowregs *a) +{ + return do_getshadowregs(ctx); } =20 static bool trans_nop_addrx(DisasContext *ctx, arg_ldst *a) --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751621; cv=none; d=zohomail.com; s=zohoarc; b=aoanfE0RCeKOMgzCt3iVNdKQc7u9+jmF1070kLN1f2cxM4+IEE7eLBXWlEx+RPa+bOt9JOhCHqxEdR5ACgGjdgwQduVb78Lo8Vootv2CwV2U8xlzTUS3ytA5MpAuL6hlCkJvLgTeLpFCdn9FvSkBhfoPfoochxVuLnZ9JFh4Kd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751621; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3k8lclmQQ4F8nUAdVeP5eeR9f55SSu6v457WolvggHw=; b=VOveP439yZeFuliz1VuNbeG0eraQab5IgKwECE594jSfKMWQGUwNqZNtXJeJKSfkVCAiGkieOpcGz9/Bf2nBKUOv3rEh9pzGfTcvi++Pdr5qpVawpymtDp91C6xdMKBwPDfV/bW6/j62JlORHSYSqdyMP11Qt1xAgaNIVcYhQXQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171175162174016.643987731506627; Fri, 29 Mar 2024 15:33:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKlO-0002dm-MX; Fri, 29 Mar 2024 18:31: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 1rqKlA-0002aX-Kn for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:41 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKl8-0003YG-VU for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:40 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2a07b092c4fso1847308a91.0 for ; Fri, 29 Mar 2024 15:31:38 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751498; x=1712356298; 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=3k8lclmQQ4F8nUAdVeP5eeR9f55SSu6v457WolvggHw=; b=MrPgI1jPVK2ZeMAkOVKZ++573BpCmNzciLfeHzow6CaENov8pQ2yBIP+sI4bOWa8+4 JPIe2ZIvSABnXHLIHcJXM8sQOimtKNKuBogrUbF2ny7GOEFQ2bqCYIYQYNpBmkOja29i 5E7S4grm1gHFp4UdC5yG/ke/2wIqAbqM3X8pAkL/2N/BB6Rnwa1Ly+rIHKdHKuZ0Tykk AOu/oGD/N5s67pie6p+NvAB6UTN5UCpTt5+wnMDDHeVoUyiawCcU2UmQqx6CAMStp7/v kK3YAPTx5srAQ5u6kNWPCwpJTAbLYWTykpip7HzhAFrgj0QeRp7qqc8huhU/9cS99w1q retA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751498; x=1712356298; 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=3k8lclmQQ4F8nUAdVeP5eeR9f55SSu6v457WolvggHw=; b=ZnluM28aH/MbNwZzK1iNBAhPlMdJtACLFJIERtnJ6G0drmrlXsP9DZs6qu0LrKQVKg Mxj0T69xb9MsK1jm8Y5PPt0h+APDxkck0BsDl84M6LcBpUapt8z7yX06ixDy1k5oOlN1 vEZEM+DBAsVQMSlNVYglKzEAyH4HcGw8kj61e3ySss3yQv68ISzwcZN/XbH/qXmPD03u sYUufTnA4pe3Ei2IbZ+EXbciQz4JplNWHJMhC0jYf1zIrTLnrpoh7eMbtrQ0AlNTtibB CmxCX+pvF9L8pMKxiDO+tFLxDZitVz9E58sb8xrpB2byYhruS10F4HdLrnIHesFCen7K tM8A== X-Gm-Message-State: AOJu0YxXRLyvcJQUmiNFnPmOe0EPdC5zaBJYEIG3fDQyusAsaHJY9K5P eX3XeKJmp/14n8geWPqpmLHl6Yr4khz1yBofpGMy+dlgGluD0eFkJ9zcmiASJap18Y9mmvG5jfh O X-Google-Smtp-Source: AGHT+IE3ci2n2Mg5c2xaHwqVC3dd+w5W5OXOR27L6HjVZWjaqW9+dQyk8g3kl1CLUQAkDjAHU8OS+w== X-Received: by 2002:a17:902:ec8b:b0:1e2:2e93:10ef with SMTP id x11-20020a170902ec8b00b001e22e9310efmr3293580plg.52.1711751497666; Fri, 29 Mar 2024 15:31:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 16/18] target/hppa: Move diag argument handling to decodetree Date: Fri, 29 Mar 2024 12:31:09 -1000 Message-Id: <20240329223111.1735826-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751623872100003 Content-Type: text/plain; charset="utf-8" Split trans_diag into per-operation functions. Reviewed-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/insns.decode | 8 +++++++- target/hppa/translate.c | 34 +++++++++++++++++++++------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index 6a74cf23cd..9f6ffd8e2c 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -634,4 +634,10 @@ fdiv_d 001110 ..... ..... 011 ..... ... .....= @f0e_d_3 xmpyu 001110 ..... ..... 010 .0111 .00 t:5 r1=3D%ra64 r2=3D%r= b64 =20 # diag -diag 000101 i:26 +{ + [ + diag_btlb 000101 00 0000 0000 0000 0001 0000 0000 + diag_cout 000101 00 0000 0000 0000 0001 0000 0001 + ] + diag_unimp 000101 i:26 +} diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 29e4a64e40..42dd3f2c8d 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -4572,23 +4572,31 @@ static bool trans_fmpyfadd_d(DisasContext *ctx, arg= _fmpyfadd_d *a) return nullify_end(ctx); } =20 -static bool trans_diag(DisasContext *ctx, arg_diag *a) +/* Emulate PDC BTLB, called by SeaBIOS-hppa */ +static bool trans_diag_btlb(DisasContext *ctx, arg_diag_btlb *a) { CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR); #ifndef CONFIG_USER_ONLY - if (a->i =3D=3D 0x100) { - /* emulate PDC BTLB, called by SeaBIOS-hppa */ - nullify_over(ctx); - gen_helper_diag_btlb(tcg_env); - return nullify_end(ctx); - } - if (a->i =3D=3D 0x101) { - /* print char in %r26 to first serial console, used by SeaBIOS-hpp= a */ - nullify_over(ctx); - gen_helper_diag_console_output(tcg_env); - return nullify_end(ctx); - } + nullify_over(ctx); + gen_helper_diag_btlb(tcg_env); + return nullify_end(ctx); #endif +} + +/* Print char in %r26 to first serial console, used by SeaBIOS-hppa */ +static bool trans_diag_cout(DisasContext *ctx, arg_diag_cout *a) +{ + CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR); +#ifndef CONFIG_USER_ONLY + nullify_over(ctx); + gen_helper_diag_console_output(tcg_env); + return nullify_end(ctx); +#endif +} + +static bool trans_diag_unimp(DisasContext *ctx, arg_diag_unimp *a) +{ + CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR); qemu_log_mask(LOG_UNIMP, "DIAG opcode 0x%04x ignored\n", a->i); return true; } --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751623; cv=none; d=zohomail.com; s=zohoarc; b=Wkg+zPHXvHTyqIdVSmD+4x37ACVnmF90EkmWq8+MDOGcEMfYBAvgH8fFoDxV0l3iau+cquPtSqdtU/+27P0J8Mvq49OwhmZh9qPEMIRN7Zmbh5QsnPJ1It3V2otyzS78hUFOrxUoXMAR3uLs1cuRFPbADjKYsy+GT4T1y/+wuR8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751623; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uX24NXcgU6IiX12Wm/xfyInlmTJOdDVKWFpfbbYjENA=; b=kFpsoq2d90VzHb0NJtkr0Z3+4D1m3vCN5VLfXNI/gIGvS1use0ISU0pv5bdcgW6k4g87UuGzkQEukTCPIwAbZ4WhT6ujpGYJ60OIQ1ZBflC/ebORNl0UQkqv0eOSHVYl8x0d8kGsz7mEkVgszWAF1fN4XZT3c4P0I40oXhNz17E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751623830269.4166720644056; Fri, 29 Mar 2024 15:33:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKlP-0002eT-DK; Fri, 29 Mar 2024 18:31:55 -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 1rqKlC-0002aw-NI for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:43 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKlA-0003YS-DQ for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:41 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1e0b213efa3so21816085ad.0 for ; Fri, 29 Mar 2024 15:31:39 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751499; x=1712356299; 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=uX24NXcgU6IiX12Wm/xfyInlmTJOdDVKWFpfbbYjENA=; b=OQvZuSeZldBeu0fXHKc0jzrY1CZCImKC7H362h3/nW4fwZXdOB60dfjft2Fwz84/sx pPUQH9kuRxV3POaudSdEZsECApdKOBRkFRJoDUKxaq20QuEk3wdU+i+CcDk/0kwn3HT5 l/K3y28ErVDBkHYCEk2rpEjE7sTy1/pX0RD6RiwamJGRDqNBDqwJ+CXmF6KgqSRUw2Lu 5oklnatBHCGW88t9zBKRhLwb5LRQ0bAe7DTiXshW8klbsuTeW020OTsa70lYMX+xTUlg e5LXPwv72T1h26KXylG8Oss5bYc4uyya9dGzpGzZzJtd6BcTTGlY1B5c6DtjNdIaI/P/ nwJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751499; x=1712356299; 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=uX24NXcgU6IiX12Wm/xfyInlmTJOdDVKWFpfbbYjENA=; b=fuyNCAd/UG+KnmVAHlRo2TYqhUpbmARPdbzDB8JxwkW92EwGAMtmtl7S9hzrz5R1ay LX2FD/d7/wIvrlYg4pwsMF8KGOGTFZsjlNOtYh/3wsL1WTxh8kLRgXtru0V6DbQ/1zjn cmGYIhoTefVrBOflH+uq5v9U02k6dD35b5+M8ZTiG3HTStHfZngUJYkxE1OFBSLtb3mW Cx+yXqRD/c55yESTeUnswlh3XtpK4ojiEwhlqO+nESO1/xssTly0p843mz1Kt6cN8qph 7AMKmGea8ZRe9w0zkJfQoKgKXuZZ9evAi6my+WRoWpyinxBMBLD9P4AfQYyRF6Oq3peP /kRQ== X-Gm-Message-State: AOJu0YxnIvHlj2xiNonkD9D6evnD38+cUDncHnBx93vns6BKyq2d3XZB G5W3QhtVk2FOmKcKkUEsbx+JMCr1fLDD14FxNoR6bKHVmoOXpfXZEo/ow8tOGp9KSOtOw15YnhV 7 X-Google-Smtp-Source: AGHT+IFIaEFtTKTy5ZwLtF0iKJhwCoFiYYugC5+haZecyj+LzGPxPkvBDJDcqpo6UkyPNDwojcXH0w== X-Received: by 2002:a17:902:d508:b0:1e0:cdbf:24c2 with SMTP id b8-20020a170902d50800b001e0cdbf24c2mr4464153plg.29.1711751499093; Fri, 29 Mar 2024 15:31:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller , Helge Deller Subject: [PULL 17/18] target/hppa: Add diag instructions to set/restore shadow registers Date: Fri, 29 Mar 2024 12:31:10 -1000 Message-Id: <20240329223111.1735826-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751625837100009 Content-Type: text/plain; charset="utf-8" From: Helge Deller The 32-bit PA-7300LC (PCX-L2) CPU and the 64-bit PA8700 (PCX-W2) CPU use different diag instructions to save or restore the CPU registers to/from the shadow registers. Implement those per-CPU architecture diag instructions to fix those parts of the HP ODE testcases (L2DIAG and WDIAG, section 1) which test the shadow registers. Signed-off-by: Helge Deller [rth: Use decodetree to distinguish cases] Signed-off-by: Richard Henderson Reviewed-by: Helge Deller Tested-by: Helge Deller --- target/hppa/insns.decode | 10 ++++++++++ target/hppa/translate.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index 9f6ffd8e2c..71074a64c1 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -65,6 +65,8 @@ # Argument set definitions #### =20 +&empty + # All insns that need to form a virtual address should use this set. &ldst t b x disp sp m scale size =20 @@ -638,6 +640,14 @@ xmpyu 001110 ..... ..... 010 .0111 .00 t:5 = r1=3D%ra64 r2=3D%rb64 [ diag_btlb 000101 00 0000 0000 0000 0001 0000 0000 diag_cout 000101 00 0000 0000 0000 0001 0000 0001 + + # For 32-bit PA-7300LC (PCX-L2) + diag_getshadowregs_pa1 000101 00 0000 0000 0001 1010 0000 0000 + diag_putshadowregs_pa1 000101 00 0000 0000 0001 1010 0100 0000 + + # For 64-bit PA8700 (PCX-W2) + diag_getshadowregs_pa2 000101 00 0111 1000 0001 1000 0100 0000 + diag_putshadowregs_pa2 000101 00 0111 0000 0001 1000 0100 0000 ] diag_unimp 000101 i:26 } diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 42dd3f2c8d..143818c2d9 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -2399,6 +2399,20 @@ static bool do_getshadowregs(DisasContext *ctx) return nullify_end(ctx); } =20 +static bool do_putshadowregs(DisasContext *ctx) +{ + CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR); + nullify_over(ctx); + tcg_gen_st_i64(cpu_gr[1], tcg_env, offsetof(CPUHPPAState, shadow[0])); + tcg_gen_st_i64(cpu_gr[8], tcg_env, offsetof(CPUHPPAState, shadow[1])); + tcg_gen_st_i64(cpu_gr[9], tcg_env, offsetof(CPUHPPAState, shadow[2])); + tcg_gen_st_i64(cpu_gr[16], tcg_env, offsetof(CPUHPPAState, shadow[3])); + tcg_gen_st_i64(cpu_gr[17], tcg_env, offsetof(CPUHPPAState, shadow[4])); + tcg_gen_st_i64(cpu_gr[24], tcg_env, offsetof(CPUHPPAState, shadow[5])); + tcg_gen_st_i64(cpu_gr[25], tcg_env, offsetof(CPUHPPAState, shadow[6])); + return nullify_end(ctx); +} + static bool trans_getshadowregs(DisasContext *ctx, arg_getshadowregs *a) { return do_getshadowregs(ctx); @@ -4594,6 +4608,26 @@ static bool trans_diag_cout(DisasContext *ctx, arg_d= iag_cout *a) #endif } =20 +static bool trans_diag_getshadowregs_pa1(DisasContext *ctx, arg_empty *a) +{ + return !ctx->is_pa20 && do_getshadowregs(ctx); +} + +static bool trans_diag_getshadowregs_pa2(DisasContext *ctx, arg_empty *a) +{ + return ctx->is_pa20 && do_getshadowregs(ctx); +} + +static bool trans_diag_putshadowregs_pa1(DisasContext *ctx, arg_empty *a) +{ + return !ctx->is_pa20 && do_putshadowregs(ctx); +} + +static bool trans_diag_putshadowregs_pa2(DisasContext *ctx, arg_empty *a) +{ + return ctx->is_pa20 && do_putshadowregs(ctx); +} + static bool trans_diag_unimp(DisasContext *ctx, arg_diag_unimp *a) { CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR); --=20 2.34.1 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711751616; cv=none; d=zohomail.com; s=zohoarc; b=nSFtyyIQnJtQnrTvSaX+RxmT2CnsPPqKoIP7OQY+RirLj/dtLjrzMwwA6FE0TZ3Ix5VqeWKOHukyfppM+H3xLEIfHXd1swBwG9cWy9isGRdNtqaouUVUjKln7R/Grlgk4433zURBLrWT7ROoIsLIYsDsLiYKPZm0TlHWW+UI8Z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711751616; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bWcnWOhOhEXp9gbRHbTUlAnAR9/XUgSdF/ra6Xk+uTg=; b=DxiEKJHmqNfrtwEQepv81UJv3CXn5TKwMC5lhUb1hrH6S6p/X35V/GXq//ce8BMAAVpsn78gNA7NBsyVslAoMTGtKQFRPZ+qR1P4sgtS0Qmfa+sH1h5fU2LXbEkAXCurmMifZDcoHlF/xN4TCq/ZJuzSIKsmdoEhZ3PqL4iU0TE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711751616474452.8053131748627; Fri, 29 Mar 2024 15:33:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKlP-0002dr-0J; Fri, 29 Mar 2024 18:31:55 -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 1rqKlD-0002bD-UA for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:44 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKlC-0003Yg-GT for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:31:43 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1e228c12468so9083815ad.1 for ; Fri, 29 Mar 2024 15:31:41 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f8-20020a170902684800b001e09b636cafsm4000955pln.287.2024.03.29.15.31.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711751500; x=1712356300; 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=bWcnWOhOhEXp9gbRHbTUlAnAR9/XUgSdF/ra6Xk+uTg=; b=BKHhxuytUIpPe8ynZAQkkGqsYzHH9h6DFZoXzWM74l/s6WudT625GAWZVD5CXLpzRq wu9WB3YUL9dezqrsmvWG2kP3EkkTrkgRzqU8X+xHfrarNtTuhi7C6+jEpEICa5vx+8cN lCv96S1t9lRKSYGlViCLYObPoQhPyyWEh0k/YAmpuXi/1EgkmvBUF7bEOKfOZv8qxID6 QxtRfbdhDoNAgxrV109/eIy4JnWuCZjMbuDR1ZQzVoyUVxckCWmXGLXNhfIO3QynwlMG 1RkHK2CVrqOSBbWl1usLqZ7mREbzXCBQi8SJk840eA5rNbQ69uXxc+oLDjL3bDL78q+w RzYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711751500; x=1712356300; 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=bWcnWOhOhEXp9gbRHbTUlAnAR9/XUgSdF/ra6Xk+uTg=; b=D68Rgr8bOGk+wBC+MomqDE4CxXNnT5GyLPW/fhi5hDqgLrWCKk3U1fHRru7w5QJy8G FgWVTKo3y2vIH7GE5VRCWKPGgepFRey5hAj1Vb1cNWCma5tEdEwcvu4QYy0m+mZmPVfD gWO4AG3tFar5Ihfvv02lCLjDA4UoDeNXRHzSpPCvQbJeJEfv+4ajeuOhBecwGI/Y+fNm hc0mxNkqxbLJZzaXGRph4LuZzmY1ZFm9wYn9/I1FOtrborwDgKM2sKZg86NQDMOZlZT7 BASXAx0OWZjvp6ceQlqelGjl8raG3W3D96Qi0Ef4BTVgs0yFPnexTTkqs+Yvpd+k7gkN 0TJQ== X-Gm-Message-State: AOJu0YzMv+6kgiNDj56t8Ya/KxXii9EaXs3KbW3GJ0qIjTwnHU9quBvc VG8qy3jy0hn+3cERyYlL8QFpKWJBmS21AvXtOaAIRlMKCF5jtVZcPjcO11lGVCPo0jSnnSxfWYA r X-Google-Smtp-Source: AGHT+IHWkzXUZxZ0SCQV2CpsttSh1cNNzz+fBWDbapY6DjBw6rgLM+c6RpvtkKGZ9PCpH9V9JBFatw== X-Received: by 2002:a17:903:11cc:b0:1e1:a75:a095 with SMTP id q12-20020a17090311cc00b001e10a75a095mr5352636plh.25.1711751500662; Fri, 29 Mar 2024 15:31:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Sven Schnelle , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 18/18] target/hppa: Clear psw_n for BE on use_nullify_skip path Date: Fri, 29 Mar 2024 12:31:11 -1000 Message-Id: <20240329223111.1735826-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329223111.1735826-1-richard.henderson@linaro.org> References: <20240329223111.1735826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711751617806100003 Along this path we have already skipped the insn to be nullified, so the subsequent insn should be executed. Cc: qemu-stable@nongnu.org Reported-by: Sven Schnelle Tested-by: Sven Schnelle Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- target/hppa/translate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 143818c2d9..8a1a8bc3aa 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -3948,6 +3948,7 @@ static bool trans_be(DisasContext *ctx, arg_be *a) copy_iaoq_entry(ctx, cpu_iaoq_b, -1, tmp); tcg_gen_mov_i64(cpu_iasq_f, new_spc); tcg_gen_mov_i64(cpu_iasq_b, cpu_iasq_f); + nullify_set(ctx, 0); } else { copy_iaoq_entry(ctx, cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b); if (ctx->iaoq_b =3D=3D -1) { --=20 2.34.1