From nobody Fri Nov 14 22:18:40 2025 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=1759997970; cv=none; d=zohomail.com; s=zohoarc; b=b7tCjqfQBO7SOjwlsw0W2YHQgKmG4sOfTZHY0i9v0JhUKpmEnwCNxqd9gPRfxdNwxj3cWIMUBwHRd21B5hF8ENaJTP9GtttA7v2hjrBRBOo9+q0gn9Gym62+JVN7GEx1U4lGGVA45w0MCONYtiQCbkKH02xJ1d5yhM653Za1tak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759997970; 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=I6xYsvCSK4rbEWmr9hp03tz8RUCvGH9H+ecrsoWlrsU=; b=SjGuie8SYJVXI962MkowPNpmST5U7t7rqcVZw61HeEfejerGPNYj3/huNDMZu43l2d/Kvh1pahNn/EjqH+aNZU56kt0apJPthGEz65PjmknXx81jgchpgWwQuSUC5p4iPO0FDAQU7agC6G6AO+jtFORimPOQfl6x4WJ8hUvrRN8= 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 1759997970721790.5727318011824; Thu, 9 Oct 2025 01:19:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6lrp-0004Ub-Q2; Thu, 09 Oct 2025 04:19:17 -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 1v6lrn-0004UQ-Vz for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:16 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6lrl-00085j-64 for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:15 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e48d6b95fso5904665e9.3 for ; Thu, 09 Oct 2025 01:19:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fab633cdasm31076305e9.9.2025.10.09.01.19.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 01:19:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759997950; x=1760602750; 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=I6xYsvCSK4rbEWmr9hp03tz8RUCvGH9H+ecrsoWlrsU=; b=KApJWuEHdrxSNpk8Lab8arI4jhbccJdQMyahSxa1XT65BWToZous2V7H4zB1xVhVVQ gru3zoYsMSkoFuBmTarcSESRsubkWqzSTDp79TmYWJKJgjhD6hYWlEaVQIabvs0CgVmh pgJYVdJ7/Qmqv+HXJFmg1v+Yjv1JMgZOpDzfKtb3OEdcWsbvm6MPB4svM/X27i8qgvdY HJb05LqEPbhnpLeJic6csjt5oTDAx/OjICL5xPUo3iYX/ZdrGI/99L97YH8hESsJuXuS P1JZnKVDFr32zrbqyPFXZm9xHjeycc/8EtVAxQAxV5ltOEdAiAAzwobDV2H/IE5MsUwo sTWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759997950; x=1760602750; 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=I6xYsvCSK4rbEWmr9hp03tz8RUCvGH9H+ecrsoWlrsU=; b=jV5WTOwVU5CqKpEn3xnP4xFF0zTXCzlsRaLBP5LA+EWmxX1O9gumPNE7PRhW8aDRLf UrDtIrf3M9QMXjlTOSTLl1HM+1xUYSUQFjvmsbTCUu6EXBHEHwHObgpYN53HVyM/zBzA cS/JIelue6seIQUP1MeV/sN6S0O1WJHYkRuiVbciv8wSwWsXkglbBh7Si4MMM3/Z+RY4 /4ZeMZ71Hbo+HZhnizJ8cxDLUMQfkGI7wPrJxIPNzI7Ymkr/k8DOyxI+lCujsrDLKiq7 7Jlqm7/qV72OPqp8EK6eb7dVoPSiY0wLjgfz+mAPUVMfBvEfdqwUdveHDLQ9I0qHZWpP KPiA== X-Gm-Message-State: AOJu0YyFkQHH5vHO732hi2h/0S43+au6izZaOR+N+MbwE+frsJ1IGcZ2 udZO1cu3Ox3CfK5O4pdPGvkGitn7R1+iB1dTnt2nGgRzBh/9QAaUxpSG5DlxmQWc8mmGp/UzlBf UIx8IDVPohQ== X-Gm-Gg: ASbGnctWM3Bd+8o936RDtTSNmh3bRDVVyHHmwJI2RN7KTZDdsJA0SUvtFedeXKZ5h4l z0llcWXcZVMGCjn+wuz1mp6OAtY7na/Qe2crljSt/uVw/TBoMLx/FQfAvN7Q7j/n1fN/+p1c5oE uImmZ+YC6F7YyY+Nua7UQvZ+pkmeyC/mnpHXOdgm0MYzPfqXBCF8OlCgYJay7HBNloEWruM2vbm VvrY+ZL7Oj7Ee5kl07cct6tdJfp28c77TrMKM23cyW30IwoYYwjrMASYzzNsa21cVtQteOFzFzB EpDR6CUZ2XwvfwY3I1KJdSk0/NXlX8pqq/pliLzkhHP8A++qOLBaz9BS8Ma46pPjjYWFr3ZGCcf +lA7a7mBYG3xMqqstxOKKeghPnBHscYxu38YuS7bYZFoSXjJtG5TUSHJZqcY8OQwL5kPgaIOCfv bfPjugHK/Bv9Q6ZMo/MSbeMD3g X-Google-Smtp-Source: AGHT+IEmlx+ooLWqP3TU/+F+6n8ApNEDxyheXBxav6koVBJQVidVegLpgP7uLEXQ26aYAkUGFh2etg== X-Received: by 2002:a05:600c:34c2:b0:46e:502c:8d6a with SMTP id 5b1f17b1804b1-46fa9b06499mr40068375e9.25.1759997950032; Thu, 09 Oct 2025 01:19:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Stafford Horne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 01/10] target/openrisc: Replace VMSTATE_UINTTL() -> VMSTATE_UINT32() Date: Thu, 9 Oct 2025 10:18:53 +0200 Message-ID: <20251009081903.13426-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009081903.13426-1-philmd@linaro.org> References: <20251009081903.13426-1-philmd@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=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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: 1759997972563154100 Both OpenRISCTLBEntry fields are of uint32_t type. Use the appropriate VMSTATE_UINT32() macro. There is no functional change (the migration stream is not modified), because the OpenRISC targets are only built as 32-bit: $ git grep TARGET_LONG_BITS configs/targets/or1k-* configs/targets/or1k-linux-user.mak:5:TARGET_LONG_BITS=3D32 configs/targets/or1k-softmmu.mak:5:TARGET_LONG_BITS=3D32 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Richard Henderson --- target/openrisc/machine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c index 081c706d02c..fa054e528bd 100644 --- a/target/openrisc/machine.c +++ b/target/openrisc/machine.c @@ -26,8 +26,8 @@ static const VMStateDescription vmstate_tlb_entry =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { - VMSTATE_UINTTL(mr, OpenRISCTLBEntry), - VMSTATE_UINTTL(tr, OpenRISCTLBEntry), + VMSTATE_UINT32(mr, OpenRISCTLBEntry), + VMSTATE_UINT32(tr, OpenRISCTLBEntry), VMSTATE_END_OF_LIST() } }; --=20 2.51.0 From nobody Fri Nov 14 22:18:40 2025 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=1759998214; cv=none; d=zohomail.com; s=zohoarc; b=GlbEbYTF9ZM05iWgTtSAHzcEcfeVtStdxPwZzKgw6RlQXZZC45s56+Iqb0j8fVTDcs8hxpAeT5hzIJy6/b9dn1H8Og5I1cuTaNfmrSn2zejWZuj8kCJu3HbCvUk0UI/J3rJhZgdVJMJnVAgL9OnB1xNMuJwVTHD+L2Gb4EIOjsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759998214; 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=jRrTRs7WoVTfIvsVIS3uf213phlt7Hh6/hCzWrLKURg=; b=DoPveUT9EwDBdYeOFmFn08ub0l5aGO9xMgPYnEP3CPbrmbeRx2FpbUrmQBKJypIww3BjR7hgXhDwxK5uMuZ52veRepAwt7VHN/zDvz5pNxFiwgsve9/EDsgGdB71A1b6xIuijgpcdMxT0b+kK7E96I3MhlBtjWN0tW569BD2AKY= 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 1759998214323536.6753221595484; Thu, 9 Oct 2025 01:23:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6lrv-0004Za-2b; Thu, 09 Oct 2025 04:19:23 -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 1v6lrt-0004Vd-AA for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:21 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6lrp-000864-9V for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:21 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3ece0e4c5faso791123f8f.1 for ; Thu, 09 Oct 2025 01:19:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8a6c54sm33859572f8f.11.2025.10.09.01.19.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 01:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759997955; x=1760602755; 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=jRrTRs7WoVTfIvsVIS3uf213phlt7Hh6/hCzWrLKURg=; b=uUclbX+HefDPKWmhZ5rsw/jK1A0vdRD26JL0+Hk4WNKcTMXjJiBQXL47bbHZqez+c9 SrEe+sAmMjAHcVliaHjF9hJKwWiapSAkqHAjLzGSZdykk+VoMKLNUk5oW7qvyaWxg8dq Lcpkdq55wGZ8onijNxzD/D0EMH5N6g1MjF5BpOlIeGcbcjDFT6LE/lum5e3NSBPIr4Jx UhdAnXqJmllfFgF4zuWcAyLarbIEcQitMczx+J/O0uk24tqU2GXumEHPvoS9sUXbk/eU nFHgIeRfXE9n6nC9I7XA3KdDel8KKQDUB5WV7ztCBQJdOpNArDgvMBBRjzF5GWJGssw/ xGUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759997955; x=1760602755; 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=jRrTRs7WoVTfIvsVIS3uf213phlt7Hh6/hCzWrLKURg=; b=qWnwl+z8dNohUof0W3QdEYlhhF5Yy5GmVnNy69OF3ijH8Mc8ucOoEN4yqgPwXoMT69 +A8xMhiFLX9Ex4GsN8d/YgGssWKVFaYzJjr977mheyo8y5/zWQnxW9zAshzMZtdzkSgW mf8BIsdu66QLuDOK9VTS0SOOIY1WjoZoO3Wf47DGOuHygDvdIqLfbaHd/TUBGcic6WUO XfAmvODudDRO0lOlPc0U82GznuH0Ap2xOJGsMhi/xE2sxu11FqBVUTrpYOAciuHiLm5t 5lhqFTpT2h4cvOjqjWQWfnyfikANbm0/E6Zz8/dxw3BY3TixGe+JT87VnkYCyLTxhRUU gWMQ== X-Gm-Message-State: AOJu0YzOapge7aIz8pVJqqNP3Pz2079aQBOvA7PMxUvcg3Ft/4zJ1Bxs EsprlnTgmhe0T34PqLthbHGOM6HYJ+xHJJKro279o3rzbwRRsPmjluSUcjwd1tunp2A+FatG0bv HcL5HRnnC7Q== X-Gm-Gg: ASbGnct39wW6N19OI+q9YPjVd+N6qX5yvmUiTr6OO+9KmPdHY+16kF5I2UOoY7erwLK Gwqlc19E229s7uGXaMBOsx64ZYKECCAy0BJ8+9ZXeetJc6qJAAsDRb+NVxz48qU8DqUzGakKYd/ 5+l5Nr0nSSzNRFBdw0/1inxszbFSGpw+CL0diznMglihGWdeVBjP1cJ0q5lGRY+Kaeh+KezNsCG gqzgWLwEC4VpWsUDzaU8Wb81U7XlqK2r1MJgGXzYrWSsvBi9lUdjhTo2cdyIr+BVKZWkktZG+xW 8EfxQvLYLC0QGXf6A7KqLa7ztIfueeytpsZywCzj768+8CUA7RDA5GNHG0OD48Ycit1kdA0a3UF biWhKs8+tOEFOeInYqrsup+DrRNhF53aRk2E6Tv5XiD4HqLGsz+PyY3H/Z/mzdrVcx9jFcUSYfP 9M6G9BBiOozYSWyyO+2H3OrIBX X-Google-Smtp-Source: AGHT+IHbkEwhcb0a+SxV83eovWwSRB/gCUymshoKelixtahLyqlfX5oepAUef/HPKZilMTN6Mdu8vA== X-Received: by 2002:a05:6000:4382:b0:404:ac77:6598 with SMTP id ffacd0b85a97d-42666ac3fc9mr4728779f8f.11.1759997954689; Thu, 09 Oct 2025 01:19:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Stafford Horne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 02/10] target/openrisc: Explode MO_TExx -> MO_TE | MO_xx Date: Thu, 9 Oct 2025 10:18:54 +0200 Message-ID: <20251009081903.13426-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009081903.13426-1-philmd@linaro.org> References: <20251009081903.13426-1-philmd@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=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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: 1759998217779154100 Extract the implicit MO_TE definition in order to replace it in the next commit. Mechanical change using: $ for n in UW UL UQ UO SW SL SQ; do \ sed -i -e "s/MO_TE$n/MO_TE | MO_$n/" \ $(git grep -l MO_TE$n target/openrisc); \ done Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/openrisc/translate.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 5ab3bc7021d..df0ebcd3138 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -647,7 +647,7 @@ static bool trans_l_lwa(DisasContext *dc, arg_load *a) check_r0_write(dc, a->d); ea =3D tcg_temp_new(); tcg_gen_addi_tl(ea, cpu_R(dc, a->a), a->i); - tcg_gen_qemu_ld_tl(cpu_R(dc, a->d), ea, dc->mem_idx, MO_TEUL); + tcg_gen_qemu_ld_tl(cpu_R(dc, a->d), ea, dc->mem_idx, MO_TE | MO_UL); tcg_gen_mov_tl(cpu_lock_addr, ea); tcg_gen_mov_tl(cpu_lock_value, cpu_R(dc, a->d)); return true; @@ -665,13 +665,13 @@ static void do_load(DisasContext *dc, arg_load *a, Me= mOp mop) =20 static bool trans_l_lwz(DisasContext *dc, arg_load *a) { - do_load(dc, a, MO_TEUL); + do_load(dc, a, MO_TE | MO_UL); return true; } =20 static bool trans_l_lws(DisasContext *dc, arg_load *a) { - do_load(dc, a, MO_TESL); + do_load(dc, a, MO_TE | MO_SL); return true; } =20 @@ -689,13 +689,13 @@ static bool trans_l_lbs(DisasContext *dc, arg_load *a) =20 static bool trans_l_lhz(DisasContext *dc, arg_load *a) { - do_load(dc, a, MO_TEUW); + do_load(dc, a, MO_TE | MO_UW); return true; } =20 static bool trans_l_lhs(DisasContext *dc, arg_load *a) { - do_load(dc, a, MO_TESW); + do_load(dc, a, MO_TE | MO_SW); return true; } =20 @@ -713,7 +713,7 @@ static bool trans_l_swa(DisasContext *dc, arg_store *a) =20 val =3D tcg_temp_new(); tcg_gen_atomic_cmpxchg_tl(val, cpu_lock_addr, cpu_lock_value, - cpu_R(dc, a->b), dc->mem_idx, MO_TEUL); + cpu_R(dc, a->b), dc->mem_idx, MO_TE | MO_UL); tcg_gen_setcond_tl(TCG_COND_EQ, cpu_sr_f, val, cpu_lock_value); =20 tcg_gen_br(lab_done); @@ -735,7 +735,7 @@ static void do_store(DisasContext *dc, arg_store *a, Me= mOp mop) =20 static bool trans_l_sw(DisasContext *dc, arg_store *a) { - do_store(dc, a, MO_TEUL); + do_store(dc, a, MO_TE | MO_UL); return true; } =20 @@ -747,7 +747,7 @@ static bool trans_l_sb(DisasContext *dc, arg_store *a) =20 static bool trans_l_sh(DisasContext *dc, arg_store *a) { - do_store(dc, a, MO_TEUW); + do_store(dc, a, MO_TE | MO_UW); return true; } =20 --=20 2.51.0 From nobody Fri Nov 14 22:18:40 2025 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=1759998047; cv=none; d=zohomail.com; s=zohoarc; b=czvPeWbxoApRobYyuj+sfGaMfkCxf2hF6fjYJAiafD/K97S77f0padx559f3STw4c6jWVWclTtd9PiO4jHSxeGuj3VgXWI8MxlGAC8+40+RnqqkA27oAszmpHb3rKLjKamVcXo2Lbimgpl2AyNy8yuFWG3Xyo9Doe/7rh0HSx+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759998047; 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=bMijNpkW9Cbxoe8EeCnNCW3yaWU/MfuirlwyBX6LmoQ=; b=FJ/EHsJ90MXRMhHaU5BY+QP7SsPfuLDDW9O/RRbFndw6E8I93VVkPgEdZ3XnkFAI2dQgd5bsYBqtTVD4xVUxakOEQioZaTZEBafzwHQxg/4aQKJMx0hGUDOI0eyn6T7Xjkw8HNKhBeLZnAg2SNBRjd2VoIisS5WLvTBeD4n4uFE= 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 SMTP id 1759998047723274.7248503710084; Thu, 9 Oct 2025 01:20:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6lry-0004l2-9C; Thu, 09 Oct 2025 04:19:26 -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 1v6lrw-0004dW-65 for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:24 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6lrt-00086i-KJ for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:23 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-46e4473d7f6so3916715e9.1 for ; Thu, 09 Oct 2025 01:19:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fa9d6fb41sm71836505e9.17.2025.10.09.01.19.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 01:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759997959; x=1760602759; 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=bMijNpkW9Cbxoe8EeCnNCW3yaWU/MfuirlwyBX6LmoQ=; b=zM05X64xvviIjjQYtd/MP1a8HVxislvwfeFkpVn/lOPWPKdRFYJQ1ubcL+ik0m3DND edlgazKLUjdQqVwqQVUoVGmFMYk4mnIyhz1yROg+tMfxzoFxXQyQD3Uwofo9rT8otSyb FMcYnA997XFLQ/fPvMGQ7FDGSr0HfjCnxMqG1QDDgEGxOs2vN9iYlC81GuErHW52tFoo QD0biav71aMq34/QlsYKi2dhW7gEAy6VPsiycEoZxqDuKzRkNGPGtlB+VVrddXgeMg7j DQPtmpVekhH5ZARniJ7nw9fHeszhwSTVLjM5gvBBIXOZzNRgBNFG+Dq9H9rtUv6YQeYN UTOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759997959; x=1760602759; 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=bMijNpkW9Cbxoe8EeCnNCW3yaWU/MfuirlwyBX6LmoQ=; b=ZcOiVGgvszuxNxq28fyXcO0ICHv475Zn4HuUHe5eA+OlqHv8xWC6dlmj5EDizB4nCY +SLq+8pysmZTxTJ//KdPQ3G0dTIk01m8a/SP0/le6GMDmx9VI5YBUjkbrnXA5qDa0hMv QUvouwvWcPXg/ik+NCIIYep6h7Jy/o0tltVZFCsSfOXsZYokxHknPqNS9fg1x+mcO7Uw IH4SLVmlAWGZpobTENyHmADeXx+3PuugdpQ2kdKqgwZLio9gikiUiwrxhegfF2G1jhZK TAwkGTD0W2lfyCHZxt+Sjp3zSRCgDU2RuHce1sfOedtYPYuwiJDK2+VG3sdK0zlFMjOt Wbiw== X-Gm-Message-State: AOJu0Yw/T4GUO9mScFnTk1IVCwv+SzNVbTq66kkhJaOpfXriS0EMrNN2 ouuAyevEF+HFsF6d/13JKYL1j4of0BpcgEJ32NQMl5UsoPkU5efhpgM6rOfIgmH02ogz7Tm1/9I sEmYJp9tt9A== X-Gm-Gg: ASbGncuLu2c5q53Cog4AoWHzwSvUk4yLiFir2/q6wxNNjwL821a4jH2PvC3eR92Hd2s etmi4WgWere0LaEy7Zt0DXu/+NyQSaxIL60RI5vt1O5ZqM+gCUQhULNleKguZ2G5VG6zUwQ1emQ /cXNc6PSNGLxjuwRhXb1zo1tfFbsyALUoCij5/mODV/Jjmn2Y68Zbi5fy5TIHfTBcPeCYqzGxEP zj5syEnB+Qf4egk0FrKqQzRS1o0UsnaB/6IbX/50i6ions6z3BvpLO8WzEf1jAi/VvdeSn3CGJf 1glmREpjx4sLVSYgHSOgyQaj5M1lecDut9fUh3fCLUkGHLqWJ+2q9eLnVgdo5bbMB4kDRjjCxpt 9U3KioilMJ3JallZfq4SB4zALgLd6LogVt6FUZjZzHMqDqLaojlZvx74hYlYKb13l38Ea6HCcS9 FOkCia/RDck4Zu8RPbTTRIH2YX X-Google-Smtp-Source: AGHT+IHBz8E7foyG/BgE2ldTW+Iol0hGquJn6s5xTF9dnLse86vx9bHXm7ynGs66i0yOHLt5oFMjPA== X-Received: by 2002:a05:6000:604:b0:424:2275:63b4 with SMTP id ffacd0b85a97d-4266e8e4cd7mr4335841f8f.61.1759997959215; Thu, 09 Oct 2025 01:19:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Stafford Horne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 03/10] target/openrisc: Replace MO_TE -> MO_BE Date: Thu, 9 Oct 2025 10:18:55 +0200 Message-ID: <20251009081903.13426-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009081903.13426-1-philmd@linaro.org> References: <20251009081903.13426-1-philmd@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=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1759998049184154100 We only build the OpenRISC targets using big endianness order: $ git grep TARGET_BIG_ENDIAN configs/targets/or1k-* configs/targets/or1k-linux-user.mak:2:TARGET_BIG_ENDIAN=3Dy configs/targets/or1k-softmmu.mak:2:TARGET_BIG_ENDIAN=3Dy Therefore the MO_TE definition always expands to MO_BE. Use the latter to simplify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/openrisc/translate.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index df0ebcd3138..4ece2547614 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -647,7 +647,7 @@ static bool trans_l_lwa(DisasContext *dc, arg_load *a) check_r0_write(dc, a->d); ea =3D tcg_temp_new(); tcg_gen_addi_tl(ea, cpu_R(dc, a->a), a->i); - tcg_gen_qemu_ld_tl(cpu_R(dc, a->d), ea, dc->mem_idx, MO_TE | MO_UL); + tcg_gen_qemu_ld_tl(cpu_R(dc, a->d), ea, dc->mem_idx, MO_BE | MO_UL); tcg_gen_mov_tl(cpu_lock_addr, ea); tcg_gen_mov_tl(cpu_lock_value, cpu_R(dc, a->d)); return true; @@ -665,13 +665,13 @@ static void do_load(DisasContext *dc, arg_load *a, Me= mOp mop) =20 static bool trans_l_lwz(DisasContext *dc, arg_load *a) { - do_load(dc, a, MO_TE | MO_UL); + do_load(dc, a, MO_BE | MO_UL); return true; } =20 static bool trans_l_lws(DisasContext *dc, arg_load *a) { - do_load(dc, a, MO_TE | MO_SL); + do_load(dc, a, MO_BE | MO_SL); return true; } =20 @@ -689,13 +689,13 @@ static bool trans_l_lbs(DisasContext *dc, arg_load *a) =20 static bool trans_l_lhz(DisasContext *dc, arg_load *a) { - do_load(dc, a, MO_TE | MO_UW); + do_load(dc, a, MO_BE | MO_UW); return true; } =20 static bool trans_l_lhs(DisasContext *dc, arg_load *a) { - do_load(dc, a, MO_TE | MO_SW); + do_load(dc, a, MO_BE | MO_SW); return true; } =20 @@ -713,7 +713,7 @@ static bool trans_l_swa(DisasContext *dc, arg_store *a) =20 val =3D tcg_temp_new(); tcg_gen_atomic_cmpxchg_tl(val, cpu_lock_addr, cpu_lock_value, - cpu_R(dc, a->b), dc->mem_idx, MO_TE | MO_UL); + cpu_R(dc, a->b), dc->mem_idx, MO_BE | MO_UL); tcg_gen_setcond_tl(TCG_COND_EQ, cpu_sr_f, val, cpu_lock_value); =20 tcg_gen_br(lab_done); @@ -735,7 +735,7 @@ static void do_store(DisasContext *dc, arg_store *a, Me= mOp mop) =20 static bool trans_l_sw(DisasContext *dc, arg_store *a) { - do_store(dc, a, MO_TE | MO_UL); + do_store(dc, a, MO_BE | MO_UL); return true; } =20 @@ -747,7 +747,7 @@ static bool trans_l_sb(DisasContext *dc, arg_store *a) =20 static bool trans_l_sh(DisasContext *dc, arg_store *a) { - do_store(dc, a, MO_TE | MO_UW); + do_store(dc, a, MO_BE | MO_UW); return true; } =20 --=20 2.51.0 From nobody Fri Nov 14 22:18:40 2025 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=1759998238; cv=none; d=zohomail.com; s=zohoarc; b=kn0gYMo7lgT6Yyi5rDSVcK96yKMy5Z2Uc6zkS7C2Zj+XZ+wQbwKtGW+Bo28Dco3gnQMArOcLUkFFloV2VUQyGS6W0cAbdWizvcKlQs8BR1t3bKq4fCG2fI1X4gJf7buKVFU2YHF3RzzpzkjHKxbf8KQ/epcJIJpgFKuowdr8GC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759998238; 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=knvguah2ZAbHfJrAqmZJIL4yzYXBkMBaXmxd3HfsAM4=; b=Uodifly4oMoIqvMbmjaue3Fw8xiR8C43A10OfOKbmHLsNjgSfIzP1Nrp/zdgXIOayESuV21syfGeSRVdSgNMefeewQYTthIsdpGXmbnMNagTH288Q0B0ufZONOfNOE0L5L+GEkRCiUZXAmjezrCkAIK0D9p/xIFTbXBdC54xI2Q= 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 1759998238489786.066515984914; Thu, 9 Oct 2025 01:23:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6lsA-0005Ce-TE; Thu, 09 Oct 2025 04:19: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 1v6ls9-0005Bc-6r for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:37 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6ls1-00087F-7Z for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:36 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-46e326e4e99so8658795e9.1 for ; Thu, 09 Oct 2025 01:19:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8a6e1bsm33884776f8f.8.2025.10.09.01.19.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 01:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759997964; x=1760602764; 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=knvguah2ZAbHfJrAqmZJIL4yzYXBkMBaXmxd3HfsAM4=; b=CK3mCXrXLwf/snG0Dk5tEg0lO7FUb3jcPYN7FR9BcH/Oi3NRmWnCI5U5YlGKk5r3d1 fNd/iyIpgdqsM0YNsaJ72ZhRPfc92RqfRJ12MrV6SoarHMay5bgfXZgY6QxB7igHqDvP wRFdLAysFua616uk+chttVEtVCW2b4rBWNtEuJ8CoM16r5VsF/NaumzZjKAikxwFUAHv zhtLLYH5Ym+gMdUZ5/2TaAEAmF4/OcDGOhSqywupLKi+erOyTePagUzEXQX6GgQaetqN GyHEG1XN12wDtlIlBhMsrbyhcHpHO63dbaZKakkTmPsd4GZ3C+9kQC6PUJjpPuHlUkWo pfvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759997964; x=1760602764; 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=knvguah2ZAbHfJrAqmZJIL4yzYXBkMBaXmxd3HfsAM4=; b=gROxWWRiGpbnzbEpMUDQi5Fosb+WKOhBR9V04vfmyjESJ5ubjB5+miNKkbFhO/1ZJP ruB+9ZVGVq+k4cpKhZj2RRzsMu426Jztq3Ec6IvZVpbmeRE5R7TlU9cF8FknSbpOihhO r4B7NPxV/nKj6kuUXMLDnIuztCodWMy5d1to6mT4XYixeCBEj+/CLeAlFb8gJyEKm6rE ivRxzQ+b++QJdYikdwtboL04o3t53Ke9ghBoPC0jQnWJwkXivKhBhmIFVLw/jzzkapJC 251avnH+RMWcUxtfJbgh7xjPxSa81r6pp70WzLewUQ0jj1nWl82DiVuXezleMrw8iMEu Ymdg== X-Gm-Message-State: AOJu0YwoWHvZWauMEsOOadVHiYn8Mu7VoIOVSEbEKk5ca0UqCJRo/O2W nQJxi/aohLkQ2vqpoX2Q05vmEq9QDvs8/RxMRo0vDgbVnCbTV5uhN63SbAoWNwN5fOwkieRMdLm lI3B47P+5lg== X-Gm-Gg: ASbGncvxTlVnU/7oQD9bF4JeieH1OAnxS12clAwpUr4g1SYpQlgo/jU/0oztNgox8eP f+LhEOAJ0BgQw34PqoaoKe8zQo2jihmuyspD/O1pcvV0L1KmgJFLLJ7MH001eOxjMpS3hoSM4I2 kL5Q4Gt91UdpB9fZnqhWIqtBxcIO7RoedShCt9fQbtX/49LCwMGDXBeMIdLIR/huwzFX79BalU/ IE1QPRIhfr/QtnaaAqeoBmIw6RykcCAjyZ1OI7DOzUNsPhAwLLZP+jj5DpHlYn7qXXloNv9RJ9F sAsD1uWrkhEBD9eWSlbhl8KVioWWIn8x8oVAOvmRLzXQCl2m9mx25home6NVxsV9UM2H1bE2tAX +8NH+VUYVrL7k8v8ERpyIYdnUfR4kWMH/bczF46MpsiE8dS1ctdNiq/b4XRcvBuCL1G495h96M6 AiQZ6qBs8FWT+s7Up30pRmW9vGfO09ETtIKR4= X-Google-Smtp-Source: AGHT+IH9Pf/z5KO+V2BV7aZlRyvjcOhi/nHqDrXKj+OA6p9Tv3wmv1r3rYf8mhK9XdyHhBBkW7FsgA== X-Received: by 2002:a5d:5d11:0:b0:3ec:dd27:dfa3 with SMTP id ffacd0b85a97d-4266e7cf083mr4495810f8f.25.1759997963785; Thu, 09 Oct 2025 01:19:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Stafford Horne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 04/10] target/openrisc: Do not use target_ulong for @mr in MTSPR helper Date: Thu, 9 Oct 2025 10:18:56 +0200 Message-ID: <20251009081903.13426-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009081903.13426-1-philmd@linaro.org> References: <20251009081903.13426-1-philmd@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=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1759998245243116600 OpenRISCTLBEntry::@mr field is a uint32_t type since its introduction in commit 726fe045720 ("target-or32: Add MMU support"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Richard Henderson --- target/openrisc/sys_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index b091a9c6685..ad59939db3b 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -45,7 +45,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong sp= r, target_ulong rb) OpenRISCCPU *cpu =3D env_archcpu(env); #ifndef CONFIG_USER_ONLY CPUState *cs =3D env_cpu(env); - target_ulong mr; + uint32_t mr; int idx; #endif =20 --=20 2.51.0 From nobody Fri Nov 14 22:18:40 2025 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=1759998098; cv=none; d=zohomail.com; s=zohoarc; b=NMApjCedAfikRWjHEMUzm7nSaTQAqRUZDbVRsMqy6r+ZJwxe6XExbKnjYn5+2d3Gy7RpCiq8MWH83fplAz5TDY1TokCdlV1r3GLP6nkta2IWYrsuLuNGSHh8RT4vhC9CF8DNS6lCuiSKnEfnY1SFIRmYH/Ykr4A2xuTDFrGxeW8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759998098; 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=Nf16ULl3OMJ1iL2VzWtsstQCjW4+oYwJ71ie5wSwdyw=; b=A6h3e4l7GUUaVQc+XA2/TV4f1X/FQwLIKDUrJDBjC98RyqkMwiyfW5LoBjsFDWr10ZfeVCNhB753J9fg0/8gD1lUO8aukH99i/hIEx10bnJw4DeNmbx+1s9AyWXoCjV5NFaZfeME6MGlmTygReZymx4A19g/2wYK07WdZTbXkMY= 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 SMTP id 175999809810694.5851437279531; Thu, 9 Oct 2025 01:21:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6lsA-0005CB-UZ; Thu, 09 Oct 2025 04:19:39 -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 1v6ls7-00059N-0E for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:36 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6ls4-00087T-Ib for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:34 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3ee15b5435bso406563f8f.0 for ; Thu, 09 Oct 2025 01:19:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8e960asm33187966f8f.37.2025.10.09.01.19.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 01:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759997968; x=1760602768; 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=Nf16ULl3OMJ1iL2VzWtsstQCjW4+oYwJ71ie5wSwdyw=; b=jzd+Hg0x0GpPmiH3Z3gf/jn+lm2yWzMWYlouMokbgfhnYjRkXtOOAAwO0vok5QPdAW 316PCdW6zJL62nlKxo61aoGs8XtaB0NklPW3FPMWCcO8dEgfDTa7qBwMuQ0jW5pM0f6c HZ7i8vH1/BOvHHZF7r03+vvWGfoYf5W3/Lv16Vk0MAKvGX2XOICl16OO8u81ryO3PPSP NDjm2gHyiYSK7Ae0FCr6uK0D65hX+AQ8Ga/4oX+8LlkFctvBDaPJvOBLkCj/eoFtEuN/ MtZSjUKbJdz45JRlKXbf4Jh7qgt2lXMhxChmoeFJSDYWvNBnGP+zxlkYdAisr2iMP5iY losQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759997968; x=1760602768; 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=Nf16ULl3OMJ1iL2VzWtsstQCjW4+oYwJ71ie5wSwdyw=; b=fRXqg4DdwewcWdcG5aYrK1CxHHqoxE9yRef5ELzYv8mzAF5g1gTIN4Mxm8lP2t2xwd Xc2Tbm/a12DBpUgLZLyVXtRP5kAfNv9GBs7inWwiyUT3w7g3rbNgqN1w0keU3JFi6q8C FbehKdFpHvO+FmEG0LaMT/IfJbHpdvZqq+fSzu2+UQbEVxvp3vYh3USFR5X5c6TV0pZU osft/+TLCQFbV+oiD3KUV/Y7KCxGupimyuE2tzk/fN6aa+tHYiX982MZqCFqhcqv6uaf 19X7+5vgXAmAzUVrf6tSYKqNW7fco4pYe255m+ydSVle4LP/UcSGgVVRz5QNUtnJfgQ8 JuVg== X-Gm-Message-State: AOJu0YzfIuMRTZEV9CBck+RuVJARr93B0HM3CgOJqSQLhdAJOhdlTLYF Jhu1sZbYMN3JSh/gOU9JZwIPmfTe7fY9ARNeOk7tOnMsK0jQyiK2KtMeWjj45Eym/RLBag8w57b eBTaUuqbNJA== X-Gm-Gg: ASbGncuvxjcq/+xgXE1rM7etszIvZxl+uCVBzWRPb6/QSegejhPEWNWd3jUIBHgIyFy ZqDnYbMD6MSYsOhqIL58pgMr6KMa+L5jl0GAkxcuP1zsxmEZRxSpT+TbICyiQhkh2k2did8Gygi Z5cDy2d3OQL+I/CbmnArgGgzi2rRiQXtl3raCWA3qjHwdRhROtppQBIDHEY4Plld01mBZ5RVhDz 08j5HaVgs18tb1ybytfVniWyGyZ9I4Fa6Kf3JFuRHFbBPk2CS/yvfEuiMXx3qXV6YNcGL6JerS8 1z5RECsnpOt8jkFCKzLmeQvCbvnkr081F185o7Tcghrq0mmEt05J3eUy7xgWY/SjHUawwiEC4po GNX3qhYUAUz9QFSMkkYrMYrCIhtuTW5e0ZU44N0oBNB41b0CNp6u61sOdIJgNErAus4mJC5Efrk 4dngeDD3/lb6KMXHdsn+UR/c9V X-Google-Smtp-Source: AGHT+IGTQwwMzmoOGebCHjOBPTQbdHo4dNzldaGbJQI3WnbSXvYqtJytiEqFhNw5Da+Qf6txixmRng== X-Received: by 2002:a05:6000:2305:b0:3e9:9f7f:6c36 with SMTP id ffacd0b85a97d-4266e8db5f6mr3657694f8f.54.1759997968372; Thu, 09 Oct 2025 01:19:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Stafford Horne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 05/10] target/openrisc: Remove unused cpu_openrisc_map_address_*() handlers Date: Thu, 9 Oct 2025 10:18:57 +0200 Message-ID: <20251009081903.13426-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009081903.13426-1-philmd@linaro.org> References: <20251009081903.13426-1-philmd@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=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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: 1759998102589116600 Commit 23d45ebdb19 ("target/openrisc: Remove indirect function calls for mmu") removed the last uses of both cpu_openrisc_map_address_code() and cpu_openrisc_map_address_data() helpers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Richard Henderson --- target/openrisc/cpu.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index f4bcf00b073..87201365a91 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -220,15 +220,6 @@ typedef struct OpenRISCTLBEntry { typedef struct CPUOpenRISCTLBContext { OpenRISCTLBEntry itlb[TLB_SIZE]; OpenRISCTLBEntry dtlb[TLB_SIZE]; - - int (*cpu_openrisc_map_address_code)(OpenRISCCPU *cpu, - hwaddr *physical, - int *prot, - target_ulong address, int rw); - int (*cpu_openrisc_map_address_data)(OpenRISCCPU *cpu, - hwaddr *physical, - int *prot, - target_ulong address, int rw); } CPUOpenRISCTLBContext; #endif =20 --=20 2.51.0 From nobody Fri Nov 14 22:18:40 2025 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=1759998195; cv=none; d=zohomail.com; s=zohoarc; b=VtCvwtttyTnOyJhHDgG1fHNn28x1ZQm8LPAK9VpEpaFXmTU+xUi91a7QhJB0W69yiruc6qyj2JhV6gphsSPnnW20gSPsR/5GuyFucPgArg28Jc1kjww5pX7IGJciB+u9Q2IynGJ/okKMtt+CmCe6tzghhRpaKznHfSNASW7kVAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759998195; 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=IhZWfVpm4QWSDcKrdKLi6DBczu6OyvEaZd0q8XcrWII=; b=VYFhkhZH17cb3P722CDfkOjPgdSdM8GxEjK9BY/CJtYPrhaipABgsYLy1dukihcR6B4aTollyscUkgGlTPMIHjz0ANkcNx8G7iSl8pcXHKl0GGTPfu6sJGs/I15J5lMt4LHEC4aImavAClwF5smwZGmfy3euj41xtyef/jhnNRM= 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 1759998195171520.6580164837819; Thu, 9 Oct 2025 01:23:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6lsI-0005Lz-5P; Thu, 09 Oct 2025 04:19: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 1v6lsF-0005IQ-OW for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:43 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6ls8-00087j-RN for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:43 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46e3cdc1a6aso5309455e9.1 for ; Thu, 09 Oct 2025 01:19:35 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fa9d6fb41sm71845595e9.17.2025.10.09.01.19.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 01:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759997973; x=1760602773; 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=IhZWfVpm4QWSDcKrdKLi6DBczu6OyvEaZd0q8XcrWII=; b=VrFwSXBOEHUHDLKuh3x7I9GoW30XrU3fbY4z1XNS7VGyX08NFw+AJzgOLemXJOM9IL hzKVE4L9PPxhNNWf+J1rKL5kw+SZel9idcaEQX1uKoEFiz6Uj6sX3nz0kVHkGEyBoTSj afENoLKdsVLOpAkIHWChf2qowzfu9xx5JfEhKWVMjfI/oNTFLevki9m+50dxi8Z/b2dt 6v+4enOHW311diWBeIbLPpcVNbO/4AU7YjvP42dwNE4Hv2N+GBoaYhpjDMfDzoDI0T35 ygqSESBZY1zh5e1/SY2V6zXZAq4CDmOUESJ57lIGefWO8Clgu9nkXRbxBsjzY1UBANfd gEzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759997973; x=1760602773; 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=IhZWfVpm4QWSDcKrdKLi6DBczu6OyvEaZd0q8XcrWII=; b=eXCO7DXJyobg6tEpuRxwM7owpEoyFxfGxJJyuXImGmm/vsiiOeRsEAjfdY1LaEmdkh HvQhtwuv9+juyR6WiIMeaJ+mP+ZU+LI3oevt7daT+yQ4PPl0qeolvVSx02dfb+DT2IJK KCkL9N0ccj0Z0m890qwzbg8os/FJRKPKoQvwDLXzxlH7d/xrBJTOTlu4DTvRXdcBTPr3 lqi9aTkw9OpqCvKkdgSQnudTu9GgrsmybkOIU312+Ztt5B1m3d0rzGQHpSVtR3cdOsjr PyCSbt+cG6qNIl6tgggUW8dda45SI8ZPsGLXSx23vwccluZk2ftntb5M6xw6u/gk2PyU mZ0w== X-Gm-Message-State: AOJu0YydP+wU9oKS2//G5VJ/SCSG34FwDcihlDUTdSeDHctYcVRzokeC 1LWdKltp74JCCpIUnYVG9j4T0cYCiXy8DEOhSGvOPzoFtpIJFTJqudVursD4VStKMcPB0lO5bmr hL5hQw3CbIg== X-Gm-Gg: ASbGncvaLwk8+NF6W86E+HVRce187ZmaNpGR40NNeG3S/RfQkFwCeivZNWuxBH9iGlM 3d+TsnuQAWEPXXxSBpY2M7vUhiFyjcqMTqFN6TbsWHEsHyR6z4iDMzdR16PcYQ1ndbzLL4+hj8g XBAOXtFPbZJBQub/pZ/WXUqKt299hc1Xa//KjYdveUCw2xRPLmeewKLtQ/TF+RA8wLZicezMbhx TPPL/T/sf6TTQ1aIlNFywW3oAOmNg5FqhQdinSO9spqNe43F+9tm0R6eR9LzvxYSkOcr0w7G7Xc uoRWqapINBzy/rbKsyfZ9FcjpXxroL1a3ztf9iRYaB1/Z5t08agGAu+FVdK58oL55lVz2qwXQte l7QTgmy6JhNmTU55ffP1OVcDoAsxneR4m8T9t9Ii5t0qgKSbzxyIEuJhDV4d6lovojvjWEL7zaH VJFOPHAy5GJrpWzWE1NK7CTPO6 X-Google-Smtp-Source: AGHT+IGJna3qB0i8Kz7MB/IBXsYxvZ/jH3bWFTqtDVexIniSQLge29/3MSeVWbN0jCgUzyaZniBEhA== X-Received: by 2002:a05:600c:8115:b0:46e:711c:efe9 with SMTP id 5b1f17b1804b1-46fa9ec7556mr47662245e9.13.1759997972900; Thu, 09 Oct 2025 01:19:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Stafford Horne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 06/10] target/openrisc: Remove target_ulong use in raise_mmu_exception() Date: Thu, 9 Oct 2025 10:18:58 +0200 Message-ID: <20251009081903.13426-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009081903.13426-1-philmd@linaro.org> References: <20251009081903.13426-1-philmd@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=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: 1759998201861116600 TCGCPUOps::tlb_fill() handler provides a vaddr type (since commit 7510454e3e7 "cpu: Turn cpu_handle_mmu_fault() into a CPUClass hook"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Richard Henderson --- target/openrisc/mmu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c index acea50c41eb..6fb3f6318a1 100644 --- a/target/openrisc/mmu.c +++ b/target/openrisc/mmu.c @@ -28,15 +28,14 @@ #include "qemu/host-utils.h" #include "hw/loader.h" =20 -static inline void get_phys_nommu(hwaddr *phys_addr, int *prot, - target_ulong address) +static inline void get_phys_nommu(hwaddr *phys_addr, int *prot, vaddr addr= ess) { *phys_addr =3D address; *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; } =20 static int get_phys_mmu(OpenRISCCPU *cpu, hwaddr *phys_addr, int *prot, - target_ulong addr, int need, bool super) + vaddr addr, int need, bool super) { int idx =3D (addr >> TARGET_PAGE_BITS) & TLB_MASK; uint32_t imr =3D cpu->env.tlb.itlb[idx].mr; @@ -95,7 +94,7 @@ static int get_phys_mmu(OpenRISCCPU *cpu, hwaddr *phys_ad= dr, int *prot, } } =20 -static void raise_mmu_exception(OpenRISCCPU *cpu, target_ulong address, +static void raise_mmu_exception(OpenRISCCPU *cpu, vaddr address, int exception) { CPUState *cs =3D CPU(cpu); --=20 2.51.0 From nobody Fri Nov 14 22:18:40 2025 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=1759998263; cv=none; d=zohomail.com; s=zohoarc; b=HWRIZcSGFxkjBnejTVuck5629Ya3JQaJKxtLcDAgFNmvolQZIE5Ms1zCvz6+A9L5fSFoD8NdLEwIG3Pe5i2/J1KjvrqAwzV0vT3F0pDOeaOFaO02Eppd7gGognKlV8dyf+n0PxD0xukBIzogwb2KwmxXtmIxpljg+T0UAHhbKYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759998263; 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=zEbDG9nSLIOGyvvOyaB58KCpKqNvID5tlXo2yfv3uh0=; b=bCBRNcqL32y3eyNqDWilbj4HBnrHPf50nOblTUiZAELPGmp/igwfLQuhAfpBj9OCDV8irppZecO/nuQRRwkTQL8NQ6pton/l5XPk4fjy2/u55qyd7oL7H2kmOeMeLVHvipjexOa133sfPCff5rIvQVgP5sqqqJoqhks+Uxnyioo= 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 1759998263565616.634465173445; Thu, 9 Oct 2025 01:24:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6lsI-0005LA-3f; Thu, 09 Oct 2025 04:19: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 1v6lsF-0005I2-E4 for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:43 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6lsC-00088X-1w for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:43 -0400 Received: by mail-wm1-x342.google.com with SMTP id 5b1f17b1804b1-46e4473d7f6so3918895e9.1 for ; Thu, 09 Oct 2025 01:19:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fa9bf7f80sm72573535e9.1.2025.10.09.01.19.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 01:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759997977; x=1760602777; 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=zEbDG9nSLIOGyvvOyaB58KCpKqNvID5tlXo2yfv3uh0=; b=LX6zxPRPse/8TFi+Cbmyof9ka5y39ykle2l3QBHkcZXD8/1xf3zfFh3sy69GTKgzJ+ +ydASqiybXRYlAO49Td0FJBW/XDmKFn2oEZcz6Icxdvg6abSoW9wJnEXm0PGodGrKxCv tvH1buTegLqbRNDJceWmgMi1d5gBsiF/NOlPM8UQFYwowUOnIxxgFU3X+lF0OM7XAnA+ +T/m/JQkK0ewsryB6Pn1XpbSy5uJmaodSOzdDqiPCheJfPNhKMeoeLdA6PPdDwbJ8K87 uCRhrTy78TtFCJ9p6x4tJjra7sCL4/mhff8XgvJ4wFK+1vm8PFMl4Vl38mNHgu304mLe +6cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759997977; x=1760602777; 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=zEbDG9nSLIOGyvvOyaB58KCpKqNvID5tlXo2yfv3uh0=; b=eYy08BZ5bYlZlro+7ycMFLwmKeehjINfp51wUXQ5tp7OvMlW8aOVjUE0J+1beBRyli 5MiHepLi65Qy5mG+uukYmseyK7tXesDW0phtpnb2RWhS+7irbxn5vpTHwxHo2FepcVdK Yw605DEsxUJ3RpwMREtWlHeMcWRFQuYkNGseNKL0t6hlUo1B/sDzCwSUMLWnPxchgMMQ EhYLA80W4aaaTd5HfBesE/vFb8Hn8Bqb83YgQYFoXOoHQ8u/TgoY3pX3rxTSuDKLbMCn NBxFNkwQ/CRT6NPIIci34SnkOOGlzBEp7fLdO8Dm5KysN0Rvm4XjeKhDunXRpox7g5ig hxOQ== X-Gm-Message-State: AOJu0YzA2keBBILKjhUAoG1Jw+Q8u1rfeTvuwxNT3XWCpukR7cr0o5Pi OBH0d0mzeuj6kIHBrCPCPD/szQ1V/yNqPiwKVlVzOMyGR7LhU7iNLbrXVza6JiJslhe1cacXjAm VZHc3COAOVIyn X-Gm-Gg: ASbGncv10wgLe5TJpeE3Cz+OpR9GNQQMF8oYaHVrJT+tEZSaI8+VwcYwGAAPBe2UyAO SB/IBU0uyMylppHdTaMS8s5FVwpMUnMqCQzySCybbdns0pbWaxCckUlkKENasFscil6ft32EzKI Oa/Ka2XGgrfyXLgkzE8TfSD1w5ibsXE0NNyjIMrKsWaSRoNBBsoNfpt4cWxaPOFbzid4s25jBrh ndzD71ufG1OpXHdY93wi+qOrqBnyLsFjJIwF+UAWfP8ddKChP3SLZ2kooxtWlCF214zVwSR80iw 6+f3X4R3mmcDeJNj/7mlQ4QPBvG9GF1+F5gn5x1vx2qbch5QkzLWVQYcGXlgzC4t+kUv3dXvEpk PdS8mq1ucQwWBYSuq48a6uaC8N1axtWCsuEVXMCv0kHbLsUlEYo30wH8Hk6s/pUpwT9uJmqABH7 efT3ayYoLMFsfJ5IaY9z9x9Zqk X-Google-Smtp-Source: AGHT+IG5r65qaW+hK/so4ReIi0pQdaC3PTp566Obdvn4WZfCs4qrcyPOFS7cSUsSWMuCt43j3FCFWA== X-Received: by 2002:a05:600c:34cc:b0:46e:59dd:1b4d with SMTP id 5b1f17b1804b1-46fa9aa2076mr67801135e9.16.1759997977508; Thu, 09 Oct 2025 01:19:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Stafford Horne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 07/10] target/openrisc: Use vaddr type for $pc jumps Date: Thu, 9 Oct 2025 10:18:59 +0200 Message-ID: <20251009081903.13426-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009081903.13426-1-philmd@linaro.org> References: <20251009081903.13426-1-philmd@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=2a00:1450:4864:20::342; envelope-from=philmd@linaro.org; helo=mail-wm1-x342.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: 1759998265617154100 translator_use_goto_tb() expects a vaddr type since commit b1c09220b4c ("accel/tcg: Replace target_ulong with vaddr in translator_*()"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Richard Henderson --- target/openrisc/translate.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 4ece2547614..06625367ae4 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -51,7 +51,7 @@ typedef struct DisasContext { uint32_t avr; =20 /* If not -1, jmp_pc contains this value and so is a direct jump. */ - target_ulong jmp_pc_imm; + vaddr jmp_pc_imm; =20 /* The temporary corresponding to register 0 for this compilation. */ TCGv R0; @@ -580,7 +580,7 @@ static bool trans_l_muldu(DisasContext *dc, arg_ab *a) =20 static bool trans_l_j(DisasContext *dc, arg_l_j *a) { - target_ulong tmp_pc =3D dc->base.pc_next + a->n * 4; + vaddr tmp_pc =3D dc->base.pc_next + a->n * 4; =20 tcg_gen_movi_tl(jmp_pc, tmp_pc); dc->jmp_pc_imm =3D tmp_pc; @@ -590,8 +590,8 @@ static bool trans_l_j(DisasContext *dc, arg_l_j *a) =20 static bool trans_l_jal(DisasContext *dc, arg_l_jal *a) { - target_ulong tmp_pc =3D dc->base.pc_next + a->n * 4; - target_ulong ret_pc =3D dc->base.pc_next + 8; + vaddr tmp_pc =3D dc->base.pc_next + a->n * 4; + vaddr ret_pc =3D dc->base.pc_next + 8; =20 tcg_gen_movi_tl(cpu_regs[9], ret_pc); /* Optimize jal being used to load the PC for PIC. */ @@ -605,7 +605,7 @@ static bool trans_l_jal(DisasContext *dc, arg_l_jal *a) =20 static void do_bf(DisasContext *dc, arg_l_bf *a, TCGCond cond) { - target_ulong tmp_pc =3D dc->base.pc_next + a->n * 4; + vaddr tmp_pc =3D dc->base.pc_next + a->n * 4; TCGv t_next =3D tcg_constant_tl(dc->base.pc_next + 8); TCGv t_true =3D tcg_constant_tl(tmp_pc); =20 @@ -1586,7 +1586,7 @@ static void openrisc_tr_translate_insn(DisasContextBa= se *dcbase, CPUState *cs) static void openrisc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) { DisasContext *dc =3D container_of(dcbase, DisasContext, base); - target_ulong jmp_dest; + vaddr jmp_dest; =20 /* If we have already exited the TB, nothing following has effect. */ if (dc->base.is_jmp =3D=3D DISAS_NORETURN) { --=20 2.51.0 From nobody Fri Nov 14 22:18:40 2025 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=1759998070; cv=none; d=zohomail.com; s=zohoarc; b=IYFQ4jvUhteMjykxtw/nt63L56TCqRJLQTen6XXOFThUD1ta0xjlrJR3g9uY87QtQx+yeYtIWNHRl7Vw49t+CNzvvCKjk4C9jEVXJWiaywb5NT8P+1/syY5DDQIhIA/4m9yrunncmxtxHB5dA98GqyB/+hxZ6C5K7ICbB0B9v+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759998070; 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=Avr8kO4HEStDUKuZQKdwkKL59sVw03X9BDkTqZlM5UY=; b=ANRsOIjzCNWKi+gi6vZOJKwNaRJTIcU4MVuRcLdDiia/EnNvQ+u6YIqYrz1IpfjRnaq5xuKD8aowWlag1v4oIgTCeYICVx1soAq48EuLWUyPrpMmAFJNsMbjky+iH52KHPP+M1XpdopKny1c5Wn32OnxNXf2vPcx7CTN9RRs+Qs= 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 1759998070345374.40793014577605; Thu, 9 Oct 2025 01:21:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6lsL-0005RD-1Y; Thu, 09 Oct 2025 04:19:49 -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 1v6lsJ-0005PW-QK for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:48 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6lsG-00088y-VG for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:47 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-46e2826d5c6so4376295e9.1 for ; Thu, 09 Oct 2025 01:19:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46faf1118aasm35486475e9.5.2025.10.09.01.19.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 01:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759997982; x=1760602782; 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=Avr8kO4HEStDUKuZQKdwkKL59sVw03X9BDkTqZlM5UY=; b=w2q7jhk/CSOjGIZhIZuO1fFGjVZ/9mWkVl6QwozofWWwqV2eoAp6UuTlKXnjnyIgtk dVQchrynsgv2brTyilG88lNKhTjkDLzzDBD8xAySVmkjTy/cyh2WvvQLySs6rWzK/3Fe /eYPOq+oKAu3v/1Z+oUC19Y21iSlh9hmFbWeWiR+450bdXuTps2PBtBOlEK8bqzWleRc o5ojHkV7HNrrjJQDencgglmewmOuKd6gh/ao/hZp0vEZkNZrjlMIgnnfWq9hZIn0ZE+G +W6fSgKkDrlA3Th3TgyUZtIQQlNgY+vsah4OsfMWoAL2uvzEkbcX7KEwEEKCzoWHMTKA 7KJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759997982; x=1760602782; 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=Avr8kO4HEStDUKuZQKdwkKL59sVw03X9BDkTqZlM5UY=; b=M5C/suHkM5ACyoDtwOfg/tFFiI1cy60ADFlbB/WKH/+a1JktrXCmooBZxjpT6uBjR3 aLkDDHec7GKxmLafRMfM6YDyQPgkdtkDkKy9OLQZX1YhKyVgUl2zOBtwSpEh3L23WKWv 0JrDGz6iqhvo+5GzGzDQ1JDwJxDgYh6e67tjTydRXc8A2C3V0JQhvxxo7zQ+bILi8rnG sYwc/kUFZbC9ywfyNJQbZaszgsVRTO/QXG3UdXJMGQsBU/KQc+a6MK8fHNsPs2hEZmKv E4Ikpj8Qf7Nk132KX1ZZ4bX0Q3dFs2q7mu7+40/RUhVx1Q7rFWoW4pK6G48u3xbJH0F6 CE9g== X-Gm-Message-State: AOJu0YzUgwhA8SbJ8kpgDIygjXSjnfPu7/wnW1zBBmAEKPFucwAsnwz1 LzvSPNF3CMXOL79Hsy/sFn/Pj5liUttcIPQAzMmfuB8xqvREpIvFBHlFkmsHQ9Py8jrbBfOaFHV zNJmiNuc8DQ== X-Gm-Gg: ASbGnctYM0FSDjFHdZaQv4jufxRgrfX+1pLpQzylZ89Ys/xtafJMh6Dg87g41wkQqqi iKqYC48iJjEcb7DHobBvHhXTtly0ZVyZbX24i4tLYIohUKmcBhJeW+IBUJk/LAe5AHpx3fjfKuD 4Cr+gWE1amk98l6ZBQIb4XDvCbhAQyfhwS+BcDrvYqstjrR1u+UeVndNVeWDmiqFZNvqf44Iz2k JHAVKuzcBZohKRNyQv3OJQUT6Wq3e4BZTh0Dhp1edzlxvv7i/tNzRSBhj+74AF5bLZ9BgjC52W7 Tr3s/lhwaSKfE/1u1a9h1Wxcc9UsvEdUwoMfmguOADRD7qSzR9syU5TdEa6p51ySoULKPXn/aVh D/e8d2O0XBizgfoi16AwrgPyY6scgoeQsEtOEKZEb0yWrK2uQTAdvtWLP2dfnklYJgiEJTmly9L 16u2n3yJsBKRD+H9NkPCDsJy0n X-Google-Smtp-Source: AGHT+IGhULNOLsY+bw0WsAgEbvdu9dynQIhfGGFqJNCvTCjuuGnm1qm8h/glzG1y/J1kYhva0tAuaQ== X-Received: by 2002:a05:600c:3f1b:b0:46e:1a14:a81b with SMTP id 5b1f17b1804b1-46fa9b17e09mr40337235e9.36.1759997982051; Thu, 09 Oct 2025 01:19:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Stafford Horne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 08/10] target/openrisc: Remove 'TARGET_LONG_BITS != 32' dead code Date: Thu, 9 Oct 2025 10:19:00 +0200 Message-ID: <20251009081903.13426-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009081903.13426-1-philmd@linaro.org> References: <20251009081903.13426-1-philmd@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=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1759998072932116600 The OpenRISC targets are only built as 32-bit: $ git grep TARGET_LONG_BITS configs/targets/or1k-* configs/targets/or1k-linux-user.mak:5:TARGET_LONG_BITS=3D32 configs/targets/or1k-softmmu.mak:5:TARGET_LONG_BITS=3D32 Remove the dead code guarded within TARGET_LONG_BITS !=3D 32. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/openrisc/translate.c | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 06625367ae4..dd93cfd6074 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -298,19 +298,8 @@ static void gen_muld(DisasContext *dc, TCGv srca, TCGv= srcb) =20 tcg_gen_ext_tl_i64(t1, srca); tcg_gen_ext_tl_i64(t2, srcb); - if (TARGET_LONG_BITS =3D=3D 32) { - tcg_gen_mul_i64(cpu_mac, t1, t2); - tcg_gen_movi_tl(cpu_sr_ov, 0); - } else { - TCGv_i64 high =3D tcg_temp_new_i64(); - - tcg_gen_muls2_i64(cpu_mac, high, t1, t2); - tcg_gen_sari_i64(t1, cpu_mac, 63); - tcg_gen_negsetcond_i64(TCG_COND_NE, t1, t1, high); - tcg_gen_trunc_i64_tl(cpu_sr_ov, t1); - - gen_ove_ov(dc); - } + tcg_gen_mul_i64(cpu_mac, t1, t2); + tcg_gen_movi_tl(cpu_sr_ov, 0); } =20 static void gen_muldu(DisasContext *dc, TCGv srca, TCGv srcb) @@ -320,18 +309,8 @@ static void gen_muldu(DisasContext *dc, TCGv srca, TCG= v srcb) =20 tcg_gen_extu_tl_i64(t1, srca); tcg_gen_extu_tl_i64(t2, srcb); - if (TARGET_LONG_BITS =3D=3D 32) { - tcg_gen_mul_i64(cpu_mac, t1, t2); - tcg_gen_movi_tl(cpu_sr_cy, 0); - } else { - TCGv_i64 high =3D tcg_temp_new_i64(); - - tcg_gen_mulu2_i64(cpu_mac, high, t1, t2); - tcg_gen_setcondi_i64(TCG_COND_NE, high, high, 0); - tcg_gen_trunc_i64_tl(cpu_sr_cy, high); - - gen_ove_cy(dc); - } + tcg_gen_mul_i64(cpu_mac, t1, t2); + tcg_gen_movi_tl(cpu_sr_cy, 0); } =20 static void gen_mac(DisasContext *dc, TCGv srca, TCGv srcb) @@ -349,11 +328,7 @@ static void gen_mac(DisasContext *dc, TCGv srca, TCGv = srcb) tcg_gen_xor_i64(t1, t1, cpu_mac); tcg_gen_andc_i64(t1, t1, t2); =20 -#if TARGET_LONG_BITS =3D=3D 32 tcg_gen_extrh_i64_i32(cpu_sr_ov, t1); -#else - tcg_gen_mov_i64(cpu_sr_ov, t1); -#endif =20 gen_ove_ov(dc); } --=20 2.51.0 From nobody Fri Nov 14 22:18:40 2025 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=1759998053; cv=none; d=zohomail.com; s=zohoarc; b=iZI9Lnd5VSvMxUADOhPkfCIWusNVEC3EX0me3fohL+VwBKU6qQuWNxT+N0vam9qxXdbE1RvOl3pp918N06JM/V/szIafNkafqHY28D+DMFzAO4RDStFohhGqowrIZrBfojISmLmv5AXmFGENdfCX2OyyfPE2FiT3e6tespwn9cg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759998053; 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=fZDnAdJCuM7z/8L8oCUhOHfHNKctPA6ZwCdk+fww2/4=; b=UmEuZOMUTiJNE5SwTDjaAGhJJbSPbjdIY8AnU7cFllU4VhWU7XknzEZBHh29pM1mpUBD4FKi/1lhWlWZkGC8MOsl87dG++AUAdP2YcJBk+uyGqpE1oU39+P5Y+LhSdy+s6wDBfFSz4o398Pvkp9ZWjZPmRyrPu8970RYPSV87rE= 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 17599980538431007.4883942606348; Thu, 9 Oct 2025 01:20:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6lsQ-0005Sc-R0; Thu, 09 Oct 2025 04:19: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 1v6lsP-0005SU-NE for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:53 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6lsM-00089r-6D for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:19:53 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-46e542196c7so9744455e9.0 for ; Thu, 09 Oct 2025 01:19:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fa9d629casm72028125e9.16.2025.10.09.01.19.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 01:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759997986; x=1760602786; 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=fZDnAdJCuM7z/8L8oCUhOHfHNKctPA6ZwCdk+fww2/4=; b=ZVRxfw3kHV/cRcMMOXwf30+q5ot6lY+0pIFtdqnommnaZrnFlhKBpKH6wr0LqxPhNd 4zTTORsDlwSzJJfAHRzxAqasft05gMeBb1a76xe6vlUdmAXb6sHZIlF0SrHWzCoAKDrW WSug3u8dTnN7X/sVKeNy50lriKU7YlMV/wa8UnbbqCtmwwf2uoxCDwgpMnpDv6Z4fEtp rjYJ2oUt4tQSn9Q5SB+wtFOM5mZAPWZv+erRI0D/F1bbUJ+VkAPCd7XtHQ/pUWQebYaL K/LBsXNiKJYJffPxKDXwCVJPv3pVDMLgmDBGYoaMpyfe+ZzMS0nWgSZrw21OCVZz3Ukd GKHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759997986; x=1760602786; 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=fZDnAdJCuM7z/8L8oCUhOHfHNKctPA6ZwCdk+fww2/4=; b=vlOB0Wt0zdW76x2H8CIoYJQ05exi5vq5DL9LUu6v9LR/PWVCrZOX6QhAhzNDFUVHLD J6eFcYGo7xJ2r/cWZcCPr+w6pFqpMYkP2fmW32+fuk6EZECHEE0OHvJJdm7d4WE9XPlk Ou27DsHPzUvTs+rrwr3UEkrakzxJ7Jl25ZAQLNJ1r91WGG/3/RThKu0MI/EgjMynhy/9 fg8ak4wVKuf6iNpx3YB/q2OcrlEGEfdiPuiVNs366cvMc5eYahM8v4H/4g+uC1wWDSxV Lc+V1n/bySnMTVMp0L68EiYz1mUR1VYgVF7ogtddZaH7IbnTZ/QC2ps3heyklIfpedjE IH6A== X-Gm-Message-State: AOJu0YxXtYD2Cr7VzBEHwPJAHhFNRcNCJUbspOSofUp6qZqG2nChURhr 9OorGLNid0CRH2P36/iv0B5CkkpVIqPr4wZlWClil5osO3VMJ7wsbpu6gM8yRLUSgpvLvi52t7K rJm8Supm5OA== X-Gm-Gg: ASbGncv5k+QNewTX915YJXodXx+AjH77X6pQhh64QxRlYwcWaNSM2FxMw2iDF2COtFp keEl31seRzfOtGq/ExhYxzWxHlqr5+TpWfvLoqQFZQL40jcO0o7nkhDJtWE0BSJ4jHJAsdQr5l+ kUPO3VTM4rpY1ayfiQPbYets3jDrW2hbOc7ZftSEhA0rQIa+T1nmShoP21FfkBKpW0QVadU3Xxf TWB6ojvvz4wY07i3rQyi8zaKBx1/UOsYiVWFVIrO7fjliWoN2qW3FSLM2RTen+QvdNzZcxA3sPg 07qGLI558N6bq9a/S3oYewnJi8xkCxE+PecQOibgwgcQ5Iq0OxqL73x04rmZFhc4kwKwGN5v82c DySqzjHHTEz4QnONUAWBYE4W1Do7b8pvvhnGpR1QIBsd+Ry52KJk6vgzKkrdTIlpTwFTcP6mcUH 43f2Mkwb0ye0rsSEmuc/uuBMm8 X-Google-Smtp-Source: AGHT+IGoROhh4BC3hfvbI989ju2E674SL4lzchi6exC/2HdSQyhoucR6hU4gs793jPpLHWQkPKfxBQ== X-Received: by 2002:a05:600c:c10f:b0:46e:33ed:bca4 with SMTP id 5b1f17b1804b1-46fa29f3f12mr51833415e9.15.1759997986533; Thu, 09 Oct 2025 01:19:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Stafford Horne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 09/10] target/openrisc: Inline tcg_gen_trunc_i64_tl() Date: Thu, 9 Oct 2025 10:19:01 +0200 Message-ID: <20251009081903.13426-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009081903.13426-1-philmd@linaro.org> References: <20251009081903.13426-1-philmd@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=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1759998055471154100 The OpenRISC targets are only built as 32-bit, so tcg_gen_trunc_i64_tl expands to tcg_gen_extrl_i64_i32(). Use the latter to simplify the next commit mechanical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Richard Henderson --- target/openrisc/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index dd93cfd6074..7cb4152e357 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -345,7 +345,7 @@ static void gen_macu(DisasContext *dc, TCGv srca, TCGv = srcb) /* Note that overflow is only computed during addition stage. */ tcg_gen_add_i64(cpu_mac, cpu_mac, t1); tcg_gen_setcond_i64(TCG_COND_LTU, t1, cpu_mac, t1); - tcg_gen_trunc_i64_tl(cpu_sr_cy, t1); + tcg_gen_extrl_i64_i32(cpu_sr_cy, t1); =20 gen_ove_cy(dc); } @@ -386,7 +386,7 @@ static void gen_msbu(DisasContext *dc, TCGv srca, TCGv = srcb) /* Note that overflow is only computed during subtraction stage. */ tcg_gen_setcond_i64(TCG_COND_LTU, t2, cpu_mac, t1); tcg_gen_sub_i64(cpu_mac, cpu_mac, t1); - tcg_gen_trunc_i64_tl(cpu_sr_cy, t2); + tcg_gen_extrl_i64_i32(cpu_sr_cy, t2); =20 gen_ove_cy(dc); } @@ -904,7 +904,7 @@ static bool trans_l_movhi(DisasContext *dc, arg_l_movhi= *a) static bool trans_l_macrc(DisasContext *dc, arg_l_macrc *a) { check_r0_write(dc, a->d); - tcg_gen_trunc_i64_tl(cpu_R(dc, a->d), cpu_mac); + tcg_gen_extrl_i64_i32(cpu_R(dc, a->d), cpu_mac); tcg_gen_movi_i64(cpu_mac, 0); return true; } --=20 2.51.0 From nobody Fri Nov 14 22:18:40 2025 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=1759998031; cv=none; d=zohomail.com; s=zohoarc; b=B7yrpEnihZF6JI3K070jP6ZkuipKKqCqrPHahQPUWsN1J2D6JMx9UDtCy9qmjmabONP5QdW9g6am7Ju6qPXfFEwtj/cVe0tcFKV5wnAG1qNFYlOVqhEDWyjxAC62m7LLcgrGaDT7gkeknFVi5Ein/k8mYNs5W9/jCYEtglQALDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759998031; 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=JaSYGgkgX+R2IJrfYhVP8/WE0zeH/Eps5eAYrdnS5dM=; b=P3Dk6gfhMCEP+/MYO3zkOTff+mtUXwTl3nDWYqDmlte3f9qslpC2IVnGnqEe3FwMyJdcOP+FAHdHhcuEFXIWwGy6W/ORVlFYO9YO6Ny4QRGER7aW0vUc9rj/9JbTpAUIK5VNHpS+D8vUmkv3pyXAr3GoN+gR9AFQEdWxSEiCN/Y= 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 SMTP id 1759998031300765.5067431270998; Thu, 9 Oct 2025 01:20:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6lsg-00065b-4d; Thu, 09 Oct 2025 04:20:10 -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 1v6lsd-0005r1-4Y for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:20:07 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6lsR-0008AI-MA for qemu-devel@nongnu.org; Thu, 09 Oct 2025 04:20:06 -0400 Received: by mail-wm1-x341.google.com with SMTP id 5b1f17b1804b1-46e6a6a5e42so3266235e9.0 for ; Thu, 09 Oct 2025 01:19:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8e9724sm33291858f8f.28.2025.10.09.01.19.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 01:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759997991; x=1760602791; 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=JaSYGgkgX+R2IJrfYhVP8/WE0zeH/Eps5eAYrdnS5dM=; b=eMa9p9V8BtG3ROlnWu8wGeN5FOBZCnvqyZtfx7VEmtmjoqH+OxDzya7x1IWTM/AnPy Zc/sBQR1Dq5L9sFxuBw+aQ+iKJtpwbEjv9/IBIeB+0PXS+xpFgu5BZWAE4zgwBASxmO6 eVbW6BM8dyB/IvBK4mpRqCp5Hzv1TgnOAELwcJK/jHrdf586sCy9WAVNKMqHlOykL6kq fvXVK3KkvbRl4P1hx6xZz0oWpkwGl7FhWzYQTIrSzmmuoD9noSdyih0PdW5ux89FEfpr 8KXZygj97qRdEtifumICdk0STMFZoXgzqZk2ZtC0XhtMViAek4XYjoogMi8c0hl9BQeY rzUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759997991; x=1760602791; 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=JaSYGgkgX+R2IJrfYhVP8/WE0zeH/Eps5eAYrdnS5dM=; b=OTgt3J6OWwcwV2x8YgcldgzdWo+R+UOiQKemLe1kkIotN63v9Sjji5z3W80gZbZyh3 CpHt4jS1IrI+4PNlViePvzwzc1xZb/oB5T1RLeJmO11ZnU0n3H68YEzECGnNxnLBXNi8 /wMg/bXj5SER/ur+Py0W3O/fWP0J6Wl2zY21yqw2jlRtAoLlTheIOd9ix3leyId9ddmw rZk6f7ut/Q3cpasl/vvuHADzdD3iYNRlJzmB+8xKL63t6IfqgzMjluWQwfnYDdNvmMIC vLYjqGw1a6xpSUftdeyZ5GujnRVlmk0viQzDB/Q5B8NuudJaXr1pq5GIduiIdife96E3 eVrA== X-Gm-Message-State: AOJu0YzyxG4Pr5/bBOvvLs0HRB3i8yzxyXknoG31TK02mfw37Nq8OXUl UapKYecY6g2YCEXqzc90Bc5otol1sPVc5CgdsY/6Kco/c8HyasS7zYyufdvk+v8/vsxfyyLyKjh 4VMI7PkxReuBe X-Gm-Gg: ASbGncvM80ixhX8O6GcYjb6UdF4rpkXBMcNjKaX9BIwuzuOrSnMyYW028k4BoA4/8bC B4kz1tuIUU0Pg7Eyxyj1lJ7V7BzPP2rS7cr5ZaNYryep2a+bOWo8rmszkDd7nhwYhLmfpkLH+ec RFHVktZZlTbC6eCdJESm99A34gViesX1owmTmXjYva1nBLq4Zl4E5Yr0iJNMOuX1qS9J2zca0NM WapDzjO5ui+gkszaQ8YErMI9ZZVGWzKZrsa6tfaOKG1snhUoPkaxGYCVew/0IewuoYKRjquFDmB iTxtkW3+l0hWEnRMkU6dbUFa3ki4nqCq3AKbp2cHHqzHVIYTTi34oO2/EJ33WV1zLxMejGgBWoJ DROModKgsgidPL/0yyxbPmcg4YIKdiKF6c3ey3oM1SvpYZBrBfDPZWB4/APxfjQXYpYEBcISVQN zNq+B34eUQvVYCvwupMw/wOQpD X-Google-Smtp-Source: AGHT+IFKjeBQD/A9Cy0YVDMNl51XYjnNMDgoMCx8tOZYlOjGYopYbSKgs02N5DwIQ1nJyG/1Tg773Q== X-Received: by 2002:a05:600c:810b:b0:468:4350:c84d with SMTP id 5b1f17b1804b1-46fa9a8657fmr44206655e9.7.1759997991300; Thu, 09 Oct 2025 01:19:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Pierrick Bouvier , Stafford Horne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 10/10] target/openrisc: Replace target_ulong -> uint32_t Date: Thu, 9 Oct 2025 10:19:02 +0200 Message-ID: <20251009081903.13426-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009081903.13426-1-philmd@linaro.org> References: <20251009081903.13426-1-philmd@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=2a00:1450:4864:20::341; envelope-from=philmd@linaro.org; helo=mail-wm1-x341.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: 1759998035930116600 The OpenRISC targets are only built as 32-bit: $ git grep TARGET_LONG_BITS configs/targets/or1k-* configs/targets/or1k-linux-user.mak:5:TARGET_LONG_BITS=3D32 configs/targets/or1k-softmmu.mak:5:TARGET_LONG_BITS=3D32 Therefore target_ulong always expands to uint32_t. Replace and adapt the API uses mechanically: target_ulong -> uint32_t target_long -> int32_t tl -> i32 TCGv -> TCGv_i32 tcg_temp_new -> tcg_temp_new_i32 tcg_global_mem_new -> tcg_global_mem_new_i32 VMSTATE_UINTTL -> VMSTATE_UINT32 There is no functional change (the migration stream is not modified). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Richard Henderson --- target/openrisc/cpu.h | 22 +- target/openrisc/helper.h | 8 +- target/openrisc/fpu_helper.c | 8 +- target/openrisc/machine.c | 16 +- target/openrisc/sys_helper.c | 5 +- target/openrisc/translate.c | 382 +++++++++++++++++------------------ 6 files changed, 220 insertions(+), 221 deletions(-) diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index 87201365a91..c8e2827930b 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -224,20 +224,20 @@ typedef struct CPUOpenRISCTLBContext { #endif =20 typedef struct CPUArchState { - target_ulong shadow_gpr[16][32]; /* Shadow registers */ + uint32_t shadow_gpr[16][32]; /* Shadow registers */ =20 - target_ulong pc; /* Program counter */ - target_ulong ppc; /* Prev PC */ - target_ulong jmp_pc; /* Jump PC */ + uint32_t pc; /* Program counter */ + uint32_t ppc; /* Prev PC */ + uint32_t jmp_pc; /* Jump PC */ =20 uint64_t mac; /* Multiply registers MACHI:MACLO */ =20 - target_ulong epcr; /* Exception PC register */ - target_ulong eear; /* Exception EA register */ + uint32_t epcr; /* Exception PC register */ + uint32_t eear; /* Exception EA register */ =20 - target_ulong sr_f; /* the SR_F bit, values 0, 1. */ - target_ulong sr_cy; /* the SR_CY bit, values 0, 1. */ - target_long sr_ov; /* the SR_OV bit (in the sign bit only) */ + uint32_t sr_f; /* the SR_F bit, values 0, 1. */ + uint32_t sr_cy; /* the SR_CY bit, values 0, 1. */ + int32_t sr_ov; /* the SR_OV bit (in the sign bit only) */ uint32_t sr; /* Supervisor register, without SR_{F,CY,OV}= */ uint32_t esr; /* Exception supervisor register */ uint32_t evbar; /* Exception vector base address register */ @@ -245,8 +245,8 @@ typedef struct CPUArchState { uint32_t fpcsr; /* Float register */ float_status fp_status; =20 - target_ulong lock_addr; - target_ulong lock_value; + uint32_t lock_addr; + uint32_t lock_value; =20 uint32_t dflag; /* In delay slot (boolean) */ =20 diff --git a/target/openrisc/helper.h b/target/openrisc/helper.h index d847814a28d..e0a8d402271 100644 --- a/target/openrisc/helper.h +++ b/target/openrisc/helper.h @@ -47,8 +47,8 @@ FOP_CALC(rem) #undef FOP_CALC =20 #define FOP_CMP(op) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_RWG, tl, env, i32, i32)= \ -DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_RWG, tl, env, i64, i64) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_RWG, i32, env, i32, i32= ) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_RWG, i32, env, i64, i64) FOP_CMP(eq) FOP_CMP(lt) FOP_CMP(le) @@ -62,5 +62,5 @@ FOP_CMP(ult) DEF_HELPER_FLAGS_1(rfe, 0, void, env) =20 /* sys */ -DEF_HELPER_FLAGS_3(mtspr, 0, void, env, tl, tl) -DEF_HELPER_FLAGS_3(mfspr, TCG_CALL_NO_WG, tl, env, tl, tl) +DEF_HELPER_FLAGS_3(mtspr, 0, void, env, i32, i32) +DEF_HELPER_FLAGS_3(mfspr, TCG_CALL_NO_WG, i32, env, i32, i32) diff --git a/target/openrisc/fpu_helper.c b/target/openrisc/fpu_helper.c index dba997255c6..39b6195dd7d 100644 --- a/target/openrisc/fpu_helper.c +++ b/target/openrisc/fpu_helper.c @@ -146,10 +146,10 @@ uint32_t helper_float_madd_s(CPUOpenRISCState *env, u= int32_t a, =20 =20 #define FLOAT_CMP(name, impl) \ -target_ulong helper_float_ ## name ## _d(CPUOpenRISCState *env, \ +uint32_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ uint64_t fdt0, uint64_t fdt1) \ { return float64_ ## impl(fdt0, fdt1, &env->fp_status); } \ -target_ulong helper_float_ ## name ## _s(CPUOpenRISCState *env, \ +uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ uint32_t fdt0, uint32_t fdt1) \ { return float32_ ## impl(fdt0, fdt1, &env->fp_status); } =20 @@ -160,13 +160,13 @@ FLOAT_CMP(un, unordered_quiet) #undef FLOAT_CMP =20 #define FLOAT_UCMP(name, expr) \ -target_ulong helper_float_ ## name ## _d(CPUOpenRISCState *env, \ +uint32_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ uint64_t fdt0, uint64_t fdt1) \ { \ FloatRelation r =3D float64_compare_quiet(fdt0, fdt1, &env->fp_status)= ; \ return expr; \ } \ -target_ulong helper_float_ ## name ## _s(CPUOpenRISCState *env, \ +uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ uint32_t fdt0, uint32_t fdt1) \ { \ FloatRelation r =3D float32_compare_quiet(fdt0, fdt1, &env->fp_status)= ; \ diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c index fa054e528bd..f2853674f0f 100644 --- a/target/openrisc/machine.c +++ b/target/openrisc/machine.c @@ -72,14 +72,14 @@ static const VMStateDescription vmstate_env =3D { .version_id =3D 6, .minimum_version_id =3D 6, .fields =3D (const VMStateField[]) { - VMSTATE_UINTTL_2DARRAY(shadow_gpr, CPUOpenRISCState, 16, 32), - VMSTATE_UINTTL(pc, CPUOpenRISCState), - VMSTATE_UINTTL(ppc, CPUOpenRISCState), - VMSTATE_UINTTL(jmp_pc, CPUOpenRISCState), - VMSTATE_UINTTL(lock_addr, CPUOpenRISCState), - VMSTATE_UINTTL(lock_value, CPUOpenRISCState), - VMSTATE_UINTTL(epcr, CPUOpenRISCState), - VMSTATE_UINTTL(eear, CPUOpenRISCState), + VMSTATE_UINT32_2DARRAY(shadow_gpr, CPUOpenRISCState, 16, 32), + VMSTATE_UINT32(pc, CPUOpenRISCState), + VMSTATE_UINT32(ppc, CPUOpenRISCState), + VMSTATE_UINT32(jmp_pc, CPUOpenRISCState), + VMSTATE_UINT32(lock_addr, CPUOpenRISCState), + VMSTATE_UINT32(lock_value, CPUOpenRISCState), + VMSTATE_UINT32(epcr, CPUOpenRISCState), + VMSTATE_UINT32(eear, CPUOpenRISCState), =20 /* Save the architecture value of the SR, not the internally expanded version. Since this architecture value does not diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index ad59939db3b..7ad908b6322 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -40,7 +40,7 @@ static inline bool is_user(CPUOpenRISCState *env) #endif } =20 -void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong r= b) +void HELPER(mtspr)(CPUOpenRISCState *env, uint32_t spr, uint32_t rb) { OpenRISCCPU *cpu =3D env_archcpu(env); #ifndef CONFIG_USER_ONLY @@ -213,8 +213,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong = spr, target_ulong rb) #endif } =20 -target_ulong HELPER(mfspr)(CPUOpenRISCState *env, target_ulong rd, - target_ulong spr) +uint32_t HELPER(mfspr)(CPUOpenRISCState *env, uint32_t rd, uint32_t spr) { OpenRISCCPU *cpu =3D env_archcpu(env); #ifndef CONFIG_USER_ONLY diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 7cb4152e357..960438e1626 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -54,9 +54,9 @@ typedef struct DisasContext { vaddr jmp_pc_imm; =20 /* The temporary corresponding to register 0 for this compilation. */ - TCGv R0; + TCGv_i32 R0; /* The constant zero. */ - TCGv zero; + TCGv_i32 zero; } DisasContext; =20 static inline bool is_user(DisasContext *dc) @@ -71,16 +71,16 @@ static inline bool is_user(DisasContext *dc) /* Include the auto-generated decoder. */ #include "decode-insns.c.inc" =20 -static TCGv cpu_sr; -static TCGv cpu_regs[32]; -static TCGv cpu_pc; -static TCGv jmp_pc; /* l.jr/l.jalr temp pc */ -static TCGv cpu_ppc; -static TCGv cpu_sr_f; /* bf/bnf, F flag taken */ -static TCGv cpu_sr_cy; /* carry (unsigned overflow) */ -static TCGv cpu_sr_ov; /* signed overflow */ -static TCGv cpu_lock_addr; -static TCGv cpu_lock_value; +static TCGv_i32 cpu_sr; +static TCGv_i32 cpu_regs[32]; +static TCGv_i32 cpu_pc; +static TCGv_i32 jmp_pc; /* l.jr/l.jalr temp pc */ +static TCGv_i32 cpu_ppc; +static TCGv_i32 cpu_sr_f; /* bf/bnf, F flag taken */ +static TCGv_i32 cpu_sr_cy; /* carry (unsigned overflow) */ +static TCGv_i32 cpu_sr_ov; /* signed overflow */ +static TCGv_i32 cpu_lock_addr; +static TCGv_i32 cpu_lock_value; static TCGv_i32 fpcsr; static TCGv_i64 cpu_mac; /* MACHI:MACLO */ static TCGv_i32 cpu_dflag; @@ -95,27 +95,27 @@ void openrisc_translate_init(void) }; int i; =20 - cpu_sr =3D tcg_global_mem_new(tcg_env, + cpu_sr =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, sr), "sr"); cpu_dflag =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, dflag), "dflag"); - cpu_pc =3D tcg_global_mem_new(tcg_env, + cpu_pc =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, pc), "pc"); - cpu_ppc =3D tcg_global_mem_new(tcg_env, + cpu_ppc =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, ppc), "ppc"); - jmp_pc =3D tcg_global_mem_new(tcg_env, + jmp_pc =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, jmp_pc), "jmp_p= c"); - cpu_sr_f =3D tcg_global_mem_new(tcg_env, + cpu_sr_f =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, sr_f), "sr_f"= ); - cpu_sr_cy =3D tcg_global_mem_new(tcg_env, + cpu_sr_cy =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, sr_cy), "sr_= cy"); - cpu_sr_ov =3D tcg_global_mem_new(tcg_env, + cpu_sr_ov =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, sr_ov), "sr_= ov"); - cpu_lock_addr =3D tcg_global_mem_new(tcg_env, + cpu_lock_addr =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, lock_add= r), "lock_addr"); - cpu_lock_value =3D tcg_global_mem_new(tcg_env, + cpu_lock_value =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, lock_va= lue), "lock_value"); fpcsr =3D tcg_global_mem_new_i32(tcg_env, @@ -125,7 +125,7 @@ void openrisc_translate_init(void) offsetof(CPUOpenRISCState, mac), "mac"); for (i =3D 0; i < 32; i++) { - cpu_regs[i] =3D tcg_global_mem_new(tcg_env, + cpu_regs[i] =3D tcg_global_mem_new_i32(tcg_env, offsetof(CPUOpenRISCState, shadow_gpr[0][i]), regnames[i]); @@ -139,7 +139,7 @@ static void gen_exception(DisasContext *dc, unsigned in= t excp) =20 static void gen_illegal_exception(DisasContext *dc) { - tcg_gen_movi_tl(cpu_pc, dc->base.pc_next); + tcg_gen_movi_i32(cpu_pc, dc->base.pc_next); gen_exception(dc, EXCP_ILLEGAL); dc->base.is_jmp =3D DISAS_NORETURN; } @@ -159,7 +159,7 @@ static bool check_of64a32s(DisasContext *dc) return dc->cpucfgr & CPUCFGR_OF64A32S; } =20 -static TCGv cpu_R(DisasContext *dc, int reg) +static TCGv_i32 cpu_R(DisasContext *dc, int reg) { if (reg =3D=3D 0) { return dc->R0; @@ -200,126 +200,126 @@ static void gen_ove_cyov(DisasContext *dc) } } =20 -static void gen_add(DisasContext *dc, TCGv dest, TCGv srca, TCGv srcb) +static void gen_add(DisasContext *dc, TCGv_i32 dest, TCGv_i32 srca, TCGv_i= 32 srcb) { - TCGv t0 =3D tcg_temp_new(); - TCGv res =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 res =3D tcg_temp_new_i32(); =20 - tcg_gen_add2_tl(res, cpu_sr_cy, srca, dc->zero, srcb, dc->zero); - tcg_gen_xor_tl(cpu_sr_ov, srca, srcb); - tcg_gen_xor_tl(t0, res, srcb); - tcg_gen_andc_tl(cpu_sr_ov, t0, cpu_sr_ov); + tcg_gen_add2_i32(res, cpu_sr_cy, srca, dc->zero, srcb, dc->zero); + tcg_gen_xor_i32(cpu_sr_ov, srca, srcb); + tcg_gen_xor_i32(t0, res, srcb); + tcg_gen_andc_i32(cpu_sr_ov, t0, cpu_sr_ov); =20 - tcg_gen_mov_tl(dest, res); + tcg_gen_mov_i32(dest, res); =20 gen_ove_cyov(dc); } =20 -static void gen_addc(DisasContext *dc, TCGv dest, TCGv srca, TCGv srcb) +static void gen_addc(DisasContext *dc, TCGv_i32 dest, TCGv_i32 srca, TCGv_= i32 srcb) { - TCGv t0 =3D tcg_temp_new(); - TCGv res =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 res =3D tcg_temp_new_i32(); =20 - tcg_gen_addcio_tl(res, cpu_sr_cy, srca, srcb, cpu_sr_cy); - tcg_gen_xor_tl(cpu_sr_ov, srca, srcb); - tcg_gen_xor_tl(t0, res, srcb); - tcg_gen_andc_tl(cpu_sr_ov, t0, cpu_sr_ov); + tcg_gen_addcio_i32(res, cpu_sr_cy, srca, srcb, cpu_sr_cy); + tcg_gen_xor_i32(cpu_sr_ov, srca, srcb); + tcg_gen_xor_i32(t0, res, srcb); + tcg_gen_andc_i32(cpu_sr_ov, t0, cpu_sr_ov); =20 - tcg_gen_mov_tl(dest, res); + tcg_gen_mov_i32(dest, res); =20 gen_ove_cyov(dc); } =20 -static void gen_sub(DisasContext *dc, TCGv dest, TCGv srca, TCGv srcb) +static void gen_sub(DisasContext *dc, TCGv_i32 dest, TCGv_i32 srca, TCGv_i= 32 srcb) { - TCGv res =3D tcg_temp_new(); + TCGv_i32 res =3D tcg_temp_new_i32(); =20 - tcg_gen_sub_tl(res, srca, srcb); - tcg_gen_xor_tl(cpu_sr_cy, srca, srcb); - tcg_gen_xor_tl(cpu_sr_ov, res, srcb); - tcg_gen_and_tl(cpu_sr_ov, cpu_sr_ov, cpu_sr_cy); - tcg_gen_setcond_tl(TCG_COND_LTU, cpu_sr_cy, srca, srcb); + tcg_gen_sub_i32(res, srca, srcb); + tcg_gen_xor_i32(cpu_sr_cy, srca, srcb); + tcg_gen_xor_i32(cpu_sr_ov, res, srcb); + tcg_gen_and_i32(cpu_sr_ov, cpu_sr_ov, cpu_sr_cy); + tcg_gen_setcond_i32(TCG_COND_LTU, cpu_sr_cy, srca, srcb); =20 - tcg_gen_mov_tl(dest, res); + tcg_gen_mov_i32(dest, res); =20 gen_ove_cyov(dc); } =20 -static void gen_mul(DisasContext *dc, TCGv dest, TCGv srca, TCGv srcb) +static void gen_mul(DisasContext *dc, TCGv_i32 dest, TCGv_i32 srca, TCGv_i= 32 srcb) { - TCGv t0 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); =20 - tcg_gen_muls2_tl(dest, cpu_sr_ov, srca, srcb); - tcg_gen_sari_tl(t0, dest, TARGET_LONG_BITS - 1); - tcg_gen_negsetcond_tl(TCG_COND_NE, cpu_sr_ov, cpu_sr_ov, t0); + tcg_gen_muls2_i32(dest, cpu_sr_ov, srca, srcb); + tcg_gen_sari_i32(t0, dest, TARGET_LONG_BITS - 1); + tcg_gen_negsetcond_i32(TCG_COND_NE, cpu_sr_ov, cpu_sr_ov, t0); =20 gen_ove_ov(dc); } =20 -static void gen_mulu(DisasContext *dc, TCGv dest, TCGv srca, TCGv srcb) +static void gen_mulu(DisasContext *dc, TCGv_i32 dest, TCGv_i32 srca, TCGv_= i32 srcb) { - tcg_gen_muls2_tl(dest, cpu_sr_cy, srca, srcb); - tcg_gen_setcondi_tl(TCG_COND_NE, cpu_sr_cy, cpu_sr_cy, 0); + tcg_gen_muls2_i32(dest, cpu_sr_cy, srca, srcb); + tcg_gen_setcondi_i32(TCG_COND_NE, cpu_sr_cy, cpu_sr_cy, 0); =20 gen_ove_cy(dc); } =20 -static void gen_div(DisasContext *dc, TCGv dest, TCGv srca, TCGv srcb) +static void gen_div(DisasContext *dc, TCGv_i32 dest, TCGv_i32 srca, TCGv_i= 32 srcb) { - TCGv t0 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); =20 - tcg_gen_setcondi_tl(TCG_COND_EQ, cpu_sr_ov, srcb, 0); + tcg_gen_setcondi_i32(TCG_COND_EQ, cpu_sr_ov, srcb, 0); /* The result of divide-by-zero is undefined. Suppress the host-side exception by dividing by 1. */ - tcg_gen_or_tl(t0, srcb, cpu_sr_ov); - tcg_gen_div_tl(dest, srca, t0); + tcg_gen_or_i32(t0, srcb, cpu_sr_ov); + tcg_gen_div_i32(dest, srca, t0); =20 - tcg_gen_neg_tl(cpu_sr_ov, cpu_sr_ov); + tcg_gen_neg_i32(cpu_sr_ov, cpu_sr_ov); gen_ove_ov(dc); } =20 -static void gen_divu(DisasContext *dc, TCGv dest, TCGv srca, TCGv srcb) +static void gen_divu(DisasContext *dc, TCGv_i32 dest, TCGv_i32 srca, TCGv_= i32 srcb) { - TCGv t0 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); =20 - tcg_gen_setcondi_tl(TCG_COND_EQ, cpu_sr_cy, srcb, 0); + tcg_gen_setcondi_i32(TCG_COND_EQ, cpu_sr_cy, srcb, 0); /* The result of divide-by-zero is undefined. Suppress the host-side exception by dividing by 1. */ - tcg_gen_or_tl(t0, srcb, cpu_sr_cy); - tcg_gen_divu_tl(dest, srca, t0); + tcg_gen_or_i32(t0, srcb, cpu_sr_cy); + tcg_gen_divu_i32(dest, srca, t0); =20 gen_ove_cy(dc); } =20 -static void gen_muld(DisasContext *dc, TCGv srca, TCGv srcb) +static void gen_muld(DisasContext *dc, TCGv_i32 srca, TCGv_i32 srcb) { TCGv_i64 t1 =3D tcg_temp_new_i64(); TCGv_i64 t2 =3D tcg_temp_new_i64(); =20 - tcg_gen_ext_tl_i64(t1, srca); - tcg_gen_ext_tl_i64(t2, srcb); + tcg_gen_ext_i32_i64(t1, srca); + tcg_gen_ext_i32_i64(t2, srcb); tcg_gen_mul_i64(cpu_mac, t1, t2); - tcg_gen_movi_tl(cpu_sr_ov, 0); + tcg_gen_movi_i32(cpu_sr_ov, 0); } =20 -static void gen_muldu(DisasContext *dc, TCGv srca, TCGv srcb) +static void gen_muldu(DisasContext *dc, TCGv_i32 srca, TCGv_i32 srcb) { TCGv_i64 t1 =3D tcg_temp_new_i64(); TCGv_i64 t2 =3D tcg_temp_new_i64(); =20 - tcg_gen_extu_tl_i64(t1, srca); - tcg_gen_extu_tl_i64(t2, srcb); + tcg_gen_extu_i32_i64(t1, srca); + tcg_gen_extu_i32_i64(t2, srcb); tcg_gen_mul_i64(cpu_mac, t1, t2); - tcg_gen_movi_tl(cpu_sr_cy, 0); + tcg_gen_movi_i32(cpu_sr_cy, 0); } =20 -static void gen_mac(DisasContext *dc, TCGv srca, TCGv srcb) +static void gen_mac(DisasContext *dc, TCGv_i32 srca, TCGv_i32 srcb) { TCGv_i64 t1 =3D tcg_temp_new_i64(); TCGv_i64 t2 =3D tcg_temp_new_i64(); =20 - tcg_gen_ext_tl_i64(t1, srca); - tcg_gen_ext_tl_i64(t2, srcb); + tcg_gen_ext_i32_i64(t1, srca); + tcg_gen_ext_i32_i64(t2, srcb); tcg_gen_mul_i64(t1, t1, t2); =20 /* Note that overflow is only computed during addition stage. */ @@ -333,13 +333,13 @@ static void gen_mac(DisasContext *dc, TCGv srca, TCGv= srcb) gen_ove_ov(dc); } =20 -static void gen_macu(DisasContext *dc, TCGv srca, TCGv srcb) +static void gen_macu(DisasContext *dc, TCGv_i32 srca, TCGv_i32 srcb) { TCGv_i64 t1 =3D tcg_temp_new_i64(); TCGv_i64 t2 =3D tcg_temp_new_i64(); =20 - tcg_gen_extu_tl_i64(t1, srca); - tcg_gen_extu_tl_i64(t2, srcb); + tcg_gen_extu_i32_i64(t1, srca); + tcg_gen_extu_i32_i64(t2, srcb); tcg_gen_mul_i64(t1, t1, t2); =20 /* Note that overflow is only computed during addition stage. */ @@ -350,13 +350,13 @@ static void gen_macu(DisasContext *dc, TCGv srca, TCG= v srcb) gen_ove_cy(dc); } =20 -static void gen_msb(DisasContext *dc, TCGv srca, TCGv srcb) +static void gen_msb(DisasContext *dc, TCGv_i32 srca, TCGv_i32 srcb) { TCGv_i64 t1 =3D tcg_temp_new_i64(); TCGv_i64 t2 =3D tcg_temp_new_i64(); =20 - tcg_gen_ext_tl_i64(t1, srca); - tcg_gen_ext_tl_i64(t2, srcb); + tcg_gen_ext_i32_i64(t1, srca); + tcg_gen_ext_i32_i64(t2, srcb); tcg_gen_mul_i64(t1, t1, t2); =20 /* Note that overflow is only computed during subtraction stage. */ @@ -374,13 +374,13 @@ static void gen_msb(DisasContext *dc, TCGv srca, TCGv= srcb) gen_ove_ov(dc); } =20 -static void gen_msbu(DisasContext *dc, TCGv srca, TCGv srcb) +static void gen_msbu(DisasContext *dc, TCGv_i32 srca, TCGv_i32 srcb) { TCGv_i64 t1 =3D tcg_temp_new_i64(); TCGv_i64 t2 =3D tcg_temp_new_i64(); =20 - tcg_gen_extu_tl_i64(t1, srca); - tcg_gen_extu_tl_i64(t2, srcb); + tcg_gen_extu_i32_i64(t1, srca); + tcg_gen_extu_i32_i64(t2, srcb); tcg_gen_mul_i64(t1, t1, t2); =20 /* Note that overflow is only computed during subtraction stage. */ @@ -415,84 +415,84 @@ static bool trans_l_sub(DisasContext *dc, arg_dab *a) static bool trans_l_and(DisasContext *dc, arg_dab *a) { check_r0_write(dc, a->d); - tcg_gen_and_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); + tcg_gen_and_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_or(DisasContext *dc, arg_dab *a) { check_r0_write(dc, a->d); - tcg_gen_or_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); + tcg_gen_or_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_xor(DisasContext *dc, arg_dab *a) { check_r0_write(dc, a->d); - tcg_gen_xor_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); + tcg_gen_xor_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sll(DisasContext *dc, arg_dab *a) { check_r0_write(dc, a->d); - tcg_gen_shl_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); + tcg_gen_shl_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_srl(DisasContext *dc, arg_dab *a) { check_r0_write(dc, a->d); - tcg_gen_shr_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); + tcg_gen_shr_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sra(DisasContext *dc, arg_dab *a) { check_r0_write(dc, a->d); - tcg_gen_sar_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); + tcg_gen_sar_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_ror(DisasContext *dc, arg_dab *a) { check_r0_write(dc, a->d); - tcg_gen_rotr_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); + tcg_gen_rotr_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_exths(DisasContext *dc, arg_da *a) { check_r0_write(dc, a->d); - tcg_gen_ext16s_tl(cpu_R(dc, a->d), cpu_R(dc, a->a)); + tcg_gen_ext16s_i32(cpu_R(dc, a->d), cpu_R(dc, a->a)); return true; } =20 static bool trans_l_extbs(DisasContext *dc, arg_da *a) { check_r0_write(dc, a->d); - tcg_gen_ext8s_tl(cpu_R(dc, a->d), cpu_R(dc, a->a)); + tcg_gen_ext8s_i32(cpu_R(dc, a->d), cpu_R(dc, a->a)); return true; } =20 static bool trans_l_exthz(DisasContext *dc, arg_da *a) { check_r0_write(dc, a->d); - tcg_gen_ext16u_tl(cpu_R(dc, a->d), cpu_R(dc, a->a)); + tcg_gen_ext16u_i32(cpu_R(dc, a->d), cpu_R(dc, a->a)); return true; } =20 static bool trans_l_extbz(DisasContext *dc, arg_da *a) { check_r0_write(dc, a->d); - tcg_gen_ext8u_tl(cpu_R(dc, a->d), cpu_R(dc, a->a)); + tcg_gen_ext8u_i32(cpu_R(dc, a->d), cpu_R(dc, a->a)); return true; } =20 static bool trans_l_cmov(DisasContext *dc, arg_dab *a) { check_r0_write(dc, a->d); - tcg_gen_movcond_tl(TCG_COND_NE, cpu_R(dc, a->d), cpu_sr_f, dc->zero, + tcg_gen_movcond_i32(TCG_COND_NE, cpu_R(dc, a->d), cpu_sr_f, dc->zero, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } @@ -500,16 +500,16 @@ static bool trans_l_cmov(DisasContext *dc, arg_dab *a) static bool trans_l_ff1(DisasContext *dc, arg_da *a) { check_r0_write(dc, a->d); - tcg_gen_ctzi_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), -1); - tcg_gen_addi_tl(cpu_R(dc, a->d), cpu_R(dc, a->d), 1); + tcg_gen_ctzi_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), -1); + tcg_gen_addi_i32(cpu_R(dc, a->d), cpu_R(dc, a->d), 1); return true; } =20 static bool trans_l_fl1(DisasContext *dc, arg_da *a) { check_r0_write(dc, a->d); - tcg_gen_clzi_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), TARGET_LONG_BITS); - tcg_gen_subfi_tl(cpu_R(dc, a->d), TARGET_LONG_BITS, cpu_R(dc, a->d)); + tcg_gen_clzi_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), TARGET_LONG_BITS); + tcg_gen_subfi_i32(cpu_R(dc, a->d), TARGET_LONG_BITS, cpu_R(dc, a->d)); return true; } =20 @@ -557,7 +557,7 @@ static bool trans_l_j(DisasContext *dc, arg_l_j *a) { vaddr tmp_pc =3D dc->base.pc_next + a->n * 4; =20 - tcg_gen_movi_tl(jmp_pc, tmp_pc); + tcg_gen_movi_i32(jmp_pc, tmp_pc); dc->jmp_pc_imm =3D tmp_pc; dc->delayed_branch =3D 2; return true; @@ -568,10 +568,10 @@ static bool trans_l_jal(DisasContext *dc, arg_l_jal *= a) vaddr tmp_pc =3D dc->base.pc_next + a->n * 4; vaddr ret_pc =3D dc->base.pc_next + 8; =20 - tcg_gen_movi_tl(cpu_regs[9], ret_pc); + tcg_gen_movi_i32(cpu_regs[9], ret_pc); /* Optimize jal being used to load the PC for PIC. */ if (tmp_pc !=3D ret_pc) { - tcg_gen_movi_tl(jmp_pc, tmp_pc); + tcg_gen_movi_i32(jmp_pc, tmp_pc); dc->jmp_pc_imm =3D tmp_pc; dc->delayed_branch =3D 2; } @@ -581,10 +581,10 @@ static bool trans_l_jal(DisasContext *dc, arg_l_jal *= a) static void do_bf(DisasContext *dc, arg_l_bf *a, TCGCond cond) { vaddr tmp_pc =3D dc->base.pc_next + a->n * 4; - TCGv t_next =3D tcg_constant_tl(dc->base.pc_next + 8); - TCGv t_true =3D tcg_constant_tl(tmp_pc); + TCGv_i32 t_next =3D tcg_constant_i32(dc->base.pc_next + 8); + TCGv_i32 t_true =3D tcg_constant_i32(tmp_pc); =20 - tcg_gen_movcond_tl(cond, jmp_pc, cpu_sr_f, dc->zero, t_true, t_next); + tcg_gen_movcond_i32(cond, jmp_pc, cpu_sr_f, dc->zero, t_true, t_next); dc->delayed_branch =3D 2; } =20 @@ -602,40 +602,40 @@ static bool trans_l_bnf(DisasContext *dc, arg_l_bf *a) =20 static bool trans_l_jr(DisasContext *dc, arg_l_jr *a) { - tcg_gen_mov_tl(jmp_pc, cpu_R(dc, a->b)); + tcg_gen_mov_i32(jmp_pc, cpu_R(dc, a->b)); dc->delayed_branch =3D 2; return true; } =20 static bool trans_l_jalr(DisasContext *dc, arg_l_jalr *a) { - tcg_gen_mov_tl(jmp_pc, cpu_R(dc, a->b)); - tcg_gen_movi_tl(cpu_regs[9], dc->base.pc_next + 8); + tcg_gen_mov_i32(jmp_pc, cpu_R(dc, a->b)); + tcg_gen_movi_i32(cpu_regs[9], dc->base.pc_next + 8); dc->delayed_branch =3D 2; return true; } =20 static bool trans_l_lwa(DisasContext *dc, arg_load *a) { - TCGv ea; + TCGv_i32 ea; =20 check_r0_write(dc, a->d); - ea =3D tcg_temp_new(); - tcg_gen_addi_tl(ea, cpu_R(dc, a->a), a->i); - tcg_gen_qemu_ld_tl(cpu_R(dc, a->d), ea, dc->mem_idx, MO_BE | MO_UL); - tcg_gen_mov_tl(cpu_lock_addr, ea); - tcg_gen_mov_tl(cpu_lock_value, cpu_R(dc, a->d)); + ea =3D tcg_temp_new_i32(); + tcg_gen_addi_i32(ea, cpu_R(dc, a->a), a->i); + tcg_gen_qemu_ld_i32(cpu_R(dc, a->d), ea, dc->mem_idx, MO_BE | MO_UL); + tcg_gen_mov_i32(cpu_lock_addr, ea); + tcg_gen_mov_i32(cpu_lock_value, cpu_R(dc, a->d)); return true; } =20 static void do_load(DisasContext *dc, arg_load *a, MemOp mop) { - TCGv ea; + TCGv_i32 ea; =20 check_r0_write(dc, a->d); - ea =3D tcg_temp_new(); - tcg_gen_addi_tl(ea, cpu_R(dc, a->a), a->i); - tcg_gen_qemu_ld_tl(cpu_R(dc, a->d), ea, dc->mem_idx, mop); + ea =3D tcg_temp_new_i32(); + tcg_gen_addi_i32(ea, cpu_R(dc, a->a), a->i); + tcg_gen_qemu_ld_i32(cpu_R(dc, a->d), ea, dc->mem_idx, mop); } =20 static bool trans_l_lwz(DisasContext *dc, arg_load *a) @@ -676,36 +676,36 @@ static bool trans_l_lhs(DisasContext *dc, arg_load *a) =20 static bool trans_l_swa(DisasContext *dc, arg_store *a) { - TCGv ea, val; + TCGv_i32 ea, val; TCGLabel *lab_fail, *lab_done; =20 - ea =3D tcg_temp_new(); - tcg_gen_addi_tl(ea, cpu_R(dc, a->a), a->i); + ea =3D tcg_temp_new_i32(); + tcg_gen_addi_i32(ea, cpu_R(dc, a->a), a->i); =20 lab_fail =3D gen_new_label(); lab_done =3D gen_new_label(); - tcg_gen_brcond_tl(TCG_COND_NE, ea, cpu_lock_addr, lab_fail); + tcg_gen_brcond_i32(TCG_COND_NE, ea, cpu_lock_addr, lab_fail); =20 - val =3D tcg_temp_new(); - tcg_gen_atomic_cmpxchg_tl(val, cpu_lock_addr, cpu_lock_value, + val =3D tcg_temp_new_i32(); + tcg_gen_atomic_cmpxchg_i32(val, cpu_lock_addr, cpu_lock_value, cpu_R(dc, a->b), dc->mem_idx, MO_BE | MO_UL); - tcg_gen_setcond_tl(TCG_COND_EQ, cpu_sr_f, val, cpu_lock_value); + tcg_gen_setcond_i32(TCG_COND_EQ, cpu_sr_f, val, cpu_lock_value); =20 tcg_gen_br(lab_done); =20 gen_set_label(lab_fail); - tcg_gen_movi_tl(cpu_sr_f, 0); + tcg_gen_movi_i32(cpu_sr_f, 0); =20 gen_set_label(lab_done); - tcg_gen_movi_tl(cpu_lock_addr, -1); + tcg_gen_movi_i32(cpu_lock_addr, -1); return true; } =20 static void do_store(DisasContext *dc, arg_store *a, MemOp mop) { - TCGv t0 =3D tcg_temp_new(); - tcg_gen_addi_tl(t0, cpu_R(dc, a->a), a->i); - tcg_gen_qemu_st_tl(cpu_R(dc, a->b), t0, dc->mem_idx, mop); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + tcg_gen_addi_i32(t0, cpu_R(dc, a->a), a->i); + tcg_gen_qemu_st_i32(cpu_R(dc, a->b), t0, dc->mem_idx, mop); } =20 static bool trans_l_sw(DisasContext *dc, arg_store *a) @@ -747,75 +747,75 @@ static bool trans_l_adrp(DisasContext *dc, arg_l_adrp= *a) static bool trans_l_addi(DisasContext *dc, arg_rri *a) { check_r0_write(dc, a->d); - gen_add(dc, cpu_R(dc, a->d), cpu_R(dc, a->a), tcg_constant_tl(a->i)); + gen_add(dc, cpu_R(dc, a->d), cpu_R(dc, a->a), tcg_constant_i32(a->i)); return true; } =20 static bool trans_l_addic(DisasContext *dc, arg_rri *a) { check_r0_write(dc, a->d); - gen_addc(dc, cpu_R(dc, a->d), cpu_R(dc, a->a), tcg_constant_tl(a->i)); + gen_addc(dc, cpu_R(dc, a->d), cpu_R(dc, a->a), tcg_constant_i32(a->i)); return true; } =20 static bool trans_l_muli(DisasContext *dc, arg_rri *a) { check_r0_write(dc, a->d); - gen_mul(dc, cpu_R(dc, a->d), cpu_R(dc, a->a), tcg_constant_tl(a->i)); + gen_mul(dc, cpu_R(dc, a->d), cpu_R(dc, a->a), tcg_constant_i32(a->i)); return true; } =20 static bool trans_l_maci(DisasContext *dc, arg_l_maci *a) { - gen_mac(dc, cpu_R(dc, a->a), tcg_constant_tl(a->i)); + gen_mac(dc, cpu_R(dc, a->a), tcg_constant_i32(a->i)); return true; } =20 static bool trans_l_andi(DisasContext *dc, arg_rrk *a) { check_r0_write(dc, a->d); - tcg_gen_andi_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), a->k); + tcg_gen_andi_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), a->k); return true; } =20 static bool trans_l_ori(DisasContext *dc, arg_rrk *a) { check_r0_write(dc, a->d); - tcg_gen_ori_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), a->k); + tcg_gen_ori_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), a->k); return true; } =20 static bool trans_l_xori(DisasContext *dc, arg_rri *a) { check_r0_write(dc, a->d); - tcg_gen_xori_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), a->i); + tcg_gen_xori_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_mfspr(DisasContext *dc, arg_l_mfspr *a) { - TCGv spr =3D tcg_temp_new(); + TCGv_i32 spr =3D tcg_temp_new_i32(); =20 check_r0_write(dc, a->d); =20 if (translator_io_start(&dc->base)) { if (dc->delayed_branch) { - tcg_gen_mov_tl(cpu_pc, jmp_pc); - tcg_gen_discard_tl(jmp_pc); + tcg_gen_mov_i32(cpu_pc, jmp_pc); + tcg_gen_discard_i32(jmp_pc); } else { - tcg_gen_movi_tl(cpu_pc, dc->base.pc_next + 4); + tcg_gen_movi_i32(cpu_pc, dc->base.pc_next + 4); } dc->base.is_jmp =3D DISAS_EXIT; } =20 - tcg_gen_ori_tl(spr, cpu_R(dc, a->a), a->k); + tcg_gen_ori_i32(spr, cpu_R(dc, a->a), a->k); gen_helper_mfspr(cpu_R(dc, a->d), tcg_env, cpu_R(dc, a->d), spr); return true; } =20 static bool trans_l_mtspr(DisasContext *dc, arg_l_mtspr *a) { - TCGv spr =3D tcg_temp_new(); + TCGv_i32 spr =3D tcg_temp_new_i32(); =20 translator_io_start(&dc->base); =20 @@ -826,14 +826,14 @@ static bool trans_l_mtspr(DisasContext *dc, arg_l_mts= pr *a) * of the cpu state first, allowing it to be overwritten. */ if (dc->delayed_branch) { - tcg_gen_mov_tl(cpu_pc, jmp_pc); - tcg_gen_discard_tl(jmp_pc); + tcg_gen_mov_i32(cpu_pc, jmp_pc); + tcg_gen_discard_i32(jmp_pc); } else { - tcg_gen_movi_tl(cpu_pc, dc->base.pc_next + 4); + tcg_gen_movi_i32(cpu_pc, dc->base.pc_next + 4); } dc->base.is_jmp =3D DISAS_EXIT; =20 - tcg_gen_ori_tl(spr, cpu_R(dc, a->a), a->k); + tcg_gen_ori_i32(spr, cpu_R(dc, a->a), a->k); gen_helper_mtspr(tcg_env, spr, cpu_R(dc, a->b)); return true; } @@ -865,7 +865,7 @@ static bool trans_l_msbu(DisasContext *dc, arg_ab *a) static bool trans_l_slli(DisasContext *dc, arg_dal *a) { check_r0_write(dc, a->d); - tcg_gen_shli_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), + tcg_gen_shli_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), a->l & (TARGET_LONG_BITS - 1)); return true; } @@ -873,7 +873,7 @@ static bool trans_l_slli(DisasContext *dc, arg_dal *a) static bool trans_l_srli(DisasContext *dc, arg_dal *a) { check_r0_write(dc, a->d); - tcg_gen_shri_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), + tcg_gen_shri_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), a->l & (TARGET_LONG_BITS - 1)); return true; } @@ -881,7 +881,7 @@ static bool trans_l_srli(DisasContext *dc, arg_dal *a) static bool trans_l_srai(DisasContext *dc, arg_dal *a) { check_r0_write(dc, a->d); - tcg_gen_sari_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), + tcg_gen_sari_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), a->l & (TARGET_LONG_BITS - 1)); return true; } @@ -889,7 +889,7 @@ static bool trans_l_srai(DisasContext *dc, arg_dal *a) static bool trans_l_rori(DisasContext *dc, arg_dal *a) { check_r0_write(dc, a->d); - tcg_gen_rotri_tl(cpu_R(dc, a->d), cpu_R(dc, a->a), + tcg_gen_rotri_i32(cpu_R(dc, a->d), cpu_R(dc, a->a), a->l & (TARGET_LONG_BITS - 1)); return true; } @@ -897,7 +897,7 @@ static bool trans_l_rori(DisasContext *dc, arg_dal *a) static bool trans_l_movhi(DisasContext *dc, arg_l_movhi *a) { check_r0_write(dc, a->d); - tcg_gen_movi_tl(cpu_R(dc, a->d), a->k << 16); + tcg_gen_movi_i32(cpu_R(dc, a->d), a->k << 16); return true; } =20 @@ -911,137 +911,137 @@ static bool trans_l_macrc(DisasContext *dc, arg_l_m= acrc *a) =20 static bool trans_l_sfeq(DisasContext *dc, arg_ab *a) { - tcg_gen_setcond_tl(TCG_COND_EQ, cpu_sr_f, + tcg_gen_setcond_i32(TCG_COND_EQ, cpu_sr_f, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sfne(DisasContext *dc, arg_ab *a) { - tcg_gen_setcond_tl(TCG_COND_NE, cpu_sr_f, + tcg_gen_setcond_i32(TCG_COND_NE, cpu_sr_f, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sfgtu(DisasContext *dc, arg_ab *a) { - tcg_gen_setcond_tl(TCG_COND_GTU, cpu_sr_f, + tcg_gen_setcond_i32(TCG_COND_GTU, cpu_sr_f, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sfgeu(DisasContext *dc, arg_ab *a) { - tcg_gen_setcond_tl(TCG_COND_GEU, cpu_sr_f, + tcg_gen_setcond_i32(TCG_COND_GEU, cpu_sr_f, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sfltu(DisasContext *dc, arg_ab *a) { - tcg_gen_setcond_tl(TCG_COND_LTU, cpu_sr_f, + tcg_gen_setcond_i32(TCG_COND_LTU, cpu_sr_f, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sfleu(DisasContext *dc, arg_ab *a) { - tcg_gen_setcond_tl(TCG_COND_LEU, cpu_sr_f, + tcg_gen_setcond_i32(TCG_COND_LEU, cpu_sr_f, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sfgts(DisasContext *dc, arg_ab *a) { - tcg_gen_setcond_tl(TCG_COND_GT, cpu_sr_f, + tcg_gen_setcond_i32(TCG_COND_GT, cpu_sr_f, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sfges(DisasContext *dc, arg_ab *a) { - tcg_gen_setcond_tl(TCG_COND_GE, cpu_sr_f, + tcg_gen_setcond_i32(TCG_COND_GE, cpu_sr_f, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sflts(DisasContext *dc, arg_ab *a) { - tcg_gen_setcond_tl(TCG_COND_LT, cpu_sr_f, + tcg_gen_setcond_i32(TCG_COND_LT, cpu_sr_f, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sfles(DisasContext *dc, arg_ab *a) { - tcg_gen_setcond_tl(TCG_COND_LE, + tcg_gen_setcond_i32(TCG_COND_LE, cpu_sr_f, cpu_R(dc, a->a), cpu_R(dc, a->b)); return true; } =20 static bool trans_l_sfeqi(DisasContext *dc, arg_ai *a) { - tcg_gen_setcondi_tl(TCG_COND_EQ, cpu_sr_f, cpu_R(dc, a->a), a->i); + tcg_gen_setcondi_i32(TCG_COND_EQ, cpu_sr_f, cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_sfnei(DisasContext *dc, arg_ai *a) { - tcg_gen_setcondi_tl(TCG_COND_NE, cpu_sr_f, cpu_R(dc, a->a), a->i); + tcg_gen_setcondi_i32(TCG_COND_NE, cpu_sr_f, cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_sfgtui(DisasContext *dc, arg_ai *a) { - tcg_gen_setcondi_tl(TCG_COND_GTU, cpu_sr_f, cpu_R(dc, a->a), a->i); + tcg_gen_setcondi_i32(TCG_COND_GTU, cpu_sr_f, cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_sfgeui(DisasContext *dc, arg_ai *a) { - tcg_gen_setcondi_tl(TCG_COND_GEU, cpu_sr_f, cpu_R(dc, a->a), a->i); + tcg_gen_setcondi_i32(TCG_COND_GEU, cpu_sr_f, cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_sfltui(DisasContext *dc, arg_ai *a) { - tcg_gen_setcondi_tl(TCG_COND_LTU, cpu_sr_f, cpu_R(dc, a->a), a->i); + tcg_gen_setcondi_i32(TCG_COND_LTU, cpu_sr_f, cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_sfleui(DisasContext *dc, arg_ai *a) { - tcg_gen_setcondi_tl(TCG_COND_LEU, cpu_sr_f, cpu_R(dc, a->a), a->i); + tcg_gen_setcondi_i32(TCG_COND_LEU, cpu_sr_f, cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_sfgtsi(DisasContext *dc, arg_ai *a) { - tcg_gen_setcondi_tl(TCG_COND_GT, cpu_sr_f, cpu_R(dc, a->a), a->i); + tcg_gen_setcondi_i32(TCG_COND_GT, cpu_sr_f, cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_sfgesi(DisasContext *dc, arg_ai *a) { - tcg_gen_setcondi_tl(TCG_COND_GE, cpu_sr_f, cpu_R(dc, a->a), a->i); + tcg_gen_setcondi_i32(TCG_COND_GE, cpu_sr_f, cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_sfltsi(DisasContext *dc, arg_ai *a) { - tcg_gen_setcondi_tl(TCG_COND_LT, cpu_sr_f, cpu_R(dc, a->a), a->i); + tcg_gen_setcondi_i32(TCG_COND_LT, cpu_sr_f, cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_sflesi(DisasContext *dc, arg_ai *a) { - tcg_gen_setcondi_tl(TCG_COND_LE, cpu_sr_f, cpu_R(dc, a->a), a->i); + tcg_gen_setcondi_i32(TCG_COND_LE, cpu_sr_f, cpu_R(dc, a->a), a->i); return true; } =20 static bool trans_l_sys(DisasContext *dc, arg_l_sys *a) { - tcg_gen_movi_tl(cpu_pc, dc->base.pc_next); + tcg_gen_movi_i32(cpu_pc, dc->base.pc_next); gen_exception(dc, EXCP_SYSCALL); dc->base.is_jmp =3D DISAS_NORETURN; return true; @@ -1049,7 +1049,7 @@ static bool trans_l_sys(DisasContext *dc, arg_l_sys *= a) =20 static bool trans_l_trap(DisasContext *dc, arg_l_trap *a) { - tcg_gen_movi_tl(cpu_pc, dc->base.pc_next); + tcg_gen_movi_i32(cpu_pc, dc->base.pc_next); gen_exception(dc, EXCP_TRAP); dc->base.is_jmp =3D DISAS_NORETURN; return true; @@ -1083,7 +1083,7 @@ static bool trans_l_rfe(DisasContext *dc, arg_l_rfe *= a) } =20 static bool do_fp2(DisasContext *dc, arg_da *a, - void (*fn)(TCGv, TCGv_env, TCGv)) + void (*fn)(TCGv_i32, TCGv_env, TCGv_i32)) { if (!check_of32s(dc)) { return false; @@ -1095,7 +1095,7 @@ static bool do_fp2(DisasContext *dc, arg_da *a, } =20 static bool do_fp3(DisasContext *dc, arg_dab *a, - void (*fn)(TCGv, TCGv_env, TCGv, TCGv)) + void (*fn)(TCGv_i32, TCGv_env, TCGv_i32, TCGv_i32)) { if (!check_of32s(dc)) { return false; @@ -1107,7 +1107,7 @@ static bool do_fp3(DisasContext *dc, arg_dab *a, } =20 static bool do_fpcmp(DisasContext *dc, arg_ab *a, - void (*fn)(TCGv, TCGv_env, TCGv, TCGv), + void (*fn)(TCGv_i32, TCGv_env, TCGv_i32, TCGv_i32), bool inv, bool swap) { if (!check_of32s(dc)) { @@ -1119,7 +1119,7 @@ static bool do_fpcmp(DisasContext *dc, arg_ab *a, fn(cpu_sr_f, tcg_env, cpu_R(dc, a->a), cpu_R(dc, a->b)); } if (inv) { - tcg_gen_xori_tl(cpu_sr_f, cpu_sr_f, 1); + tcg_gen_xori_i32(cpu_sr_f, cpu_sr_f, 1); } gen_helper_update_fpcsr(tcg_env); return true; @@ -1312,7 +1312,7 @@ static bool do_dp2(DisasContext *dc, arg_da_pair *a, } =20 static bool do_dpcmp(DisasContext *dc, arg_ab_pair *a, - void (*fn)(TCGv, TCGv_env, TCGv_i64, TCGv_i64), + void (*fn)(TCGv_i32, TCGv_env, TCGv_i64, TCGv_i64), bool inv, bool swap) { TCGv_i64 t0, t1; @@ -1334,7 +1334,7 @@ static bool do_dpcmp(DisasContext *dc, arg_ab_pair *a, } =20 if (inv) { - tcg_gen_xori_tl(cpu_sr_f, cpu_sr_f, 1); + tcg_gen_xori_i32(cpu_sr_f, cpu_sr_f, 1); } gen_helper_update_fpcsr(tcg_env); return true; @@ -1519,7 +1519,7 @@ static void openrisc_tr_tb_start(DisasContextBase *db= , CPUState *cs) =20 /* Allow the TCG optimizer to see that R0 =3D=3D 0, when it's true, which is the common case. */ - dc->zero =3D tcg_constant_tl(0); + dc->zero =3D tcg_constant_i32(0); if (dc->tb_flags & TB_FLAGS_R0_0) { dc->R0 =3D dc->zero; } else { @@ -1575,32 +1575,32 @@ static void openrisc_tr_tb_stop(DisasContextBase *d= cbase, CPUState *cs) =20 /* For DISAS_TOO_MANY, jump to the next insn. */ jmp_dest =3D dc->base.pc_next; - tcg_gen_movi_tl(cpu_ppc, jmp_dest - 4); + tcg_gen_movi_i32(cpu_ppc, jmp_dest - 4); =20 switch (dc->base.is_jmp) { case DISAS_JUMP: jmp_dest =3D dc->jmp_pc_imm; if (jmp_dest =3D=3D -1) { /* The jump destination is indirect/computed; use jmp_pc. */ - tcg_gen_mov_tl(cpu_pc, jmp_pc); - tcg_gen_discard_tl(jmp_pc); + tcg_gen_mov_i32(cpu_pc, jmp_pc); + tcg_gen_discard_i32(jmp_pc); tcg_gen_lookup_and_goto_ptr(); break; } /* The jump destination is direct; use jmp_pc_imm. However, we will have stored into jmp_pc as well; we know now that it wasn't needed. */ - tcg_gen_discard_tl(jmp_pc); + tcg_gen_discard_i32(jmp_pc); /* fallthru */ =20 case DISAS_TOO_MANY: if (translator_use_goto_tb(&dc->base, jmp_dest)) { tcg_gen_goto_tb(0); - tcg_gen_movi_tl(cpu_pc, jmp_dest); + tcg_gen_movi_i32(cpu_pc, jmp_dest); tcg_gen_exit_tb(dc->base.tb, 0); break; } - tcg_gen_movi_tl(cpu_pc, jmp_dest); + tcg_gen_movi_i32(cpu_pc, jmp_dest); tcg_gen_lookup_and_goto_ptr(); break; =20 --=20 2.51.0