From nobody Wed Apr 2 13:32:04 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=1742917367; cv=none; d=zohomail.com; s=zohoarc; b=TGk9U9Z0qh3sXCe6DL+O7PxQZOr74cDCtgKEUYg4hGJulSVR7RF/cP2q/Mha1MUE9ylVyCMNbo0TFu0b1vmRrkKSTeUPUa/l7NjodkUVY1wyuw0in4R/EKEyzRx70uQA8X8pG7J94z/T8/cQJNjCa6ORVbrVw6OsihhwpDuw48o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742917367; 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=vQ002iHqIIcWPiB1XY1rX4088N6FNysAgcdy0xlTwbQ=; b=CgQ6Wft+/NFFqc1t4n6lWIU7mDGC/slE8Tb/J/U3tnEZciABfDvOnRneibvvrc4popb+lrmhXicem+GazkjvtcZmBMlc2ZMeP0LCZ+vOiu1QeBPNxPPvSaE21+sLwXmZC+aYIegN/1lmcsNVRfG4NwFy9AE/hOaL1Q3qSbOyxUY= 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 174291736748990.62535790953211; Tue, 25 Mar 2025 08:42:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tx6Ov-0003nt-9V; Tue, 25 Mar 2025 11:41:13 -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 1tx6Os-0003nH-Co for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:10 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tx6Op-00045x-Ng for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:10 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3912baafc58so4594734f8f.1 for ; Tue, 25 Mar 2025 08:41:07 -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-3997f9b3c2csm13776977f8f.46.2025.03.25.08.41.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Mar 2025 08:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742917265; x=1743522065; 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=vQ002iHqIIcWPiB1XY1rX4088N6FNysAgcdy0xlTwbQ=; b=CMjMS5r8r1TqVpRTdum4cQLvc4HWychQ/OiMBdSo1y2+nCoDkmyamMlaFdZDur9yb0 cgx1MBsc/Zb/vEgkuv4SQJzLKsce2iDPsaNW4TFs2EEkXfSi+wyIyxnW71Jt0clSydmG pAxug+ltjBMZzOKwI6sc8TpjIzl2ZgTRwasPfeNh4/89bN3abXHSbBW/+18kO8yfD9PK xDJrDZwTQvaSK3M1zHGoWXiW/gpQkDhAGfU1KnUlDvAh71un2+PFCedk5lKlwGdhBreB rWBuGbF5nFWGgZLDg88Rwtpee23OdsytZ8Wcft07l4rTko40HsQRbwZzvBKC5XZ5nWro enFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917265; x=1743522065; 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=vQ002iHqIIcWPiB1XY1rX4088N6FNysAgcdy0xlTwbQ=; b=Exd/vSjbkxCWLrMiuCg5RJNAfC22fZquYZ+7+o8xC+7BvQZ0Ct9lotoZQwDhOW/VzH i5/XgZNZJu9chCP7idNsfKtHWbGvmiPxROpdiCgtptqwMYM6fZaHxk/0ze2mETw7K8dp H12BPZPsZzxbmOJid/QzzOsKt4v5ALjx9P1Y2tF22cOaRkoy+/1zdGBchbEAXDAQlRD4 b/y3A0sLFYY2kDPkqvbW45KEsjFWV+r2c5yI2p9755YWB9ZhIMfiHlN+WY0f1mx4+oFK z7SMUJq+hdhn7etD1H0FAc0A+yjiweyozBYSVhY9t0BBpoet2ppZDXBiIkSmtDkFUNow t+WA== X-Gm-Message-State: AOJu0Ywml1Pv6ydf3oGnZb6WuTdsY3b6mc1O2B76myNibaDQn0YdmApM MlslKoSFRwb5f2+j4vmwHi9SPIbi3WM7qaZc72xUl8ITkrVvDdIZ/CtYtc49AQsSiHWPod7/c89 I X-Gm-Gg: ASbGncsBH4vHo3vIxl7JLlQt8VmEN/epsk0W3h+tJuL46p/lx/ETOoP6Opi8kWoVT19 +jG76oNS7/n0w8kI6HlYQL2gtH2g4x3PFYDMuZUd+8hxg+kX7g2xfCHESaRHALc9qV1Gd3Tkuze I+g4gvOBNEaY3y3wuX8QLBOZhymzYdF1HFjy/2k5NW7ImPsAzdaP8x4+ZGatciSVfmUppnoeOJw /cF48xWONb1FYPf4xLl1DmtNVkM2R6A09n/WkIlVFy5X2VzCzNEOjtVKaafKoI/nf83iQpBkjgk XNRHTXsQKCXzzI/pNd8XV3aDO1UX1UTDQW9/JnKMDuOr2RDfNAThhQ1yY5OGbEAvexWCEveUba2 d04SRzZaNMotHaYyrsr0= X-Google-Smtp-Source: AGHT+IGECrLTcWKDu7mHWtA1lA/qZo8cfniO7etIuxla2lCEwg8UOGl7Ig8dnQNHROioc1iJozH6cQ== X-Received: by 2002:a5d:588b:0:b0:391:4282:f60e with SMTP id ffacd0b85a97d-3997f91d8e1mr15663179f8f.32.1742917265328; Tue, 25 Mar 2025 08:41:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Pierrick Bouvier , Zhao Liu , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Anton Johansson , Richard Henderson Subject: [PATCH-for-10.1 1/8] cpus: Open code OBJECT_DECLARE_TYPE() in OBJECT_DECLARE_CPU_TYPE() Date: Tue, 25 Mar 2025 16:40:51 +0100 Message-ID: <20250325154058.92735-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250325154058.92735-1-philmd@linaro.org> References: <20250325154058.92735-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::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1742917369944019100 Since the OBJECT_DECLARE_CPU_TYPE() macro uses the abstract ArchCPU type, when declaring multiple CPUs of the same ArchCPU type we get an error related to the indirect G_DEFINE_AUTOPTR_CLEANUP_FUNC() use within OBJECT_DECLARE_TYPE(): target/mips/cpu-qom.h:31:1: error: redefinition of 'glib_autoptr_clear_Ar= chCPU' OBJECT_DECLARE_CPU_TYPE(MIPS64CPU, MIPSCPUClass, MIPS64_CPU) ^ include/hw/core/cpu.h:82:5: note: expanded from macro 'OBJECT_DECLARE_CPU= _TYPE' OBJECT_DECLARE_TYPE(ArchCPU, CpuClassType, CPU_MODULE_OBJ_NAME); ^ include/qom/object.h:237:5: note: expanded from macro 'OBJECT_DECLARE_TYP= E' G_DEFINE_AUTOPTR_CLEANUP_FUNC(InstanceType, object_unref) \ ^ /usr/include/glib-2.0/glib/gmacros.h:1371:3: note: expanded from macro 'G= _DEFINE_AUTOPTR_CLEANUP_FUNC' _GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS(TypeName, TypeName, func) ^ /usr/include/glib-2.0/glib/gmacros.h:1354:36: note: expanded from macro '= _GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS' static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName= ) (TypeName *_ptr) \ ^ /usr/include/glib-2.0/glib/gmacros.h:1338:49: note: expanded from macro '= _GLIB_AUTOPTR_CLEAR_FUNC_NAME' #define _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) glib_autoptr_clear_##Type= Name ^ :54:1: note: expanded from here glib_autoptr_clear_ArchCPU ^ target/mips/cpu-qom.h:30:1: note: previous definition is here OBJECT_DECLARE_CPU_TYPE(MIPS32CPU, MIPSCPUClass, MIPS32_CPU) ^ Avoid that problem by expanding the OBJECT_DECLARE_TYPE() macro within OBJECT_DECLARE_CPU_TYPE(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Richard Henderson Reviewed-by: Anton Johansson --- include/hw/core/cpu.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 5d11d26556a..01e03f267cc 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -82,7 +82,12 @@ DECLARE_CLASS_CHECKERS(CPUClass, CPU, */ #define OBJECT_DECLARE_CPU_TYPE(CpuInstanceType, CpuClassType, CPU_MODULE_= OBJ_NAME) \ typedef struct ArchCPU CpuInstanceType; \ - OBJECT_DECLARE_TYPE(ArchCPU, CpuClassType, CPU_MODULE_OBJ_NAME); + typedef struct CpuClassType CpuClassType; \ + \ + G_DEFINE_AUTOPTR_CLEANUP_FUNC(CpuInstanceType, object_unref) \ + \ + DECLARE_OBJ_CHECKERS(CpuInstanceType, CpuClassType, \ + CPU_MODULE_OBJ_NAME, TYPE_##CPU_MODULE_OBJ_NAME) =20 typedef struct CPUWatchpoint CPUWatchpoint; =20 --=20 2.47.1 From nobody Wed Apr 2 13:32:04 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=1742917316; cv=none; d=zohomail.com; s=zohoarc; b=SjyNILbb4gZb6qWjb23RKqD24ihf0ttL2qUdsnqGQLzJyGlf+KsXRCMLtgjj3EAp4hqtpi+uS5zjvkpgao8jhC7pCz8n35Gx9gorCAX9Y6EfcMRUj5+O5CKeXYzpiNEBl4JnepqbTYNWskSvngV/xcpB0bgjjve1D6ccjDjR3kw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742917316; 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=B9EcvePMMiziHxvQ+1Uv0hWd3cavq64til709QLPVTs=; b=m5GDcRKuFGmteL1A42izm6noM6/I4SnJv46y2XJhPQgH3ACP65F+w4xuWEZ4HuYfhdBqwIwPYcecohlCAjMjH85mBND+dKd8mV7M8feYiltuadLUy7DCSw4/n1uXmQSYujuzQjWBkEYuJyLsi7hx57wgGFimRgymN7mXtrv6Bnc= 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 1742917316634103.91023237139007; Tue, 25 Mar 2025 08:41:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tx6P0-0003oe-PT; Tue, 25 Mar 2025 11:41:19 -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 1tx6Oy-0003o2-4x for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:16 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tx6Ou-00046l-FL for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:15 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so53877155e9.3 for ; Tue, 25 Mar 2025 08:41: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 ffacd0b85a97d-3997f9955c0sm13861946f8f.3.2025.03.25.08.41.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Mar 2025 08:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742917270; x=1743522070; 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=B9EcvePMMiziHxvQ+1Uv0hWd3cavq64til709QLPVTs=; b=Gt4d5ZxdsOyWr5a01vlFwq9CFfwHxjTGoDXCLshNR2/whoLCc4pKLLOUs+zrDl1Aa2 AkbyLhd305lpxVoyeYazb9C0I2SNUnuh0zmIvii/kVNkbhGiRx/tCCcBWP6yPNfkJAuW 4zc/cmi9tXnMBRRIMxMQnusX0xo1NbyIaX+8B19GrPgU7kDIi7MqnLmBB+R4ToHaDmn9 6jrIHWlsyf0sr8OCWv/kXcxIzY9l3lx5NGacS8JD8LnmBFzGmqV3fKelOAwzw4ssaza1 267RMHMht7sgQIlKKBx3E8pxM1Zlo1xpCYXuGCXnb5Fp4eKfQcqFJIM6ozvrgHUqHFRx qEDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917270; x=1743522070; 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=B9EcvePMMiziHxvQ+1Uv0hWd3cavq64til709QLPVTs=; b=ne+AKGyjAktMHpK+dPfOL9GtI9nrZ0RPW1TmmM3MYE71pvRzLqdbO+J88Blm/6x1wa LEdbkMTIlH1ffT71jbeHqNiRlpMa0aFxF4S9KDApAjSjpimmeU71ljSQBUTAJdT5XoEq vOOEd/s3nuy5ESIizYsdF9HGmYy8abDECobbzRcsvo/s2mSAG054Ne6w98XzBq4o1l4m 9ro9cbg2be95F9128Udk3MayVQTV5JPYOXlHZT8tSreUNSW0k79o1PxE+wsyQd2hqNI5 psYRX2MEcnju7r6keSv7el8U0Xsa2C90aIfEaugMaV4zzmJOS30tdlv3hAPxw8hrWD9R HnPA== X-Gm-Message-State: AOJu0YyUIccSL1zl0ZAnidbJVM4eKgTexz9tRghJDerjdb8dxn0cj5Fr TOCqQhI95+Qmlh1CGRropwXmd9HUIcvc74sMOOzs0XHBsl1CMiOTpjqmMXy5r5E66E4PXuIL5MK 8 X-Gm-Gg: ASbGncvUB/a+y/tnDyYah6msT52NCnGaLkMDDl7vqV3lXSxE3i3nY2CVXOoxxsCY5Um wOjasAhJ6WbJ3SCZjT8/5eN2yIrjkIoE1FXEgQdE58HKLEEo6R0Kp170CxkTN+2m57ZrZhseSWq ig9XYVH2lJoKxO0hoBZDPKOSAgj0Njk8DJFVaUU6lgb3c6CQluHGM/P+D8sbLj3PNGz4GqOA2Gu sDruj/514l/kZtfEtdoPJr5eTQpzdUrI0kfR/MEE1yZ/OCPaEoZdz5j2wlR9vbEPdW4R8i1dDIh tqyzuHQ0/y/DhS4AtunK15dbBOBsnhH0BfV7jUM84MQiyqXU9EY3v4uz2QuanzGTgWNEkvW2QKS VqV4JIDq1eO0cd+dXQ9g= X-Google-Smtp-Source: AGHT+IFVn8V1/KX8LHz5TKfTH3Bq1V1p3NnDxQEWWA7VWJ3gnAhAlsXB06IaaBMapFZmlBoN0CetNw== X-Received: by 2002:a05:6000:4188:b0:391:487f:27e7 with SMTP id ffacd0b85a97d-3997f947b9dmr11810016f8f.55.1742917270166; Tue, 25 Mar 2025 08:41:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Pierrick Bouvier , Zhao Liu , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Anton Johansson , Richard Henderson Subject: [PATCH-for-10.1 2/8] target/mips: Declare CPU QOM types using DEFINE_TYPES() macro Date: Tue, 25 Mar 2025 16:40:52 +0100 Message-ID: <20250325154058.92735-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250325154058.92735-1-philmd@linaro.org> References: <20250325154058.92735-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::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1742917319015019100 When multiple QOM types are registered in the same file, it is simpler to use the the DEFINE_TYPES() macro. In particular because type array declared with such macro are easier to review. In few commits we are going to add more types, so replace the type_register_static() to ease further reviews. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/mips/cpu.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index b207106dd79..097554fd8ae 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -597,17 +597,21 @@ static void mips_cpu_class_init(ObjectClass *c, void = *data) #endif /* CONFIG_TCG */ } =20 -static const TypeInfo mips_cpu_type_info =3D { - .name =3D TYPE_MIPS_CPU, - .parent =3D TYPE_CPU, - .instance_size =3D sizeof(MIPSCPU), - .instance_align =3D __alignof(MIPSCPU), - .instance_init =3D mips_cpu_initfn, - .abstract =3D true, - .class_size =3D sizeof(MIPSCPUClass), - .class_init =3D mips_cpu_class_init, +static const TypeInfo mips_cpu_types[] =3D { + { + .name =3D TYPE_MIPS_CPU, + .parent =3D TYPE_CPU, + .instance_size =3D sizeof(MIPSCPU), + .instance_align =3D __alignof(MIPSCPU), + .instance_init =3D mips_cpu_initfn, + .abstract =3D true, + .class_size =3D sizeof(MIPSCPUClass), + .class_init =3D mips_cpu_class_init, + } }; =20 +DEFINE_TYPES(mips_cpu_types) + static void mips_cpu_cpudef_class_init(ObjectClass *oc, void *data) { MIPSCPUClass *mcc =3D MIPS_CPU_CLASS(oc); @@ -632,7 +636,6 @@ static void mips_cpu_register_types(void) { int i; =20 - type_register_static(&mips_cpu_type_info); for (i =3D 0; i < mips_defs_number; i++) { mips_register_cpudef_type(&mips_defs[i]); } --=20 2.47.1 From nobody Wed Apr 2 13:32:04 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=1742917317; cv=none; d=zohomail.com; s=zohoarc; b=X0M1mZACGD2bJu9TkLM+UlgeJ3grKcbR7L+/1Wkki3W6diC7UbROzJXw0c8ETTVfbIeQgdsuyggf9W+FySLsEOfm4qZZ1B1yvJrQ/VTeU9jRFOYxAgCGuI60zj29D6IKyjUv52aPMMBq8K9KT6gjui+qK8cFiJszDuMAvF0cWpw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742917317; 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=mMYSIVb6yc31rz11SHW4h4aNXQhfD5IK5ryBRxbffZQ=; b=FL810kvXZLlDvk/dzU84YMplPREe0Aj4h7SJIRr8qjqFIDA1t1GKB6DM4t+wRqFbCQZ7V2D/bK9TdEB6YKK95ZMHZii5vdCzHBOK3cwUpvxpEindtpcJzWLakh9BlUOtHOwkGcYyq2jfGVkF8ES6Nvb3AFK3geOUhnCdsDfCXj0= 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 1742917317304968.4888932458648; Tue, 25 Mar 2025 08:41:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tx6P5-0003ps-O9; Tue, 25 Mar 2025 11:41:24 -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 1tx6P0-0003om-Ss for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:19 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tx6Oz-00047A-0S for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:18 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-38f2f391864so3455279f8f.3 for ; Tue, 25 Mar 2025 08:41: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 5b1f17b1804b1-43d6eab9d0fsm16161625e9.1.2025.03.25.08.41.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Mar 2025 08:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742917275; x=1743522075; 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=mMYSIVb6yc31rz11SHW4h4aNXQhfD5IK5ryBRxbffZQ=; b=p+j1ZCDeFDXspfYMjvtXOyr2h97Qtd6ut45AgLHao5obGJ9Z7J2ieql4lptLT1WToi nJwj71MDj5yi8vMs3MRDztJp+TExZkX9tdFR6PVGq1/26b6uLnGY6DKjLtlOQjp4Uerl n8aW/gQFIr6MA5sj0jqVXYCVmaicgLlQk1vjwY1G5Uim3NHq+m9MUpgRgSzI77IeJmgB EuDzv/nQdrhdHbqyKvtUyBR95Hea9n59zTyisImjBqCH/98s7KT7Q8bN8FeFMNuLzEoB 6V3clL9uqy/jSVHoCSIeiNfk8IfO3cROTClgRDv3+zqFAmHcgFO30FKOYHWDssdT02Jb BjUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917275; x=1743522075; 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=mMYSIVb6yc31rz11SHW4h4aNXQhfD5IK5ryBRxbffZQ=; b=DLyRSI4Y6zOqyDwyrhaFemv3jqVAIKRA9w2SLzI5I8aiDtQc/CzZAY63Iz9H3obHY+ 0C2fQkpz17IcXEP6//4FZL+dj8wGFtlb6PLFzj3w5rewPVZPPFNXJ+2E/ZguIwxU29fX BdEIXhrl+V0bhX5/0r81ZCSPULRxzzfIdtEsVus4VLhPtikp1Rf6Q/BEdI0i/bVnZ//x Ip3z/T13P9CH7gVuNJj8yEDnjIxEOVi5jZ0RjNPiYA2vKC8Q8gmNlo77MsXP9PYHLV46 TgkjK2pQO4gjQ0568A0JQynfRaQVdl9w2eH7wNQqJSOggc3R9NwA+d2UUc4oejLdxnPT z3+g== X-Gm-Message-State: AOJu0Yy6SUwqGIWJMx/UmTvVZfLh3an1vFKpT0nKYxM3xd6zEvD6yZyD RQOvxKhb7lIHGIpaJQGFXoNOblU3QgKI65DwiiGcyIUefWgs8JDDL5ukqD55d/nTcn8kZk+M8xl q X-Gm-Gg: ASbGncsDU83aKTsjq2qMIJjVt+pr5BPck77oaZy/cw6aVQDDmMS1zCQ8FVzkYHEt/0j mm4ZcNU2de2rfPk81YHQMH5CvGFu1TiGt85Ps4Rbb/QOKt4y9JivaTPGskrh+k7qAcv7iczOs8T ubLP+bZrLCQQIXc+v3x3zQzV/JmYxZlf/DXpQul+VJdJtLcoVrC0up8nTswx1UObrU/es6N+R17 dJznnqCvY3PnbBl/oSOqzRto/K3SDmkLjNaM6++UY24PxOpK0aleHflTBILxbfvLcGMZivbwYhG uxizdngEMmPwS9M1amHgTFYtA1uahrzs9LL3KV6ptY2kH+0Aa4Yt3821m1KuKdIo2yad/MweUVj 4B1/m/gCas4RRL14UbKk= X-Google-Smtp-Source: AGHT+IGr/+G8hLgLiPRsAV6eVxAjpPCfHdtZUqdYh8qoYfJdWXswrLjL38I6OUf8jQ/RpkIzSOt27A== X-Received: by 2002:a5d:47a4:0:b0:39a:ca40:7bfb with SMTP id ffacd0b85a97d-39aca407e6dmr1866909f8f.54.1742917274899; Tue, 25 Mar 2025 08:41:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Pierrick Bouvier , Zhao Liu , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Anton Johansson Subject: [PATCH-for-10.1 3/8] target/mips: Make MIPS_CPU common to new MIPS32_CPU / MIPS64_CPU types Date: Tue, 25 Mar 2025 16:40:53 +0100 Message-ID: <20250325154058.92735-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250325154058.92735-1-philmd@linaro.org> References: <20250325154058.92735-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::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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: 1742917319787019100 "target/foo/cpu-qom.h" can not use any target specific definitions. Currently "target/mips/cpu-qom.h" defines TYPE_MIPS_CPU depending on the mips(32)/mips64 build type. This doesn't scale in a heterogeneous context where we need to access both types concurrently. In order to do that, introduce the new MIPS32_CPU / MIPS64_CPU types, both inheriting a common TYPE_MIPS_CPU base type. Keep the current CPU types registered in mips_register_cpudef_type() as 32 or 64-bit, but instead of depending on the binary built being targeting 32/64-bit, check whether the CPU is 64-bit by looking at the CPU_MIPS64 bit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/mips/cpu-qom.h | 12 ++++++------ target/mips/cpu.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/target/mips/cpu-qom.h b/target/mips/cpu-qom.h index 0eea2a2598e..9acf647420c 100644 --- a/target/mips/cpu-qom.h +++ b/target/mips/cpu-qom.h @@ -1,5 +1,5 @@ /* - * QEMU MIPS CPU + * QEMU MIPS CPU QOM header (target agnostic) * * Copyright (c) 2012 SUSE LINUX Products GmbH * @@ -22,12 +22,12 @@ =20 #include "hw/core/cpu.h" =20 -#ifdef TARGET_MIPS64 -#define TYPE_MIPS_CPU "mips64-cpu" -#else -#define TYPE_MIPS_CPU "mips-cpu" -#endif +#define TYPE_MIPS32_CPU "mips32-cpu" +#define TYPE_MIPS64_CPU "mips64-cpu" +#define TYPE_MIPS_CPU "mips-cpu" =20 +OBJECT_DECLARE_CPU_TYPE(MIPS32CPU, MIPSCPUClass, MIPS32_CPU) +OBJECT_DECLARE_CPU_TYPE(MIPS64CPU, MIPSCPUClass, MIPS64_CPU) OBJECT_DECLARE_CPU_TYPE(MIPSCPU, MIPSCPUClass, MIPS_CPU) =20 #define MIPS_CPU_TYPE_SUFFIX "-" TYPE_MIPS_CPU diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 097554fd8ae..5ed6b3402d3 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -607,6 +607,14 @@ static const TypeInfo mips_cpu_types[] =3D { .abstract =3D true, .class_size =3D sizeof(MIPSCPUClass), .class_init =3D mips_cpu_class_init, + }, { + .name =3D TYPE_MIPS32_CPU, + .parent =3D TYPE_MIPS_CPU, + .abstract =3D true, + }, { + .name =3D TYPE_MIPS64_CPU, + .parent =3D TYPE_MIPS_CPU, + .abstract =3D true, } }; =20 @@ -623,7 +631,8 @@ static void mips_register_cpudef_type(const struct mips= _def_t *def) char *typename =3D mips_cpu_type_name(def->name); TypeInfo ti =3D { .name =3D typename, - .parent =3D TYPE_MIPS_CPU, + .parent =3D def->insn_flags & CPU_MIPS64 + ? TYPE_MIPS64_CPU : TYPE_MIPS32_CPU, .class_init =3D mips_cpu_cpudef_class_init, .class_data =3D (void *)def, }; --=20 2.47.1 From nobody Wed Apr 2 13:32:04 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=1742917390; cv=none; d=zohomail.com; s=zohoarc; b=XsOV1WN+1qIx0NNGOPoVRMEahcttwHxq6lGcJyP8yrV+UzhFqgrWGTiGjjfHMcdpUk048vSEllN4KTvMS9JiVCjBWHZuEQv2cayro2Leb9qudaDYhlh4MzksuN7nlcd02cHZa2LOLSrC3L44ddwfbDcutKiXkrjCgmaad6s6DsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742917390; 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=LLYIE82ADpP9MMv3tzyn92JCIJn6rh3Qqe+NEpTBgls=; b=fpRSA3Yfg4soTHKR201YqWIAmTzLkswd3WDhRcjhEvSs7sIbwEi9GhxCXfkHH8Dkdfo7na217w1SkNi6ZUI95EHKjMCXBygtMGL7ERjVJguR8hUZH3K8rO0Y8DLR9d3YjyykCppYvHX58F1IPTmCo6bUlTKMsSK1AkWRjFJhJn0= 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 1742917390027545.478768012956; Tue, 25 Mar 2025 08:43:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tx6PA-0003rT-AT; Tue, 25 Mar 2025 11:41:28 -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 1tx6P7-0003qm-3v for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:25 -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 1tx6P3-00047w-P3 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:24 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so53879235e9.3 for ; Tue, 25 Mar 2025 08:41: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 ffacd0b85a97d-3997f9ef098sm13767225f8f.84.2025.03.25.08.41.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Mar 2025 08:41:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742917280; x=1743522080; 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=LLYIE82ADpP9MMv3tzyn92JCIJn6rh3Qqe+NEpTBgls=; b=mLzcgHjimvDBBfsB8XrcP7/rupcg1tde2k/DjvMh7/813fK188SYe5uYQbLiQr1w9b rGlbPyH4/DbtdYP5ohbrvSMdy0JBpmjFyOxqXly0EftIl1iGvr8eVSpiWn66xrdT/LSB o+LI1/3T65HyejSLumjhT8/XdEX5jgpaA8TIsHitG+dfaJOnM7oeOjbqy8QVVaBTgMF5 mVNwM0bJmY3stFszSJFMwioBcMRUhwiJzUpcO4GqkmSFcOXT2w1hnDTiubdfT5fiasPN N4takroXKdZRk6KQ4GJoE2AhRLvvwIhDMzFfxS8qJA8RdQzaqphXr9JDdwFg6qJdbLxM tLKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917280; x=1743522080; 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=LLYIE82ADpP9MMv3tzyn92JCIJn6rh3Qqe+NEpTBgls=; b=w+3654M6sF7AI/JkqDINTzQzMa92AyVYpH8vH2VLb6YoqUz9YD1OjCGvLOQMci0dvL R103H53qJPGjSDthhEzPALvM7KieRdQbM2hNZEVd5vvbhch851nZTvNkDogqPxrJhYOB A2t1olus+5mNizPqQru600W5zigLIjTKDGOS1VvZbRre8bkxSfUoHGR3Zo+Lu76RiDBk SBWJpSWcAMBZBNNL89P8t+LnIg0e9xkTbzHbNyACtvwu5NTeB97bUrv+Y1ObyL01ImtF umZQdRIlIbRBLiGwowg8/zYBbQRg7P9nSe74eBYdguyt9tqnlCcTDOl8LnTVugRJRFVw +lrA== X-Gm-Message-State: AOJu0Yw3HhjiYZ2KtqtXiwXPm/I22y3+zmgekSOUWnVUIyg9X+5EG4xI rPGgkaaiZj0W6GB3Vfr4KE7n8zXvdXS497YXKmDBixwz1qOlkaZRH8MKZJkXieS8T4PbTBDT0KU r X-Gm-Gg: ASbGncvYbG3Q0oFGEjVKtuvvxx5idEqfSirzj3YaAsRI//CfrBAbmBLuKE4G27fWp0h 9CMyGjd5yb/DG1EQ88z37tXVHZJg2MkBA+VSmLf/B4Tm0IztwhBztMigOuGz2Aby6CMgGu63LHw JwBq5BEyn4Fr0/shNXDvCuEC2yBOdJjVmI5vmG/JIgDxSkDrVhIwffLG+dAnPwZl0S+X8cscSxg ZQ5akYQWQ7EqcGwImMq7eBGE/onEd04RftUXAytN1D1fol1OVbDl/bNk75M7Ir9ycTt2/KZsfqI bKM8tdzcj7kJt+2XiTk97NFPUyEvCdw5m7CDEc8t8hBbW2MbJL87KnV8nOkNvB6Db2+ZHrzhFxE 4zC00RA22DRZSBqNJTwTg71uj+JrZJA== X-Google-Smtp-Source: AGHT+IGSHgYzV8FIt/jQwdeaOtOswtV83eIQS4NoWVpi1HUv8C8xKZUmmLo5OqkIJB7OBDDUqywmQA== X-Received: by 2002:a05:600c:3c9e:b0:439:9424:1b70 with SMTP id 5b1f17b1804b1-43d50a4f8camr173393095e9.30.1742917279777; Tue, 25 Mar 2025 08:41:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Pierrick Bouvier , Zhao Liu , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Anton Johansson Subject: [PATCH-for-10.1 4/8] target/mips: Prefix MMU API with 'mips_' Date: Tue, 25 Mar 2025 16:40:54 +0100 Message-ID: <20250325154058.92735-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250325154058.92735-1-philmd@linaro.org> References: <20250325154058.92735-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: 1742917391507019000 MIPS MMU API declared in tcg-internal.h has public linkage. In order to avoid name clashing with other targets, prefix the API with 'mips_'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/mips/tcg/tcg-internal.h | 2 +- target/mips/cpu.c | 2 +- target/mips/tcg/system/tlb_helper.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/mips/tcg/tcg-internal.h b/target/mips/tcg/tcg-internal.h index 74fc1309a71..a8bf2a5da40 100644 --- a/target/mips/tcg/tcg-internal.h +++ b/target/mips/tcg/tcg-internal.h @@ -45,7 +45,7 @@ void do_raise_exception(CPUMIPSState *env, void mips_cpu_do_interrupt(CPUState *cpu); bool mips_cpu_exec_interrupt(CPUState *cpu, int int_req); =20 -void mmu_init(CPUMIPSState *env, const mips_def_t *def); +void mips_mmu_init(CPUMIPSState *env, const mips_def_t *def); =20 void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagema= sk); =20 diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 5ed6b3402d3..d8930468b7d 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -485,7 +485,7 @@ static void mips_cpu_realizefn(DeviceState *dev, Error = **errp) env->exception_base =3D (int32_t)0xBFC00000; =20 #if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) - mmu_init(env, env->cpu_model); + mips_mmu_init(env, env->cpu_model); #endif fpu_init(env, env->cpu_model); mvp_init(env); diff --git a/target/mips/tcg/system/tlb_helper.c b/target/mips/tcg/system/t= lb_helper.c index ca4d6b27bc9..1ef2c32cfd4 100644 --- a/target/mips/tcg/system/tlb_helper.c +++ b/target/mips/tcg/system/tlb_helper.c @@ -466,7 +466,7 @@ static void r4k_mmu_init(CPUMIPSState *env, const mips_= def_t *def) env->tlb->helper_tlbinvf =3D r4k_helper_tlbinvf; } =20 -void mmu_init(CPUMIPSState *env, const mips_def_t *def) +void mips_mmu_init(CPUMIPSState *env, const mips_def_t *def) { env->tlb =3D g_malloc0(sizeof(CPUMIPSTLBContext)); =20 --=20 2.47.1 From nobody Wed Apr 2 13:32:04 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=1742917333; cv=none; d=zohomail.com; s=zohoarc; b=VT70m+ouSmNmaTG5dCJ5HTfA6MVPcdoqf5A6kFmpRWgsN6nTBUOm0hquxclNT205O3vz73VVx1X+hxDqFa2w+P3tgJFO/qSGRPD/uchPVz0UD7YNSApklXFbZAUYmOqiR2oC3cSLvcRtDqHLhStaXiw8EhuxvSQurYlRtjlB+3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742917333; 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=PPypTK7DZGi7uNZ8Ij2igQ+CirZnbkfROskeOnb68NU=; b=YEX8Z0d2mnJbGeLx2fm0xf9fxx8I6dGpw4aHjzwJzyTQWJngMmfG3f28wksPn0w4CWVzRvFrfgth5rxGDUbmb1SzxcJPW6mYJGgtnIefFHa6KJ/t9lf5CdzEMKum1EZuunLqkdrE354MBtwfHtIFIYzMqZSb6xQrpfOuxCC8oLc= 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 1742917333482910.5533284652038; Tue, 25 Mar 2025 08:42:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tx6PC-0003sa-NP; Tue, 25 Mar 2025 11:41:30 -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 1tx6PA-0003s8-Px for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:28 -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 1tx6P8-00048U-Om for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:28 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43cfecdd8b2so46383495e9.2 for ; Tue, 25 Mar 2025 08:41:26 -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-3997f9b5536sm14446174f8f.54.2025.03.25.08.41.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Mar 2025 08:41:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742917284; x=1743522084; 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=PPypTK7DZGi7uNZ8Ij2igQ+CirZnbkfROskeOnb68NU=; b=S+ORs9rg2XWpTxy7tyiJcQQbDL9MeYPGgYjYdTNOSr70f03LeJCtciP4CWj7ap3je3 /aTZIDPR08XEZ3E+Ga/JUZ1+3w+3O2+5EIVZ0Ln7cku3y0Eem46PKYwM31ifvQtdZD1P MoyTOq947M264azIASlHZcUti27JUJle7SpZ5W2T23vnh15oFg1kR0WWWiFM7M8rEZHr uLlyDZYMvBLYYMhxfFLj0H8xS35eWSmzvwYThe/82BDRzzsr1kdB3cDG7GO8yC5249EU 5GveCEQskVppX3bsoAdoOmFmHm+cU+4B6d97KpPQ/CBqYZvE8BofvwrA7V2jVUX2jCQx PG5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917284; x=1743522084; 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=PPypTK7DZGi7uNZ8Ij2igQ+CirZnbkfROskeOnb68NU=; b=EWLL14uWMliLWY7nJzXN+tWMc8a82nFocyNMiWyeaCLU9Umlzpekl32ZtokMXXJrZe 9zMi7KQl1IIct74ZsPUigmq78yGydyQdbT0pB5wFRkMD0hm8rJ8CMDSKS2XJoXZwqe4O EfRsNeKkgmtretALKyGo/jZWkwQx6WFGwIj6F92EJIgFT15xO947FVRmogArWmUznt8W 21IkUEgOZKh1LwjvOpNdxok7ZPM+x4gVVMJ1YONP7r0j6DG2e+1Cf/zypouKqY9nIneD 7BmN3UWan/nfO4SVdGmSijPh6fLyJ+1RcwZpDw3U+qz6CqA8U7FmDlaKr4jSGD/ne4qt BmxA== X-Gm-Message-State: AOJu0YzJ0P88URSkpt0afR1HkMy+eyAt5EOBMn9hZhE8rNTJr3MrYpqs sdAb2q3GCswNAHLlKarz4E5oKDsdskyZSYfZwEMRS4e4qsm891h2fEK4B55H68UXAIqDNZAqKzp F X-Gm-Gg: ASbGnct2FCZjhc1E5Y3jIIuiVj/Kxvh6sg87KLZ2GzUsHv3d9ZrElRcOwmKSuWdli2x fAJPRfCJqJelZSR0J0C3kzT6WR9zxHQY+wadPtt2YAP1MWKXPq4N39VUMLU4AJTDCShivJNbW5t rbJ77oIpSfzRWSCA5u0pxjldesyOMwfxAt91sXln8sO0FCp64mTWifT1k3TPdtzdfHpYilb6XTp qslHqXU2zRymXtDd6SmHVQ0aGAGtjtkf2dpuXp2SPq7W78ZHmkRlyUPAn5s2F8H84jAl9RESmQq OK2wGXDWtNrbqinbYGvi+JIsrG7qwk1PUjbKFg5XjzoHee5A7B+T6NKGCLZA0lTNxAXN9qjjT/f 7cKMEb+QRo/dbiRTGrBs= X-Google-Smtp-Source: AGHT+IENHykQe0Le4bc1bmt9DfBs0fWzqY97k06UokFYP63TysbJyBIT8gShUgk5TiBMVztUEdMnog== X-Received: by 2002:a05:600c:1d9f:b0:43c:eeee:b713 with SMTP id 5b1f17b1804b1-43d50a201a9mr169708175e9.20.1742917284586; Tue, 25 Mar 2025 08:41:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Pierrick Bouvier , Zhao Liu , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Anton Johansson Subject: [PATCH-for-10.1 5/8] target/mips: Replace ldtul_p() -> ldn_p(sizeof(target_ulong)) Date: Tue, 25 Mar 2025 16:40:55 +0100 Message-ID: <20250325154058.92735-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250325154058.92735-1-philmd@linaro.org> References: <20250325154058.92735-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: 1742917335716019100 Replace the single ldtul_p() call by a generic ldn_p() one. No logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/mips/gdbstub.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/mips/gdbstub.c b/target/mips/gdbstub.c index 169d47416a6..b9fc667373e 100644 --- a/target/mips/gdbstub.c +++ b/target/mips/gdbstub.c @@ -79,12 +79,13 @@ int mips_cpu_gdb_write_register(CPUState *cs, uint8_t *= mem_buf, int n) { CPUMIPSState *env =3D cpu_env(cs); target_ulong tmp; + size_t regsize =3D sizeof(tmp); =20 - tmp =3D ldtul_p(mem_buf); + tmp =3D ldn_p(mem_buf, regsize); =20 if (n < 32) { env->active_tc.gpr[n] =3D tmp; - return sizeof(target_ulong); + return regsize; } if (env->CP0_Config1 & (1 << CP0C1_FP) && n >=3D 38 && n < 72) { switch (n) { @@ -104,7 +105,7 @@ int mips_cpu_gdb_write_register(CPUState *cs, uint8_t *= mem_buf, int n) } break; } - return sizeof(target_ulong); + return regsize; } switch (n) { case 32: @@ -144,5 +145,5 @@ int mips_cpu_gdb_write_register(CPUState *cs, uint8_t *= mem_buf, int n) break; } =20 - return sizeof(target_ulong); + return regsize; } --=20 2.47.1 From nobody Wed Apr 2 13:32:04 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=1742917316; cv=none; d=zohomail.com; s=zohoarc; b=R4aPhhAwmye7DeWOPmwOMbTNABI2Tn+ri0ud/5JTWoi9BqVuRxw/FhaDfTyy6+gZ019S8Nn9Ll9j+MP+BqjJhLfxbFHgeJyvzar/DJtlY8O7TPoI8w+EgNdw6m9v7r1jVIk2yJvamlr1oFJd++IFAkCFgSVLg5bfrxTZLRL/0Y4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742917316; 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=lbsjfiae9VyxIEcsSbXzqvelTNR2Rg0DAwfeG/N1/LM=; b=TlvfuY7SiRMlJRNYw0LXape74jtMVKjSAQFIkhRYhzcfg8wv2qsfUodR76nMk+k6mesNsxALg7bH4nMj059CeG2IHVCr0VqjnFKQDW8/Gs0mi3Jvnov687lcM/FrwkPEMOzn7akhSTkG6VG5XtF8ogpht7zBNtXKjTOXzkzHH10= 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 1742917316694663.5236444390595; Tue, 25 Mar 2025 08:41:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tx6PF-0003tj-P2; Tue, 25 Mar 2025 11:41:34 -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 1tx6PF-0003tX-0c for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:33 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tx6PD-00049W-9m for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:32 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43d0359b1fcso36567505e9.0 for ; Tue, 25 Mar 2025 08:41:30 -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-3997f9b4ce9sm14213513f8f.53.2025.03.25.08.41.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Mar 2025 08:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742917289; x=1743522089; 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=lbsjfiae9VyxIEcsSbXzqvelTNR2Rg0DAwfeG/N1/LM=; b=uv0ogjUGV2YGEVr+J+xmvqKVXylDPitAqr1iLAsFGIuVbw07UIsUurGzA8g3z1r0kF R7Ux/rX38+j2tFGFDa2rCyzbndaub3rhxul4+UANuIY6+JcfE+t4HwJoqG2RX71wvFKN MOZ2NdY6jsb9VBO8jElaM0xXviSTqzkssq1d69VVLcdvrkiLPdg/dVmotr+rp5MThiLp 9c6W0kTZD4t4HQoFnuuutrMTdQ4UA+Z2ftECtLTAq9ZUIVjZVbMF5umIGYUcn09oXN21 vZf8zLVm5rFGZkum66hAGXdSDNlDrk4+6QJgwpMoPBs4P211FAdBJ+1OJnGvIQSlRRmW xxCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917289; x=1743522089; 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=lbsjfiae9VyxIEcsSbXzqvelTNR2Rg0DAwfeG/N1/LM=; b=h86HpQKLsYqH4Wsn28ux0Jmo7hVzI5ew1F/vXNOP0YKxNkfZotaivh1UPmUSHCuVjf xsKaelvuxn7U+E6vPenbIhEBi4cXZpr/EoaMMKZl8ltZgxVPXRu2FzzhGYzBr+oHJdev 3D+cPTtpSDK5KgmaqkH/z5sjlWoumEFo2HR2zsDwmg6r6XGi3PQ1UiIQ/ccBhprTLj7N vowpvC8wnP8VCwuHbWotwWdMocaXWtrIrtb1+KTj+44gk/pW5rRtbMlAK5Isn8Dv3MCi bYkDHaPJZ77zRwc9D2ESKX7kFmXEFJIqO9b1YQPO5DDfFEsIeSXcV4t14Iu7X6+pFpp3 OcGQ== X-Gm-Message-State: AOJu0YyIKIC72cT5Hq0ONaqV7xwA73okfePryqIq2srZ01Tmaj5D0fFz NQnH/9NAyxwuHOQ0whB7OFmH+p9WYwSa3P0atR+J4Cq72Z7AmA6DRyT89r2E8v3hphH6wRa5s9n g X-Gm-Gg: ASbGncvuB4+a4Eslgk6W1fueqRa9QjT7TZmZD875MZDBPW3dpnshGW2nYZq2064v/8l MIYJQ4Vfza1AlamVMETTrKHCPGbXcczyi7F+82GLiqEzUeFfvRiBKYK6hhJGl49lWuVKqXExaA+ jPe9qLnzhdniwp/NFsbc+WyHvWIGgnKUHz3IgmM5KImNgQDG2YDVnor3mY3VbnhxtnqvOecyva0 0PyhRH/idLJc+/H/5w2ghZcWIsnuYpM5gyE3aAtMtbBTEVMu7DVsnIE0W9nOy4UaQfYeS8YoJ6U xHbA6u9pBpU8gN6BhQBF566+6GDgfdsK5BdnBtLycZpCaUUZLYfIMyZwornkBpUj//8AphfKjFw lQPeQpSNqF7xVI+kM8ng= X-Google-Smtp-Source: AGHT+IGzrJZT8OMx1lcnFFHIzm46ghGtZisQBO1aoJGnup+W4UKLnn8r8P8qr+Kq5QmjjZTw16tr1g== X-Received: by 2002:a05:600c:1c1f:b0:439:9737:675b with SMTP id 5b1f17b1804b1-43d775fad8emr3318805e9.7.1742917289277; Tue, 25 Mar 2025 08:41:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Pierrick Bouvier , Zhao Liu , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Anton Johansson Subject: [PATCH-for-10.1 6/8] target/mips: Introduce mips_cpu_is_64bit() helper Date: Tue, 25 Mar 2025 16:40:56 +0100 Message-ID: <20250325154058.92735-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250325154058.92735-1-philmd@linaro.org> References: <20250325154058.92735-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: 1742917319171019000 mips_cpu_is_64bit() returns whether the CPU is a 32-bit or a 64-bit one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/mips/cpu-qom.h | 2 ++ target/mips/cpu.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/target/mips/cpu-qom.h b/target/mips/cpu-qom.h index 9acf647420c..52996e7c354 100644 --- a/target/mips/cpu-qom.h +++ b/target/mips/cpu-qom.h @@ -33,4 +33,6 @@ OBJECT_DECLARE_CPU_TYPE(MIPSCPU, MIPSCPUClass, MIPS_CPU) #define MIPS_CPU_TYPE_SUFFIX "-" TYPE_MIPS_CPU #define MIPS_CPU_TYPE_NAME(model) model MIPS_CPU_TYPE_SUFFIX =20 +bool mips_cpu_is_64bit(MIPSCPU *cpu); + #endif diff --git a/target/mips/cpu.c b/target/mips/cpu.c index d8930468b7d..05b3ce42af5 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -516,6 +516,12 @@ static void mips_cpu_initfn(Object *obj) #endif } =20 +bool mips_cpu_is_64bit(MIPSCPU *cpu) +{ + return !!object_class_dynamic_cast(OBJECT_CLASS(CPU(cpu)->cc), + TYPE_MIPS64_CPU); +} + static char *mips_cpu_type_name(const char *cpu_model) { return g_strdup_printf(MIPS_CPU_TYPE_NAME("%s"), cpu_model); --=20 2.47.1 From nobody Wed Apr 2 13:32:04 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=1742917354; cv=none; d=zohomail.com; s=zohoarc; b=gPFZkdeHcCnIhJH0L3c4EjrkQ+tFcccJSmaDqG24H2YT0azNWBp7ny8GK7Q3seQNHXnl3KAfjXR1Gz/wNFfDf5ZbfNtbFPYZ1qpyLI4Gd/myKhjvkPxV0ZLlM0HueBuurLBpcETJ/TFrRVSVIdGZ+amQq5ZRPcAMTaNqrBjNsy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742917354; 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=43G6xaQEasg9QNPZtMYOEGymQHF1cxnYCa0rqpPVw3M=; b=jVIKqnKaWmZ/7TcF5NCfuMiRCyMBnS1qiAG9k+9mAIUNyqRskSJmQaeSgzrA0f04D/bqi7Yl50nrAnVjN/XXW/FWBADDQItYc8d18JQxHTyUj3jIxVN95xaQeDr3cTYrzibJisuP1AVLE2QbVma50z7pRb42zvoAHCVCZXjB+Bk= 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 1742917354421703.7821114674322; Tue, 25 Mar 2025 08:42:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tx6PK-0003vK-Uz; Tue, 25 Mar 2025 11:41: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 1tx6PK-0003vC-7R for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:38 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tx6PH-0004AH-Tg for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:37 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43948021a45so50084295e9.1 for ; Tue, 25 Mar 2025 08:41: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 ffacd0b85a97d-3997f9efc9bsm13813579f8f.87.2025.03.25.08.41.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Mar 2025 08:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742917294; x=1743522094; 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=43G6xaQEasg9QNPZtMYOEGymQHF1cxnYCa0rqpPVw3M=; b=PCWXh4dewFoveyQZZ9VkhTZ4gUrbCUUk07sdvjHVh+oaM4hYDYrP9+TisISxd6/03g tau4gRUb4NsxNdJMPBJjidYcXxc29t/aqJefo8ay8ntFIj9isYC/BtQU6x2aocs0/L7M dJItqvfpvg9M2I00P+O3oEp87YRcwQwTVhrnw7oDYb4gKRtPJhUuiOBvwC+Yo2m/ICA+ nD2Q/+0hQH969w3ZRfld66n8o2ZVOyZlt+WNmngBp1ckS95EtqXqIJ/p0dveNK3M2d6P YY0WoilNqo+B29wFICrXIijI8xC7LQ/ZEIQfTpgeL/h2aCaQ9HKohdP3UHmiFVDNqSVs rS9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917294; x=1743522094; 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=43G6xaQEasg9QNPZtMYOEGymQHF1cxnYCa0rqpPVw3M=; b=kR1z/M5H2HjmLZq2uyXgdYWIL+Sego884VKB+TOF6CIbPlHKDzHsLm8astUKbvLMV5 Voi7siO4LqKObJOU/78CbSPsUdUgmdBs4ml7YXZ0vXW6sRfRYc81TbEzW/85xZ9XjNUi gF5VWfD0onKa2vAkloVTU6CwroUN2deAuSsjrkszxgPkZrvzueMSFm2xcruq4s/jypYY w3IQxL4CInVRRQlxq+JB4B5EqJidzH+N9gsViN1HeXmjf0qOuDpIkMGl3ZCoN2JZ873Y MWQaxjtdgBiWVdj9fj0EgRR6q5jVppkgZ9MpizyD9RpMBimyll5D++u0R2ppf8g1i4N9 ESqw== X-Gm-Message-State: AOJu0YzVDAoHjoEM58k85cyI0eymaJ5N+tlvI1bGULhLN1VqwYOiUaim yZ8qxUsP+84XR4cfWAqeS5pFGZY6/L5hgoUU2GfKZUsC1ra7M3GBpt3gQckNrJ/R5GZ4Nj8rjt8 U X-Gm-Gg: ASbGnctuY7YNoY+Auwey9RE399rHXeEjg67GrI/WDSdqAcD/ysckeZ4XlDHGjPQEpEI c1E9H1bi3f1pm8nFV2o2QtHc1OA7uONwpG8i5LX+BSn/lpFIdZafoipp9ccleiLFWXL50YQYl87 MSSXzdiVZYKHSc1Ff76eLy/WslutCpSC65CYQLWqB7SNF7B8k2l9PuKycLUFnFytz91eCqkTXMC diyKiNdiW5yFoCgn5Vc09IBJNmVqRnCERtQRxElx9ugJH2rY7h2BGWCGzqoxF9HmKMbfeFta3Ji 5O2UYmS3N8+O5pVcFPDyeZlFDKDe8+UHQwsheBy8UP7q67uNw20Xaip1oLWuGAI7bA+KNR4qsYD p/j59+BcZKE3wsavYO1U= X-Google-Smtp-Source: AGHT+IEv/no7EQQ27qMSrJSowSSNlar+A0XV6+rr/4VRZfQHIVT3VCLUqd9YdVHs+1WLkyXEFMhw+g== X-Received: by 2002:a05:6000:418a:b0:391:3fa7:bf77 with SMTP id ffacd0b85a97d-3997f9148eemr10819618f8f.31.1742917294073; Tue, 25 Mar 2025 08:41:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Pierrick Bouvier , Zhao Liu , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Anton Johansson Subject: [PATCH-for-10.1 7/8] target/mips: Get CPU register size using mips_cpu_is_64bit() Date: Tue, 25 Mar 2025 16:40:57 +0100 Message-ID: <20250325154058.92735-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250325154058.92735-1-philmd@linaro.org> References: <20250325154058.92735-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: 1742917356259019100 CPU registers size is static and depends on the type of CPU. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/mips/gdbstub.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/mips/gdbstub.c b/target/mips/gdbstub.c index b9fc667373e..84fd3de4137 100644 --- a/target/mips/gdbstub.c +++ b/target/mips/gdbstub.c @@ -75,11 +75,16 @@ int mips_cpu_gdb_read_register(CPUState *cs, GByteArray= *mem_buf, int n) return 0; } =20 +static size_t mips_regsize(MIPSCPU *cpu) +{ + return mips_cpu_is_64bit(cpu) ? sizeof(uint64_t) : sizeof(uint32_t); +} + int mips_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) { CPUMIPSState *env =3D cpu_env(cs); target_ulong tmp; - size_t regsize =3D sizeof(tmp); + size_t regsize =3D mips_regsize(MIPS_CPU(cs)); =20 tmp =3D ldn_p(mem_buf, regsize); =20 --=20 2.47.1 From nobody Wed Apr 2 13:32:04 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=1742917367; cv=none; d=zohomail.com; s=zohoarc; b=SRhtqgNRnVHcLdf2LKdZM4vZSt+htOgoGMdi/bIvrvaCojKIw/HgX76gVQfI8HHWwwkUN6VcOYdV589ntdjMIgrXPKKvcyPpdUWLRzRw+Io6F+IjoAOKZ0TRDK8y756Rag72lpHT/gDDiy0KJScsNeBDc8wPtfLfFbTBiNrzhr4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742917367; 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=Ov0qeNX9YGL0oYdATS3IENK9eMXw/drt5nInE25Olt4=; b=j5uDzE2UoyE7R8fBgL2M0/fYwb3hhVmImMOSsbPLJfUAX23urdas1WBJtjAZiDdI25JHkXuyCALJeDwrySd1RsuvknX7GQnycBnCluk75JMEgj1rGzboc4wIvnh3f20CqMl8plXNoVvWixbCdX0O1we8urKvhVv9Z7Vc+db5Ao4= 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 1742917367555127.47053894746637; Tue, 25 Mar 2025 08:42:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tx6PQ-00044k-Ng; Tue, 25 Mar 2025 11:41:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tx6PO-00043G-Jg for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:42 -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 1tx6PM-0004Ay-VA for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:42 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4394345e4d5so37386375e9.0 for ; Tue, 25 Mar 2025 08:41:40 -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-43d43f556basm203127755e9.17.2025.03.25.08.41.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Mar 2025 08:41:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742917299; x=1743522099; 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=Ov0qeNX9YGL0oYdATS3IENK9eMXw/drt5nInE25Olt4=; b=c7age1ugoBX/TD72LRxXp+RJIyi9Uhs8lMujeRGzYbnfG82uh0fkEmQzpwex3yIdJV TNdwEG37KIQ/hwqHR4mTRWqDwEdpmgat73Oh/648jbBizQnq4V+iyrSpMYA4HHfZ63XB Er5I3N1R/Sc7mYF4JoReqnxRia3Vko8bzdc7bmUbwiMVEqLOjhgYHz2o5v/Hgzk/MBNM bIdUPPB7l7Ed9nK1dMscPoHNFXk6/5vqN5+MqS8LWXdyUk28tSewCeqwAKQEnLTSz5h3 KRsFtP+Oga+7LpgTaxlcAFbeuA480MdV/hpKUnUrg66JGQBt6vf77vP1RGAyJ/spGkQx F7Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917299; x=1743522099; 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=Ov0qeNX9YGL0oYdATS3IENK9eMXw/drt5nInE25Olt4=; b=EiVrUtea9qGM3uWNGwQ6+MulnzcPCUnTw/sWCLFMeLEhyNylHpGugS4y85tg6YH7Tj NDNKghD+3DrfaGmcfALwI0JPeH0G3iVRslO6KelPz1BCZXkbPgAj6hHCcFKupwyr/m9t K1DUO7rmsN6bcMgrJ1yLAnjjvtFiKHdDjQkyDefWGQrMfQDJmKAfwrK45rhYvBV4OFm7 jiZ0AbqnonOhXAG7PgF2wui2A7WMy+90zHBij8OLhHR6SZyED9hCHYNvRfivPWKg57VP JideP1/JgzYMd3aiHmbdrEY3Zx8q46+eNLU01NLGX1aWKusFpQgqWTa9xcbINZS4eXY8 eJeg== X-Gm-Message-State: AOJu0Yyj7VsU+oDjdCThWmibO+LJRzYNQ5jANDxf+nNs6HOKkpy4DGND 9iZy8t2f9jrrKf3h+Lxy192u5ytzqYTa7/6+e4ubdrP9SYyJ0eqhpbfNb15REgWUXJijPeE9Gbp W X-Gm-Gg: ASbGnctoiBAe5AeACkcywSl/swOlqz25BZIYXQyd9TCk7nlZMCBJfm245T658DNiKLY A3RIpmDc1OVxSuF1UmTLjKzjAHrdiYhAleIyfsU+79SlrVqlYOZFG2/WAS5ZOGmUGW9D78SkMSv 8ovnTRuD5yR13g4F034HSP+GWbUbH89hBd8HGMsY1+U4kt6cLAwiuftASs5eUlPkIJwSTK3+CFB V2lB3aCcNCWOEifxtrD4hRxRtA01HazPstCjb4tBm/5yx73mcARlytYdOsWTmYevR2Hw//Nm9xh Sc5cq4r/qInrU81nUZt4mw8apQlGcNUnY1Ucnl62UKdn9awyk/lEJ/5I9Vhvb7YrZudI8XJQyfQ 1b/WDP3Lee2n9xprLdZc= X-Google-Smtp-Source: AGHT+IGZeFhP95M3Sl4bGtLhSk1nDaDgb67HgjorV7Q6DLB1InYih+p5AHru6D/Qqwhvxr4jf4TA5Q== X-Received: by 2002:a05:600c:22d2:b0:43d:7413:cb3f with SMTP id 5b1f17b1804b1-43d7413cde0mr10246525e9.5.1742917298996; Tue, 25 Mar 2025 08:41:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Pierrick Bouvier , Zhao Liu , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Anton Johansson Subject: [PATCH-for-10.1 8/8] target/mips: Introduce mips_env_64bit_enabled() helper Date: Tue, 25 Mar 2025 16:40:58 +0100 Message-ID: <20250325154058.92735-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250325154058.92735-1-philmd@linaro.org> References: <20250325154058.92735-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: -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: 1742917369888019100 mips_env_64bit_enabled() returns whether the CPU is running in 32-bit or 64-bit (behavior which might change at runtime). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Reviewed-by: Pierrick Bouvier --- target/mips/internal.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/mips/internal.h b/target/mips/internal.h index 28eb28936ba..8107a59b908 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -225,6 +225,11 @@ static inline void mips_env_set_pc(CPUMIPSState *env, = target_ulong value) } } =20 +static inline bool mips_env_64bit_enabled(CPUMIPSState *env) +{ + return env->hflags & MIPS_HFLAG_64; +} + static inline bool mips_env_is_bigendian(CPUMIPSState *env) { return extract32(env->CP0_Config0, CP0C0_BE, 1); --=20 2.47.1