From nobody Wed Apr 8 02:52:00 2026 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=1773158068; cv=none; d=zohomail.com; s=zohoarc; b=ZX2CtqOUV/lVKHhjmFfTrYxqR7md911gaHp79okEDWfGXy30gPRlE38hbdd964n6hX7VnUOknN8JcyeySwFwWIoIOkL0v5QlKv1A5OOW2G2YM6lYjZw8+8hfiOe21NaRuFtV8qgloToXepGSzpvnQ47jCUloYdvw2ePwitsK47I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158068; 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=VbjCxPdxTy0F+sdur/B9cQkzQDmrjNtGzbXRyewiX7w=; b=BMdot5R7sAC3SZM74pSPNj6D1I0Su/+yCAIU1k1c8sIQw5xZPBnog6V6UNci3nmxd1Y3W5AVrwWfPHhcp2MKH7zwZVBz60daA2cHf2n7mjE8UNoczWZgBtLMXSccusru3ilZZxKJOb7sT3Zmmyh+fjPp4iKGdHKeHUxpA+r9zR8= 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 1773158068661341.41546768458636; Tue, 10 Mar 2026 08:54:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzOy-0002ee-48; Tue, 10 Mar 2026 11:53: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 1vzzOw-0002di-4Y for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:53:42 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzzOu-0005vc-Js for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:53:41 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-485345e1013so37925e9.1 for ; Tue, 10 Mar 2026 08:53: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-48541a6bc3bsm96154915e9.2.2026.03.10.08.53.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158019; x=1773762819; 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=VbjCxPdxTy0F+sdur/B9cQkzQDmrjNtGzbXRyewiX7w=; b=W9dbffFnkgXLaiSvyP5O1j2yn/UbzY++GbEt0Drdt3BuPLaF5joTpZ5Qi07zO4pIJv fAqBt01IQit1jFtMGNuRgoj2rTlK83QR1TVT8hjJrsxMynjQ1gdH9BNbe5LflPjux3Xm SHVl1KlRs2YqFoJ8CkD7bqdzpegxs6nGsKzxexyakFuXDhe8Pv0MN6gGBEayL/ol9Dv+ aPZ3BeUHgMCkvXhl0i8Zhfc3xkvv1m3CgCy44IQuMCgqmPwtJvpJ080xA+YGYI596HHa 0e1rC3+X2dz97v6PWIiKvqPvNFJlh/X3goyiCfxg3A1AkfB7dAueifXAW6O7skce8JWg 8tnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158019; x=1773762819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VbjCxPdxTy0F+sdur/B9cQkzQDmrjNtGzbXRyewiX7w=; b=fqpK6Yq3dE3WWNcxVK9SXxhlWhOoEnLrRhenz8gm0OK+aJ0sZlm7YTMpAmHA6aL+37 ktlAZRyrU5A5Tr+SFVsoKM7BE51MA0gE9IMgnHaq+pmLqqJKGyn8+0Is/BvmnF+iyH2L oDlhNI62Bo0KXMr9jieOxcc/kVflMPzd8SzkxoipJ+sRzlh3McAUewzKtPvVielrw9jC t9elauDLKIpAZys4GaJF2B90jLdKnakBVasQ0HllCL40+g+9WP6EMjqQ/D0KbzI3M7yS 8TZKX49xipUTeSymEYRIJmMAbNJPTTD5IpoVt195xJanM/j8KBXxf3RZhxB5qcOaPW7c Q5pQ== X-Gm-Message-State: AOJu0YyhDCOy+YmbbNSjZaSSJ/OWu3CdYoeY4Kv3xG0fhfIC5cA3fYic f/IUWFUUfEHb8cjQkE1u5djvFbfOxzMxNuI6CqpcqY70MUMxa8RxaQ7SbY7uafcbTwVaQ8V8Pjl /JOxyQK8= X-Gm-Gg: ATEYQzy2pfOn3istnsAJ4adZHXWzmWXqGyH/yciTq5Qr6qNnzHLqXOATMGWNB6GavDn YvcPKswAtF42TA+CjpnhL60XgzKZnZiYpHDF6oP6tKrJwwKcAYFDsjl2d0jiAXjawgWXLDMTgtC E6ynZeLv2vEoKLSnQHTu8YFrcON/G3byiDxePhPgjodtDjeZO6axGPTQ3JhS4oCSvInHxdNjniV RmMyz4ITFEM0biQ9dIGubuxOFxc3E9iGqhFA3xkauMEDsdhAy2u/CtcuNAuvgO9/t0bDVoJiFtQ rkXW//4EgNqhJ1aeKadLEkx5p3NjvICTVb6WidNr1EuFjCF3sbzqKenn1dQOSHWoDdAUCHBc/Mx 9SzBB/SysWhzyGa0lGOOcrV0dpvkFf70PXT/JfWQeaCOVdo6Jwj3OdqsUcufbq23UhTYBHdKzvd GfW2x1f3unCfmiQfV6TZtrXRd2n+yjhHp/jMcuWg63NuyThmZCNyVAC6QuRXINyDrHZmwprxgq X-Received: by 2002:a05:600d:848a:b0:485:3294:fff0 with SMTP id 5b1f17b1804b1-48541a2b9f4mr43533675e9.17.1773158018622; Tue, 10 Mar 2026 08:53:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 01/13] meson: Restrict gdbstub to user/system builds Date: Tue, 10 Mar 2026 16:53:17 +0100 Message-ID: <20260310155329.48772-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1773158070536154100 Limited builds (tools, documentation) don't need to generate / build gdbstub files. Only process the gdbstub/ folder when user / system emulation / acceleration is built. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Acked-by: Alex Benn=C3=A9e --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1867560da63..db8918dd303 100644 --- a/meson.build +++ b/meson.build @@ -3754,7 +3754,6 @@ subdir('qom') subdir('authz') subdir('crypto') subdir('ui') -subdir('gdbstub') subdir('semihosting') subdir('audio') subdir('io') @@ -3805,6 +3804,7 @@ if have_system or have_user output: 'decode-@BASENAME@.c.inc', arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OU= TPUT@']) subdir('libdecnumber') + subdir('gdbstub') subdir('target') endif =20 --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158096; cv=none; d=zohomail.com; s=zohoarc; b=XdzkP74KYcatxnWCTgHRtQSL+fSaEX6QZ3KYqaW4xdiav3f93djWWlyyAfU6+9AZ6Hat5c5ZB08QMsGj0XjW4h0Yx3r1wNFy5xw5jKzM/3eSJrzYR9dTU2s9j5iLkL4uqepEcwdNEgeARGxGymraKJI3VIy+qlrHYWAMlqK3bkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158096; 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=C6mhKW9cyui3RXBaMvsXOeklQUvgkDOQLWXx/oKD7aQ=; b=eEi/a59tbVEC8+rc+yU29N1gVQs58zThcSuhh9BKhS6IQ7HLofqrKlgX5aeEC/NZL6Y+cVIDyepcN3uXqt8WWpr0egXPYCrksKf4M4zqNJypjPL+r6qmcxIuZ5Ut2zV/fXvIRjpKGVbjzMoCat48eJlsCMKetUCIzcX0R6ZdPXQ= 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 1773158096201820.9268193012459; Tue, 10 Mar 2026 08:54:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzPk-0003CL-0u; Tue, 10 Mar 2026 11:54:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzzP5-0002pr-Um for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:53:52 -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 1vzzP1-00069T-OD for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:53:49 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-439a89b6fd0so9618871f8f.2 for ; Tue, 10 Mar 2026 08:53:47 -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-439dadb29fdsm37044857f8f.16.2026.03.10.08.53.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158025; x=1773762825; 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=C6mhKW9cyui3RXBaMvsXOeklQUvgkDOQLWXx/oKD7aQ=; b=eJKM552mdVFaAY32QiV2Yoqx9LgagrDhXFP6xcqN/eFe54daAyxscIW2hO4iHpOH8j CxTP/XOOS+XBm209undrtlMcJtw8qNAiHJAN4jVxYc/ksBte+NeSy6tnbzRj0hbQlcG+ rGXUG5xLhKT8ck0f2XPkDJztgNYrJz5tr3nbfk1tpBgYfjRvEQapGD7bsK6jov+9ErlL ncQ5kc98PkrLOyEYj10Qr/DAgGm3ED3m1LlnuIsD9UWL7DQDueqCmI4mgD+C3ix1MD6W 9rsBUNhMoxgc6WGD9RjVfuYClQJZ31ZinQ0YPr42SVJtbAYb5IivIsmeR04sbLjedbjp 1GPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158025; x=1773762825; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C6mhKW9cyui3RXBaMvsXOeklQUvgkDOQLWXx/oKD7aQ=; b=ZmJ7e7X8zLGYaLIUVvdtpX3tbHfGi63zeZgyNT3ENAi1nQ2wOWeTH8RH4o6K2El3Iv ZT85DT3QMpKibBqnVoplurzWsvNEHMkbcQzI9uZIDpdF9OpmIv3kl6nSAXL23ZS/IBkf /5hWsO7ahZxQVzPIePkAH2HrRsXz/77xtvsAaqTDvERSX7bvEQCT7tHZ2z+0cMvJAPUy mMHOqN/5OagQ9nLjXPi40eldQaZfifkETqecARavz85h6zg/fpYOuarDvhiGSOW8tQ1v VHlhq9w5DlUE4AmYeqb1R3vOmr6kRip2WqjpF1uKTMXM18ZVIalXVw6ntNpKCwhQj9g1 t9ew== X-Gm-Message-State: AOJu0YypYngIF0mdV8hyJfOQlKvc2GqMKPiffKYP6j97z8CIO99DoDng YOeToaodKq4VEk4uo/PxhdKfbLGt1wMIWxon2HSx6Dt2ioNRBbtxm0UHcQrLS4SvEaVy679hdeY yH+l6etw= X-Gm-Gg: ATEYQzyxxH5H7TnU1Hwy8sxRVVe0vRQoTN6r5YchA2ywi7iwqdt/kl80OeFySZR5K1j bhErk4OzUgxiBhVbEA67jo9fEFiBNfxSB89dCJzOOG0LdMN/nBatC+UXV0B6COql5UVTp/wHfqb gI8f21iiboY/9QhwbLwyNbMqOJlXwDqMSf4JuQ3+nnr9Zsakpi1uLr0PcRb86c0/C4sZY1gzh/0 8Ps8K0A7QMRJgah7MuecadbzcGMBtwK653ydV7WFgS97DCr6ZRNhS71eUesYc+8v+HucL06BbYd d1PwXpL7KgJxXGGAoFT4D+KeM/zr7/i68eGyKT0xocNzSdyXPKjCYFpEGkXD7r+mpjCSYA6GrqF osjklnqOLNDAW82aDQsCltfjVDCgygtIRHfzLzbxct2SMSfheRQ5Q7OLTMKbn+CXEdoigyhmQ/Z GA3eCHz8YWfBaaCemof1pFwU+ovm4bzziesT++C8xb9NeUaDxaFGny9GY4pBG21xr8mcwAxW2H X-Received: by 2002:a05:6000:2902:b0:439:d8e2:9a3f with SMTP id ffacd0b85a97d-439da89fe7amr28417989f8f.56.1773158025399; Tue, 10 Mar 2026 08:53:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 02/13] target/i386/gdbstub: Remove stale comment Date: Tue, 10 Mar 2026 16:53:18 +0100 Message-ID: <20260310155329.48772-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1773158099408154100 Since commit ecd6f6a8820 ("gdbstub: Infer number of core registers from XML") gdb_num_core_regs is inferred for the x86 targets. Remove a stale comment. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- target/i386/gdbstub.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index f1ce90a046e..b86520f8f9c 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -39,9 +39,7 @@ static const int gpr_map[CPU_NB_EREGS] =3D { static const int gpr_map32[8] =3D { 0, 1, 2, 3, 4, 5, 6, 7 }; =20 /* - * Keep these in sync with assignment to - * gdb_num_core_regs in target/i386/cpu.c - * and with the machine description + * Keep these in sync with the machine description */ =20 /* --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158081; cv=none; d=zohomail.com; s=zohoarc; b=AhuU0FtKQJs6Sh0bufXAZ4e/F+tr0KcNNcSpLfWyotrGANzWMyy/3xn6c/7y+ezkavd5xwI2bfYa/L/9VcOpLLvo3x5KS11LevuaEWagUZiB9oef0/TnT0+xX0ujySOXJ82Uq3Hk1dhRSoPtX/O0EK+o4UWZNkzyYxKWaXy/mOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158081; 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=Dqz9NVzSufOWty8PPCEysvgoqR4/ll2kzgD0WQ2e/uc=; b=Lych0HKH0DimvYsrhp4V2TpLGveZ4rGoSdhuVxTXFyE/NpwgvJQyxHVG6p3MEVnXNIm/SU7eXl8pOnTGgnkIkOP43PUHLT2XRV3MqedB5zo7Ee/nVLTvw93FPEbM852h59ovDZ5OBq4YEQPaqQPMv8/9fGnt0OKBaRvLdXFFj0k= 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 1773158081222914.9310087869827; Tue, 10 Mar 2026 08:54:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzPj-0003B6-OF; Tue, 10 Mar 2026 11:54:31 -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 1vzzPF-0002ru-Qv for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:05 -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 1vzzPC-0006Wt-TZ for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:00 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4853e1ce427so24731235e9.3 for ; Tue, 10 Mar 2026 08:53:54 -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-4853a797dbasm86444845e9.7.2026.03.10.08.53.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158033; x=1773762833; 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=Dqz9NVzSufOWty8PPCEysvgoqR4/ll2kzgD0WQ2e/uc=; b=IzMmkb9LJJdwn70PmjXsvNWcQgAACShV7ivv+RhFdOgnZrOpRmMtme2edfSFjxu5kd oNzJQD6maB1C08TA1d33gIhzicT3OiBNEa3OnWM4K93yN3/NxyIgWRc8IkA0iS2IBJlS 3zNtUceiAa/t7m1kS6KkW44WH+Bnejz7AFg1RGDEIjStB5qnRxRObXw0EYz5yQMT2tJD BCP7yhukevDC+ocZG0jI6LjJ0yjD8HbKhuwvN75lDTQbdwBId9T2WXQOkkt6Qqa+ggzd CfMOFbGwOv4XgrXp6iHLX+ZErtcfRGwb7BoJM+uYz4qxMzgk5odEAzsdzgZrqdw1maLr 73hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158033; x=1773762833; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Dqz9NVzSufOWty8PPCEysvgoqR4/ll2kzgD0WQ2e/uc=; b=dQyk8l7GVJcC1b5JWF2709cjB4sB7UQoEp1umaBjHHN6zllpzRuXl38QCUh089DpNU gF10k+okfSwDhpxJxdgCdretkxB+8ddQBaWPglv/PFlmvyVsvdI+cXpujdzBrXPw3Sow SPwAwKXa1iYS1B8FraUH+ovREuH/Xr0flKWAtFeWUuBcQBAnZtxL6py/a9Swjcz39T0A XaGlGeakGsuGKA2yd4fiFjmPVfP5YE3OcQ03mFU9MohYlXydeotcqaxnV9VIHbqMZlMT vkmSJwq2kGEGFbR7cbJl60il4ueYtGGP1cXNlM7Fse77I3xgLGJD+Hi9AbzVMaXSP06o rsYg== X-Gm-Message-State: AOJu0YxRXLVRtKFHcrtrBzgm+2isZEwsngFylQGeSpJq/433I13eSVYF a/wHOmUGBCTX1VY+xVD1X5SIXOk1tVM+OV49TIGPMGUZsEgs5xvqqsqPQAea72tyi2u+W5SyRoC jfNuFL5s= X-Gm-Gg: ATEYQzye9FZSd7iKyR+B4Rt2STRgxPpiQttS4lTGiFzm23JKzprwJRDUkvnJh2FmQty SOJIkA8S3nDoQ9Smd24FySsyLbGflTINHsnGpjPz+ZF+jHidtZHofduZe564UyJpfc6SSMbJtQN UFxtuxmoPNk1ojI9AS+3+1IhrrocC/MyzqbaALkXiVIairm0KrYYHE/at1b+HRweyEczttqdfpX bK6/e/6KI9crwHSWRrXFTcOflxnoF51i+9URwPc00V41RU0qc0dcQxRTyWz2zgAovbqLfUwEgje jiSgn47CJrA9cjcGyzKSGSnBgsoci9smVw5JGtavtEjmtxttE8uRhTgoe4X26CDMSisVL2aGFUE 0hn2vY2Sup0DRWLYPYrSN55fcspNFV1lEkuLYAoi+spZz7i1hH7vhjUEbCK2kr9/d1CZUHIDdxN ju/QStTleibBPHF3pes6YHewDodZQrUX6jtSNLkqJ3xGRoFO44tlFEyzFZJn0xBvgxR1r8USlmN EF4zE0LUBU= X-Received: by 2002:a05:600c:1c0d:b0:485:39d4:2dd9 with SMTP id 5b1f17b1804b1-48539d42ea2mr161159745e9.33.1773158032897; Tue, 10 Mar 2026 08:53:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 03/13] gdbstub: Simplify gdb_init_cpu() logic Date: Tue, 10 Mar 2026 16:53:19 +0100 Message-ID: <20260310155329.48772-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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: qemu development 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: 1773158083492158500 Ensure we either set gdb_num_core_regs or have a XML file. We shouldn't modify CPUClass content, so mark it const. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- gdbstub/gdbstub.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 90f4b95135b..139301b485d 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -582,22 +582,21 @@ static const char *gdb_get_core_xml_file(CPUState *cp= u) =20 void gdb_init_cpu(CPUState *cpu) { - CPUClass *cc =3D cpu->cc; + const CPUClass *cc =3D cpu->cc; const GDBFeature *feature; const char *xmlfile =3D gdb_get_core_xml_file(cpu); =20 cpu->gdb_regs =3D g_array_new(false, false, sizeof(GDBRegisterState)); =20 if (xmlfile) { + assert(!cc->gdb_num_core_regs); feature =3D gdb_find_static_feature(xmlfile); gdb_register_feature(cpu, 0, cc->gdb_read_register, cc->gdb_write_register, feature); - assert(!cc->gdb_num_core_regs); cpu->gdb_num_regs =3D cpu->gdb_num_g_regs =3D feature->num_regs; - } - - if (cc->gdb_num_core_regs) { + } else { + assert(cc->gdb_num_core_regs); cpu->gdb_num_regs =3D cpu->gdb_num_g_regs =3D cc->gdb_num_core_reg= s; } } --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158170; cv=none; d=zohomail.com; s=zohoarc; b=EbT6s20F9Sw70/ju7saHIV2dhqav2twmMN2QKjW5zYvgwTB/Y9IgD3sRGz/XmnPHsYzBX0dr74vlxoZK+6C1L2aR+ZyOAEXKvQITUYTzRXMCg6Gui07GCS/c9BgyL7Y34IN3b1MLqeEsaHWNGuiOdGnJBMSsZKF7oxjZ2HkNHsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158170; 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=0vtaDzyiQN8DEkBPTYsndoe4vp5c4LDKGS1G9F+UUXM=; b=JXwuLjM/7MQOLbWzyp7vzi7BAxyOoKj4S0USu8IwPywSSShCliUQ+zWjbTSQUxqUQ2o1mCdua791uAVO8eeDq+yYZYGKl2UcFiK93lDQuU4aZBkOR/bFVQqRPpf37nh4X6nRB126UgMy/MsaE6eH2Q3JyoR9itRtrQp/UvvWwPw= 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 1773158170177446.07404605662634; Tue, 10 Mar 2026 08:56:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzPm-0003S3-32; Tue, 10 Mar 2026 11:54: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 1vzzPJ-0002vo-7E for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:05 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzzPF-0006Xs-KG for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:04 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-439b7a87fb5so6262002f8f.3 for ; Tue, 10 Mar 2026 08:54:01 -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-439dae3d98asm41322916f8f.30.2026.03.10.08.53.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158040; x=1773762840; 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=0vtaDzyiQN8DEkBPTYsndoe4vp5c4LDKGS1G9F+UUXM=; b=Awq83+zyC2a3c/F5jy9ez2ecjfwT0nd6Iob2YySnzZGeRW2O1nOL8oBoQfmNrI4PQk 0qvaDj/hIaNjEUD0QdyObsQtmujMzaAW+fabgjstn57Qzh0Jv0LQnKKrOSpArEyCmlkv 7N7meo2lsx8id4r00ex+LvHLlLCvJZGvg0noHbGfbV8t+9AIo/J+/QTVZa7ES4pInWN5 4s71/avMY1nrouBqzI35tOi4jx0LD6eNULAebJ0hxN5g6Bh5G7zEdkS0LIROvGm/Zmmz aDRlBBkG7TQV1KUCs95q4RrvaZlLo38gUtLHAg/wuLxD0XlOV86hz8TCz8TQ+AAW7vvd tteA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158040; x=1773762840; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0vtaDzyiQN8DEkBPTYsndoe4vp5c4LDKGS1G9F+UUXM=; b=HZANd1xoW6N5uUUoIEXgAvFaevbfwAhhXDGOmIjBglMtsLTmhVjVN/y5C9OLrIb7/w FIKhA5VSZ2ekbjPM7AMvoko7jgJc+qEtZ99TxBEG3drqD6xyuaOVoFxWhKQQQQlMmoOE N80RAokH+XB9vBtVmoqykDwATTkWw6ZfzYmZ8Di0pAgBwiY06Bq0pm2PU+ls7iUZ9St+ ct8WNooVRbmElOjCS7QTwdHyFD7NrttPdovX0PYo/ZnydhHUskEJ76wGAjX76Cbtr2FK d/HWV1fhkaakeURxnSlzbfrQYnQBC+M7YStzQL4TMg9fQDCCLhekJqYteQd1ADyu7zxB JQHA== X-Gm-Message-State: AOJu0YxFOYMHS3ulUGLgAdJKvIlHDKcBvp/rXQ6bKqIt03FLInx7tE1i kTfl7iPXpdku6BVGpZwKYDLYv/O+QI9Yf0pXIenZhf2Nk5Rl8GnOeoRLwgqRQNzxkBQTo4qbFt5 QIDPxDUU= X-Gm-Gg: ATEYQzxxYqB2VIdcMkM5jYyXp5NaAfxB3u+xe6+xZBRxDOA4Tn2K8jQQbVRMZ5oGVA0 U6ORc8IZJZhtkYFH8ZYqe51Tj1esju1Iyl9FD6wmb6YdaVeY/uLc0v512Oq/2XlcTV3RpepRYat 3+NBP1JpSJaXd8VEqETgIZcrLwhxMhUjb1CbvECNpLJTXFgbFw68WWoeZcUI8CoSSGnPdCSBDcB pKFO6LELsLjCMsCTY5n/WOsvz/QI1EDaVS5jKVxTdMjpmcSSyN2HAW6vn5CLyk+vQkTPthNmwQq q1SAuvyR3FXZJcelNllZ6EV3crZFRgnromtdAclT74vaxiSBU9N36AYnOWKYvlQPExvYrpes85m PitRBofbN90d5ZdB6Qt02NyfUikgBcz6gsMysE1wo5+OKhJm66AxH+8G2rulOdQtfsR+oebpeaC gy4s1srUR9ESPQVrm1Tsi0xGA/NpI/icPksfkgrsxlGwAfM6ueRGSCEHNav+Pmts4lrLTL9/Vj X-Received: by 2002:a5d:588c:0:b0:439:c018:60f2 with SMTP id ffacd0b85a97d-439da348332mr26993996f8f.12.1773158039639; Tue, 10 Mar 2026 08:53:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 04/13] gdbstub: Add trace events for around XML parsing / generation Date: Tue, 10 Mar 2026 16:53:20 +0100 Message-ID: <20260310155329.48772-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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: qemu development 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: 1773158171566158500 Add trace events to help follow how the various files in gdb-xml/ are parsed or generated at runtime. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- gdbstub/gdbstub.c | 10 ++++++++++ gdbstub/trace-events | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 139301b485d..9703688eecc 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -478,6 +478,10 @@ void gdb_feature_builder_end(const GDBFeatureBuilder *= builder) =20 builder->feature->num_regs =3D builder->regs->len; builder->feature->regs =3D (void *)g_ptr_array_free(builder->regs, FAL= SE); + trace_gdbxml_feature_builder_header(builder->feature->name, + builder->feature->xmlname, + builder->feature->num_regs); + trace_gdbxml_feature_builder_content(builder->feature->xml); } =20 const GDBFeature *gdb_find_static_feature(const char *xmlname) @@ -563,6 +567,8 @@ static void gdb_register_feature(CPUState *cpu, int bas= e_reg, .feature =3D feature }; =20 + trace_gdbxml_register_feature(feature->name, feature->xmlname, + base_reg, feature->num_regs); g_array_append_val(cpu->gdb_regs, s); } =20 @@ -599,6 +605,10 @@ void gdb_init_cpu(CPUState *cpu) assert(cc->gdb_num_core_regs); cpu->gdb_num_regs =3D cpu->gdb_num_g_regs =3D cc->gdb_num_core_reg= s; } + + trace_gdbxml_init_cpu(object_get_typename(OBJECT(cpu)), cpu->cpu_index, + cpu->gdb_num_regs, cpu->gdb_num_g_regs, + cc->gdb_num_core_regs); } =20 void gdb_register_coprocessor(CPUState *cpu, diff --git a/gdbstub/trace-events b/gdbstub/trace-events index 4fd126a38c1..44ef3339934 100644 --- a/gdbstub/trace-events +++ b/gdbstub/trace-events @@ -28,5 +28,10 @@ gdbstub_err_checksum_invalid(uint8_t ch) "got invalid co= mmand checksum digit: 0x gdbstub_err_checksum_incorrect(uint8_t expected, uint8_t got) "got command= packet with incorrect checksum, expected=3D0x%02x, received=3D0x%02x" gdbstub_err_unexpected_runpkt(uint8_t ch) "unexpected packet (0x%02x) whil= e target running" =20 +gdbxml_init_cpu(const char *typename, unsigned id, unsigned gdb_num_regs, = unsigned gdb_num_g_regs, unsigned gdb_num_core_regs) "%s:%d regs:%u g_regs:= %u core_regs:%u" +gdbxml_register_feature(const char *featname, const char *xmlname, unsigne= d base_reg, unsigned num_regs) "%s (%s) @%u +%u" +gdbxml_feature_builder_header(const char *name, const char *xmlname, int n= um_regs) "%s (%s) regs:%d" +gdbxml_feature_builder_content(const char *xml) "%s" + # system.c gdbstub_hit_watchpoint(const char *type, int cpu_gdb_index, uint64_t vaddr= ) "Watchpoint hit, type=3D\"%s\" cpu=3D%d, vaddr=3D0x%" PRIx64 "" --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158100; cv=none; d=zohomail.com; s=zohoarc; b=hgdlcjLeZUMCcuPsX2r5gXVwZbPmwt7nYtarGzQCZsyAojXuj+yxqSkLN6qHbY6IccSWpp2p3QHQ0Xn5dlKX1OsXYhQoDwasoBCiBgC29sVviUYL3VaZOLlTMtsv8Jjt3/wOKXcCnEqc2Vl0HEcVBb+Q/PAiwy5pXPHLHIXcpyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158100; 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=US85J4JR3GJNPZ3oJTe2cSnkCs6VXwsD3WsU8xuipE8=; b=UXAqhkw2RuT/eoteUXnp+p05JU8ACJsLhPORQwPr3xejDb8lwDiSZODKkxwgwLRvVpfKSUmOPygM7GC6JH2fLMZtteh9ZPoVLvG8SVKg+Iou2BoikNGY1f82TSYcVL2E8mXwPymVwQB2zpSbjYBmubHcjJFACaJPDrZFIZo9TEo= 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 1773158100415651.726061746216; Tue, 10 Mar 2026 08:55:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzPn-0003gn-TT; Tue, 10 Mar 2026 11:54:35 -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 1vzzPO-0002x1-MY for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:15 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzzPM-0006ZV-Vm for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:10 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4853c3c2fe7so14686605e9.0 for ; Tue, 10 Mar 2026 08:54:08 -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-439dad97abasm33905707f8f.10.2026.03.10.08.54.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158046; x=1773762846; 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=US85J4JR3GJNPZ3oJTe2cSnkCs6VXwsD3WsU8xuipE8=; b=isy1/iGWDgf7M8V2EptuTpmQxarP6aar9n4rGGtZ0toaS2zScyT15YqXyG8cqPr4PM vpnbdcn/pmuBO8GMHANeZGNXHuT7G90fCnjAwWNI6C5Ip3dPc31dw+jRwxKj7aD+u6kb LcGlZVuficGendAG5c5tP3OY1LX4HpnJacd4hBejjUswJFdN1ecZ7/NnjWGHHg/vOCOW AvcZHm4SknK3s2HvxlgRFQzHmBD0b/mXwe79diQVRvZa9pFDqyskobhwl+g6MFSECNOh auM/owM+w4rFQQK57BG96Cw8qWygXXhVx+piAhwMr/YYiDXagbMwWDuEVTczwZbXjkRu wRrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158046; x=1773762846; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=US85J4JR3GJNPZ3oJTe2cSnkCs6VXwsD3WsU8xuipE8=; b=IFppoL2Kc+h1PPsAEecrmk8YyES+Nikt1hs0JasLKB6YtsPngs7j+qYFonm83LUBaG SdTUsWjJl3u+WBIb/qG5W5GMqT6GddQagNyIQtRCoGeRsinwQI9WqkermMCs6f4cRxjY KlgQ2+jj/AJh5s86DTKbHMJV3Qk97aw25+mTx2cGLb/lUVamkOH3oFaRKNyRzTSI7YJE 52hQdBZ0F2H6QisXHrWKNS/ioCIklpaatWnJf8z/PkyLEZ8ZeMfAk1BQF9yN6ktwE1tc k/4SIul5wbqn9H/njcc1jE5iHXVH/sYJxuEcHc0EfqfzfFSa1/AjmKQtTjzAkEomky9R HkFQ== X-Gm-Message-State: AOJu0YxKFx/hibjpVfMOoVlAD0alFV7FS2okceI+Llk9/23abwFlvJ77 VFsDZy0Nj7ifSxHg4CR5+ujIn2VQrrS63H/jJ5VXen84CSFz5yNTkG2Zrtr6wcp96XwgPPEmdmA t3tzHhkI= X-Gm-Gg: ATEYQzwm62rRUcHdG8LNQVYBedkJMfTjKZAuKBosYdeY4OC5LZWpzk4sKwQD4v/WS+q shtDo6rzoR5mpUaUKZhv/nF15DVoKz1Lc8TKgrcKukcEGWkc68ntNBYi7N2jrsfrEJnbBbOhC37 zCbzbkpQm3CHqShBKz9VfhTeuJj9tGxFAJzfzOlYWLf5GfM+cjxvpCqpa3OVBucglVaAcS+0ntA ieOAwVHQxWAJ060etMHl1PAPcFLtr3F42zZ5+oQ3ocXhgxY4DjMSJo0IQgeoRqIZWJQrdkFotp2 Waf/ggdGuXDsj+bmSdDXNyetQ+AMY5ZNRTpoZhGorJlwSK3vfZnTV9cw/8SJrChXSGgYFMGfV/t lpmghJ8vAKkCIQnppbuCfF+XaslsiPby3FUWbWX4pLjoVkq0c6UTCWVdjYzB6TJlmqTA33y95l8 XKHUT8fMQSl2rZPtox9aUh8IgPLTRSMNxHK3+8CtJMU10fnrP9XKAJD0yX039V739JN25NF75T X-Received: by 2002:a05:600c:6387:b0:485:3983:aba8 with SMTP id 5b1f17b1804b1-4853983ad1amr133011035e9.27.1773158046474; Tue, 10 Mar 2026 08:54:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 05/13] gdbstub: Have scripts/feature_to_c.py generate more verbose output Date: Tue, 10 Mar 2026 16:53:21 +0100 Message-ID: <20260310155329.48772-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1773158101581158500 Make the structure field names explicit, so it is easier to figure what is what when reviewing multiple entries. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- scripts/feature_to_c.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/feature_to_c.py b/scripts/feature_to_c.py index 3aa62fb895f..1329695ad04 100644 --- a/scripts/feature_to_c.py +++ b/scripts/feature_to_c.py @@ -85,13 +85,16 @@ def writeliteral(indent, bytes): num_regs =3D max(regnums) - base_reg + 1 if len(regnums) else 0 =20 sys.stdout.write(' {\n') - writeliteral(8, bytes(os.path.basename(input), 'utf-8')) + sys.stdout.write(' .xmlname =3D ') + writeliteral(0, bytes(os.path.basename(input), 'utf-8')) sys.stdout.write(',\n') - writeliteral(8, read) + sys.stdout.write(' .xml =3D \n') + writeliteral(12, read) sys.stdout.write(',\n') - writeliteral(8, bytes(feature_name, 'utf-8')) + sys.stdout.write(' .name =3D ') + writeliteral(0, bytes(feature_name, 'utf-8')) sys.stdout.write(',\n') - sys.stdout.write(f' (const char * const [{num_regs}]) {{\n') + sys.stdout.write(f' .regs =3D (const char * const [{num_regs}])= {{\n') =20 for index, regname in enumerate(regnames): sys.stdout.write(f' [{regnums[index] - base_reg}] =3D\n= ') @@ -99,7 +102,7 @@ def writeliteral(indent, bytes): sys.stdout.write(',\n') =20 sys.stdout.write( ' },\n') - sys.stdout.write(f' {num_regs},\n') + sys.stdout.write(f' .num_regs =3D {num_regs},\n') sys.stdout.write( ' },\n') =20 sys.stdout.write(' { NULL }\n};\n') --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158116; cv=none; d=zohomail.com; s=zohoarc; b=cwHHzjWWJrYs0ul3LEcB9cg6AOq7l7mkMBg1bf5fWqp6sMAL/09QCr4cKQXyy2L2yligyq6OYbamJMHIVIOJ1IR+DogA0jBFaP3Xx7XOfZjkRX+mlxD96bXkFZrqeNW7duCIEPff13f6t7pfYlm06APai2pjc0bn9pwOLMntkiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158116; 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=45Z++vPIrHX3TjF4mstsF5/1HCXT+AWsKRxD65WL50w=; b=hqcueqezfuqaiZLEBItYiw36oDVdQY+TyeubMSCzJYM6dB5SlPC4GRcWSQgvHzPUYG/9C73OycmW7GnkOFs3sQjEKQC3yp2m/94LmVTe8BhTLjQLpmndi0N4+IWNEA9i+Cen/pZsSpeNiXSFvPyvm1knydSnnXe1pAEm6XqUM3g= 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 1773158116895717.550832582934; Tue, 10 Mar 2026 08:55:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzPk-0003Kx-Mw; Tue, 10 Mar 2026 11:54:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzzPY-00030T-GQ for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:21 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzzPT-0006aS-If for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:16 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4852b81c73aso30603295e9.3 for ; Tue, 10 Mar 2026 08:54:15 -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-48541aba60esm87225255e9.5.2026.03.10.08.54.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:54:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158054; x=1773762854; 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=45Z++vPIrHX3TjF4mstsF5/1HCXT+AWsKRxD65WL50w=; b=kVxf1PEOiwmapXQWsFFaEXRMdBTfdBE3KKe4U5Kp+C05I3Gv0u2z/mTIUNRDUnAaqB dG9VICCftfgAk9OliT6kL1tonDxfOvoKI1hem4rIMV+0SrH1LSlMqnij6Q8ZJnqJfmVB HtGEd8+Ddzbx0u5y1gapUB0SH5wc4uQ2JxyWXNUx1k6sIyH3VYT3nm7Kj1JtwvZlxvXA d2SuimjzY0mxp+QpPx+O7R6kFusbwrDqP2J/o4OHREo5uPRZIelpVvmJPO3XUzPXb4mj pGCHYfmeuo/RETyOa2d3SO+hY6t/CS5s3GzhhMLCs2LJ52kcXycS+XLbt5bCTVq10xrO SsvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158054; x=1773762854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=45Z++vPIrHX3TjF4mstsF5/1HCXT+AWsKRxD65WL50w=; b=i6rYlWbQjcDMRX20lvCrdhXGoUf9FHZjQotlIpzI65mkGp8zmtnZ55hcOKs0aSn+hW KUhZBZYX2qyG++roPP9DXfiyyp8ZF5RQADgVdKUDEA0dkKkJ+ERSvHJ7nPHg3nxzdmmm 08B3UZYNd9V9mmOrzpU59zrLOtOX6R1/flVBH55qA5ezbja+ctVIBy3LdGMhscxIWeuK zMSZRDSgHoTpsatLkvOAVDtgX1rf3mpaM05eBZA4WIXGObHx3Xk+FTJ1yap8D89KL25W r3OlFOHaapkJSlXLGcTIXraWFR/vrSSi4izNWpDgpMm7om50wpMz4CmPepxCdFmgmmak Cm+Q== X-Gm-Message-State: AOJu0Yz2/yhGZQgnJWaXAidFx5uo+b6mfz7NYCrAqceDPql78Td6bqv3 Tn3yeuaKzKFQ/e7qxq93XW9BE4rRrwFU87XMJkrAJfWYxf92afFmLAhJqd/K6635nzg3myejHiS 8ckfJxmU= X-Gm-Gg: ATEYQzwNZ7MHSt0csdtK3o5dA0Hcoi113A2/WRfF3v0VS04fiYXWDjrXCIxw9BlRJ8B +PxpbElp3NyZsdjbZB6UtrSOv40g91FHjeBv7rfKA6ngEE0AgPBz/tu/BWb0dgYuGH5Xb5a3DUJ 2WTQDoUgxt54s9jHEKt8KLlGuLMLBdfPReqFNfQ3i8CkFwMyGdn/Vckh4h4732MV4RCn4e2/Car 1QmJ+aIuV36o7XgeSXLwESBTnxzs7ie1MHRrd3QJwuAfOVnzYfLO6zoHbhJZe5K6MAnmvjcfTaS J1BYwtmof5tlJQMxi1G6PjHnSQ2UHmL+P8hMiTA0NGxqCm2Tbq74CFdhHgFMHLnPOsZ/AXP5H2L 0t1s5HoCd5fZICZ5uavkfWCXE30iOs+/dEB2/tS1vRh38BwqXRXK3nYxhrBwz0VxiD5RlXp43w7 SkkRTm4tSlm1lkcuRvwM45RaQfXMEqjdp7MifNlocKN7+F7L91fTlKkaowIXzO2QGNMudKGvg2 X-Received: by 2002:a05:600c:c117:b0:485:2f6a:6ed with SMTP id 5b1f17b1804b1-4852f6a07f5mr166398385e9.28.1773158053600; Tue, 10 Mar 2026 08:54:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 06/13] gdbstub: Make base register explicit in m68k GDB XML files Date: Tue, 10 Mar 2026 16:53:22 +0100 Message-ID: <20260310155329.48772-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: qemu development 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: 1773158117325158500 Both gdb-xml/cf-fp.xml and gdb-xml/m68k-fp.xml aren't imported from GDB repository. Presumably they are hand-written, and lack the @regnum XML tag. This might explain why gdb_register_coprocessor() have a @g_pos argument, only used for these 2 m68k files. Fixes: 56aebc89167 ("Add GDB XML register description support") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- target/m68k/helper.c | 4 ++-- gdb-xml/cf-fp.xml | 2 +- gdb-xml/m68k-fp.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 15f110fa7a2..c566cb0a16c 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -129,10 +129,10 @@ void m68k_cpu_init_gdb(M68kCPU *cpu) =20 if (m68k_feature(env, M68K_FEATURE_CF_FPU)) { gdb_register_coprocessor(cs, cf_fpu_gdb_get_reg, cf_fpu_gdb_set_re= g, - gdb_find_static_feature("cf-fp.xml"), 18); + gdb_find_static_feature("cf-fp.xml"), 0); } else if (m68k_feature(env, M68K_FEATURE_FPU)) { gdb_register_coprocessor(cs, m68k_fpu_gdb_get_reg, m68k_fpu_gdb_se= t_reg, - gdb_find_static_feature("m68k-fp.xml"), 1= 8); + gdb_find_static_feature("m68k-fp.xml"), 0= ); } /* TODO: Add [E]MAC registers. */ } diff --git a/gdb-xml/cf-fp.xml b/gdb-xml/cf-fp.xml index bf71c320bfc..27db66ae963 100644 --- a/gdb-xml/cf-fp.xml +++ b/gdb-xml/cf-fp.xml @@ -6,7 +6,7 @@ notice and this notice are preserved. --> - + diff --git a/gdb-xml/m68k-fp.xml b/gdb-xml/m68k-fp.xml index 64290d16306..ec45931b673 100644 --- a/gdb-xml/m68k-fp.xml +++ b/gdb-xml/m68k-fp.xml @@ -6,7 +6,7 @@ notice and this notice are preserved. --> - + --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158099; cv=none; d=zohomail.com; s=zohoarc; b=h8K8pk2wbSIAIxoFGOlt7e2SEG9+C3dwnbNBTZqmcUIeoDZHPW4qk6I6oMc/PULYm6uG1JSB6T28rHka4PzZ/wDKXiTvGfosHlyyFyj8cem4vbX8mFvnwtgeXjQ9aEpjAwFVmhvwPLGX3/xVvWhocWtRzlLDo6Uw3ezyG0ikWyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158099; 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=FQA4Ni6nRUAE9AhgR7IMW0z3OocHp4BIFK39xhJBKWA=; b=NBfVpoV3kwDn4NbmcCEZbOpG6aYvSVxXuwoSC7eAhYJcoEHPiB6/S5Hz6NYP9LZbqc26p1aki9jHsCfaqjvGVum8fzw8Ba/tX4iCT3Rlb9lf+0n+t8k/wyFJvKGE0360bWfTbupImofBiKKR1LAU+ikkccnJ96OqHPH7PykMM1k= 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 1773158099061103.67376645434183; Tue, 10 Mar 2026 08:54:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzPo-0003kB-F7; Tue, 10 Mar 2026 11:54:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzzPe-00033g-19 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:26 -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 1vzzPa-0006bj-JY for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:24 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4853c1ca73aso19547065e9.2 for ; Tue, 10 Mar 2026 08:54:22 -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-48541aacd81sm80805625e9.14.2026.03.10.08.54.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:54:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158061; x=1773762861; 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=FQA4Ni6nRUAE9AhgR7IMW0z3OocHp4BIFK39xhJBKWA=; b=spxEo6LuhVfdxPDUDhdp/NSH/wtIv4suLX6f8PqKD6nDIGJGqJjISqwRs9jTPPo9+g HX9Ig6tH/FojJdBZIHjcgoKG4zEQTEchxLPhC/0C1959OxY116EvOLBDggfJBdz/z5I1 enUTYCi2wDYJIHMP0ydRFyZpVrQ1BMgjqA83qrznYQbLCTz8K/aVWwhC6bmQIkLf5Z+Y uNnwOOaVTExZQ3xi+j2d0Qyv3HZdTvKd3m1j/tTELgVJzylQHxGiZ3s23txth7ApuNZb kr9y3WHeDf/Pq+/6vWp7EZPFsqxFwk6te+x33KHkrpJ7H3GH2zqJJmEk99iG6W9IJ+Bx 8jXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158061; x=1773762861; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FQA4Ni6nRUAE9AhgR7IMW0z3OocHp4BIFK39xhJBKWA=; b=M3OYX6PnaETqasWO/o9xayrkLSzsxIzECEMMqL4bVkH+a56Gs/G51V4jtd57xnr9H6 c9sUWCKo+/d+Wp847WYwZ4IV02Kk9bj/Fa6cFmbbpFUeQR0FEv7b9IJ42GF7KKz6sgLd vZHj6sFkY09JdabhBd1wxrD8MdyY7DN0z/8/BuX28lX4eEEJyXLjdGupiFmRQ+RonD4p AT8zEUGUmg3G1gt5JzjEHkpd0pJg0Djr4BsiTvq1pJF3Fkjb54eOpXwEWcqWA+Qjho2S 3aNDVQQoBSTRGOCYM+A31+F6xZwDsLDHZqNbbZV8iGqtunINqOLbqGu/c0nJr7vXP5ft ZJnA== X-Gm-Message-State: AOJu0YxFy8aooXIaO35JYLsecVhN8TORKbf85Ezfdb8L9/lVz9N1HdiJ 6i/LjCLrDuJchL3IizN9wT/7gJqmg65OTJnT1i/fpozOOFcv7Ns0oPONv5RHtbVGYRMrx/PbZVk k5jCtOuU= X-Gm-Gg: ATEYQzyDnNsyp+F8wPkQ3+VVHRbQUXQVX7cLLv3+Pp1MwjG9XL7KxACBdehg98GIKFY U4MIsmQlG/Ds6/9MIjZf2dIHkMKanwcRb8EHcXEritfsZXm8+Yyk51wi3urqHr0/JyyvTkQ15NZ FNi7rdG7OWcckj0VApMmYXU4217VOlnpXckRKREgqIos5Q90k4cLl4x58U4GS2KMjzGHFe9uNuv RRN7L0pKu96qcjLrDgSqvlXDbyh339ZfFsxj+tmPcj14clYiCGZo14iCNr6AkJOaebKq6Usv0jy Ub37O744A6cgwloGbgaN/HjpZ3tQchLaie2Zax9MrMrvPfqEziMl3HJyl1g9bH4xHxB1EIjm2v5 Tb7p6eCZ9XqMw4YOka+SrE0NJyHBPSxm4nmpwoU4TqzVoXjLuFfhUMe2UiqqEUmD5ywhwDe6yUy J26KHVn210FWgt35YMRYAZNtGOQpJPoVZjsYqj9TPLk7XiwcdpJD8cXlMHAOxqTCnnLIEAF+iM X-Received: by 2002:a05:600c:a108:b0:485:35d3:ce59 with SMTP id 5b1f17b1804b1-48535d3d016mr117721895e9.10.1773158060535; Tue, 10 Mar 2026 08:54:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 07/13] gdbstub: Remove @g_pos argument in gdb_register_coprocessor() Date: Tue, 10 Mar 2026 16:53:23 +0100 Message-ID: <20260310155329.48772-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1773158101800158500 gdb_register_coprocessor()'s @g_pos argument is always '0', meaning it is inferred from cpu->gdb_num_regs. Use instead feature->base_reg. Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/gdbstub.h | 3 +-- gdbstub/gdbstub.c | 10 +--------- target/arm/gdbstub.c | 21 ++++++++------------- target/arm/gdbstub64.c | 19 +++++++------------ target/hexagon/cpu.c | 2 +- target/i386/gdbstub.c | 8 +++----- target/loongarch/gdbstub.c | 6 +++--- target/m68k/helper.c | 4 ++-- target/microblaze/cpu.c | 3 +-- target/ppc/gdbstub.c | 11 +++++------ target/riscv/gdbstub.c | 18 ++++++------------ target/s390x/gdbstub.c | 15 +++++++-------- target/sparc/gdbstub.c | 12 ++++-------- 13 files changed, 49 insertions(+), 83 deletions(-) diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index bd7182c4d32..79e47a024ec 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -34,11 +34,10 @@ void gdb_init_cpu(CPUState *cpu); * @set_reg - set function (gdb modifying) * @num_regs - number of registers in set * @xml - xml name of set - * @gpos - non-zero to append to "general" register set at @gpos */ void gdb_register_coprocessor(CPUState *cpu, gdb_get_reg_cb get_reg, gdb_set_reg_cb set_r= eg, - const GDBFeature *feature, int g_pos); + const GDBFeature *feature); =20 /** * gdb_unregister_coprocessor_all() - unregisters supplemental set of regi= sters diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 9703688eecc..ad4bdc0623d 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -613,7 +613,7 @@ void gdb_init_cpu(CPUState *cpu) =20 void gdb_register_coprocessor(CPUState *cpu, gdb_get_reg_cb get_reg, gdb_set_reg_cb set_r= eg, - const GDBFeature *feature, int g_pos) + const GDBFeature *feature) { GDBRegisterState *s; guint i; @@ -631,14 +631,6 @@ void gdb_register_coprocessor(CPUState *cpu, =20 /* Add to end of list. */ cpu->gdb_num_regs +=3D feature->num_regs; - if (g_pos) { - if (g_pos !=3D base_reg) { - error_report("Error: Bad gdb register numbering for '%s', " - "expected %d got %d", feature->xml, g_pos, base_r= eg); - } else { - cpu->gdb_num_g_regs =3D cpu->gdb_num_regs; - } - } } =20 void gdb_unregister_coprocessor_all(CPUState *cpu) diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index c7d59fd3726..d6e29c4cf46 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -534,15 +534,13 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *c= pu) } else { if (arm_feature(env, ARM_FEATURE_NEON)) { gdb_register_coprocessor(cs, vfp_gdb_get_reg, vfp_gdb_set_reg, - gdb_find_static_feature("arm-neon.xml= "), - 0); + gdb_find_static_feature("arm-neon.xml= ")); } else if (cpu_isar_feature(aa32_simd_r32, cpu)) { gdb_register_coprocessor(cs, vfp_gdb_get_reg, vfp_gdb_set_reg, - gdb_find_static_feature("arm-vfp3.xml= "), - 0); + gdb_find_static_feature("arm-vfp3.xml= ")); } else if (cpu_isar_feature(aa32_vfp_simd, cpu)) { gdb_register_coprocessor(cs, vfp_gdb_get_reg, vfp_gdb_set_reg, - gdb_find_static_feature("arm-vfp.xml"= ), 0); + gdb_find_static_feature("arm-vfp.xml"= )); } if (!arm_feature(env, ARM_FEATURE_M)) { /* @@ -550,29 +548,26 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *c= pu) * expose to gdb. */ gdb_register_coprocessor(cs, vfp_gdb_get_sysreg, vfp_gdb_set_s= ysreg, - gdb_find_static_feature("arm-vfp-sysr= egs.xml"), - 0); + gdb_find_static_feature("arm-vfp-sysr= egs.xml")); } } if (cpu_isar_feature(aa32_mve, cpu) && tcg_enabled()) { gdb_register_coprocessor(cs, mve_gdb_get_reg, mve_gdb_set_reg, - gdb_find_static_feature("arm-m-profile-mv= e.xml"), - 0); + gdb_find_static_feature("arm-m-profile-mv= e.xml")); } gdb_register_coprocessor(cs, arm_gdb_get_sysreg, arm_gdb_set_sysreg, - arm_gen_dynamic_sysreg_feature(cs, cs->gdb_nu= m_regs), - 0); + arm_gen_dynamic_sysreg_feature(cs, cs->gdb_nu= m_regs)); =20 #ifdef CONFIG_TCG if (arm_feature(env, ARM_FEATURE_M) && tcg_enabled()) { gdb_register_coprocessor(cs, arm_gdb_get_m_systemreg, arm_gdb_set_m_systemreg, - arm_gen_dynamic_m_systemreg_feature(cs, cs->gdb_num_regs), 0); + arm_gen_dynamic_m_systemreg_feature(cs, cs->gdb_num_regs)); #ifndef CONFIG_USER_ONLY if (arm_feature(env, ARM_FEATURE_M_SECURITY)) { gdb_register_coprocessor(cs, arm_gdb_get_m_secextreg, arm_gdb_set_m_secextreg, - arm_gen_dynamic_m_secextreg_feature(cs, cs->gdb_num_regs),= 0); + arm_gen_dynamic_m_secextreg_feature(cs, cs->gdb_num_regs)); } #endif } diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index b71666c3a1d..a4fa740caf6 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -887,24 +887,22 @@ void aarch64_cpu_register_gdb_regs_for_features(ARMCP= U *cpu) isar_feature_aa64_sme(&cpu->isar)) { GDBFeature *feature =3D arm_gen_dynamic_svereg_feature(cs, cs->gdb= _num_regs); gdb_register_coprocessor(cs, aarch64_gdb_get_sve_reg, - aarch64_gdb_set_sve_reg, feature, 0); + aarch64_gdb_set_sve_reg, feature); } else { gdb_register_coprocessor(cs, aarch64_gdb_get_fpu_reg, aarch64_gdb_set_fpu_reg, - gdb_find_static_feature("aarch64-fpu.xml"= ), - 0); + gdb_find_static_feature("aarch64-fpu.xml"= )); } =20 if (isar_feature_aa64_sme(&cpu->isar)) { GDBFeature *sme_feature =3D arm_gen_dynamic_smereg_feature(cs, cs->gdb_num_regs); gdb_register_coprocessor(cs, aarch64_gdb_get_sme_reg, - aarch64_gdb_set_sme_reg, sme_feature, 0); + aarch64_gdb_set_sme_reg, sme_feature); if (isar_feature_aa64_sme2(&cpu->isar)) { gdb_register_coprocessor(cs, aarch64_gdb_get_sme2_reg, aarch64_gdb_set_sme2_reg, - gdb_find_static_feature("aarch64-sme2= .xml"), - 0); + gdb_find_static_feature("aarch64-sme2= .xml")); } } /* @@ -916,8 +914,7 @@ void aarch64_cpu_register_gdb_regs_for_features(ARMCPU = *cpu) if (isar_feature_aa64_pauth(&cpu->isar)) { gdb_register_coprocessor(cs, aarch64_gdb_get_pauth_reg, aarch64_gdb_set_pauth_reg, - gdb_find_static_feature("aarch64-pauth.xm= l"), - 0); + gdb_find_static_feature("aarch64-pauth.xm= l")); } =20 #ifdef CONFIG_USER_ONLY @@ -925,14 +922,12 @@ void aarch64_cpu_register_gdb_regs_for_features(ARMCP= U *cpu) if (cpu_isar_feature(aa64_mte, cpu)) { gdb_register_coprocessor(cs, aarch64_gdb_get_tag_ctl_reg, aarch64_gdb_set_tag_ctl_reg, - gdb_find_static_feature("aarch64-mte.xml"= ), - 0); + gdb_find_static_feature("aarch64-mte.xml"= )); } #endif =20 /* All AArch64 CPUs have at least TPIDR */ gdb_register_coprocessor(cs, aarch64_gdb_get_tls_reg, aarch64_gdb_set_tls_reg, - arm_gen_dynamic_tls_feature(cs, cs->gdb_num_r= egs), - 0); + arm_gen_dynamic_tls_feature(cs, cs->gdb_num_r= egs)); } diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 58a22ee41f2..ffd14bb4678 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -322,7 +322,7 @@ static void hexagon_cpu_realize(DeviceState *dev, Error= **errp) =20 gdb_register_coprocessor(cs, hexagon_hvx_gdb_read_register, hexagon_hvx_gdb_write_register, - gdb_find_static_feature("hexagon-hvx.xml"), 0= ); + gdb_find_static_feature("hexagon-hvx.xml")); =20 qemu_init_vcpu(cs); cpu_reset(cs); diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index b86520f8f9c..5c5fa727216 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -501,8 +501,7 @@ void x86_cpu_gdb_init(CPUState *cs) if (env->features[FEAT_7_1_EDX] & CPUID_7_1_EDX_APXF) { gdb_register_coprocessor(cs, i386_cpu_gdb_get_egprs, i386_cpu_gdb_set_egprs, - gdb_find_static_feature("i386-64bit-apx.x= ml"), - 0); + gdb_find_static_feature("i386-64bit-apx.x= ml")); } #endif =20 @@ -510,10 +509,9 @@ void x86_cpu_gdb_init(CPUState *cs) gdb_register_coprocessor(cs, x86_cpu_gdb_read_linux_register, x86_cpu_gdb_write_linux_register, #ifdef TARGET_X86_64 - gdb_find_static_feature("i386-64bit-linux.xml= "), + gdb_find_static_feature("i386-64bit-linux.xml= ")); #else - gdb_find_static_feature("i386-32bit-linux.xml= "), + gdb_find_static_feature("i386-32bit-linux.xml= ")); #endif - 0); #endif } diff --git a/target/loongarch/gdbstub.c b/target/loongarch/gdbstub.c index 23a5eecc20b..3e9bdfa8bbf 100644 --- a/target/loongarch/gdbstub.c +++ b/target/loongarch/gdbstub.c @@ -180,16 +180,16 @@ void loongarch_cpu_register_gdb_regs_for_features(CPU= State *cs) =20 if (FIELD_EX32(env->cpucfg[2], CPUCFG2, FP)) { gdb_register_coprocessor(cs, loongarch_gdb_get_fpu, loongarch_gdb_= set_fpu, - gdb_find_static_feature("loongarch-fpu.xm= l"), 0); + gdb_find_static_feature("loongarch-fpu.xm= l")); } =20 if (FIELD_EX32(env->cpucfg[2], CPUCFG2, LSX)) { gdb_register_coprocessor(cs, loongarch_gdb_get_lsx, loongarch_gdb_= set_lsx, - gdb_find_static_feature("loongarch-lsx.xm= l"), 0); + gdb_find_static_feature("loongarch-lsx.xm= l")); } =20 if (FIELD_EX32(env->cpucfg[2], CPUCFG2, LASX)) { gdb_register_coprocessor(cs, loongarch_gdb_get_lasx, loongarch_gdb= _set_lasx, - gdb_find_static_feature("loongarch-lasx.x= ml"), 0); + gdb_find_static_feature("loongarch-lasx.x= ml")); } } diff --git a/target/m68k/helper.c b/target/m68k/helper.c index c566cb0a16c..9bab1843892 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -129,10 +129,10 @@ void m68k_cpu_init_gdb(M68kCPU *cpu) =20 if (m68k_feature(env, M68K_FEATURE_CF_FPU)) { gdb_register_coprocessor(cs, cf_fpu_gdb_get_reg, cf_fpu_gdb_set_re= g, - gdb_find_static_feature("cf-fp.xml"), 0); + gdb_find_static_feature("cf-fp.xml")); } else if (m68k_feature(env, M68K_FEATURE_FPU)) { gdb_register_coprocessor(cs, m68k_fpu_gdb_get_reg, m68k_fpu_gdb_se= t_reg, - gdb_find_static_feature("m68k-fp.xml"), 0= ); + gdb_find_static_feature("m68k-fp.xml")); } /* TODO: Add [E]MAC registers. */ } diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index ae41a1a3287..ec513ae82d4 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -265,8 +265,7 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **= errp) =20 gdb_register_coprocessor(cs, mb_cpu_gdb_read_stack_protect, mb_cpu_gdb_write_stack_protect, - gdb_find_static_feature("microblaze-stack-pro= tect.xml"), - 0); + gdb_find_static_feature("microblaze-stack-pro= tect.xml")); =20 qemu_init_vcpu(cs); =20 diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c index e0aae9c9eaf..4d622c5cad5 100644 --- a/target/ppc/gdbstub.c +++ b/target/ppc/gdbstub.c @@ -502,24 +502,23 @@ void ppc_gdb_init(CPUState *cs, PowerPCCPUClass *pcc) { if (pcc->insns_flags & PPC_FLOAT) { gdb_register_coprocessor(cs, gdb_get_float_reg, gdb_set_float_reg, - gdb_find_static_feature("power-fpu.xml"),= 0); + gdb_find_static_feature("power-fpu.xml")); } if (pcc->insns_flags & PPC_ALTIVEC) { gdb_register_coprocessor(cs, gdb_get_avr_reg, gdb_set_avr_reg, - gdb_find_static_feature("power-altivec.xm= l"), - 0); + gdb_find_static_feature("power-altivec.xm= l")); } if (pcc->insns_flags & PPC_SPE) { gdb_register_coprocessor(cs, gdb_get_spe_reg, gdb_set_spe_reg, - gdb_find_static_feature("power-spe.xml"),= 0); + gdb_find_static_feature("power-spe.xml")); } if (pcc->insns_flags2 & PPC2_VSX) { gdb_register_coprocessor(cs, gdb_get_vsx_reg, gdb_set_vsx_reg, - gdb_find_static_feature("power-vsx.xml"),= 0); + gdb_find_static_feature("power-vsx.xml")); } #ifndef CONFIG_USER_ONLY gdb_gen_spr_feature(cs); gdb_register_coprocessor(cs, gdb_get_spr_reg, gdb_set_spr_reg, - &pcc->gdb_spr, 0); + &pcc->gdb_spr); #endif } diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index a053009ccd3..6a5b7a82fd4 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -348,32 +348,27 @@ void riscv_cpu_register_gdb_regs_for_features(CPUStat= e *cs) CPURISCVState *env =3D &cpu->env; if (env->misa_ext & RVD) { gdb_register_coprocessor(cs, riscv_gdb_get_fpu, riscv_gdb_set_fpu, - gdb_find_static_feature("riscv-64bit-fpu.= xml"), - 0); + gdb_find_static_feature("riscv-64bit-fpu.= xml")); } else if (env->misa_ext & RVF) { gdb_register_coprocessor(cs, riscv_gdb_get_fpu, riscv_gdb_set_fpu, - gdb_find_static_feature("riscv-32bit-fpu.= xml"), - 0); + gdb_find_static_feature("riscv-32bit-fpu.= xml")); } if (cpu->cfg.ext_zve32x) { gdb_register_coprocessor(cs, riscv_gdb_get_vector, riscv_gdb_set_vector, - ricsv_gen_dynamic_vector_feature(cs, cs->= gdb_num_regs), - 0); + ricsv_gen_dynamic_vector_feature(cs, cs->= gdb_num_regs)); } switch (mcc->def->misa_mxl_max) { case MXL_RV32: gdb_register_coprocessor(cs, riscv_gdb_get_virtual, riscv_gdb_set_virtual, - gdb_find_static_feature("riscv-32bit-virt= ual.xml"), - 0); + gdb_find_static_feature("riscv-32bit-virt= ual.xml")); break; case MXL_RV64: case MXL_RV128: gdb_register_coprocessor(cs, riscv_gdb_get_virtual, riscv_gdb_set_virtual, - gdb_find_static_feature("riscv-64bit-virt= ual.xml"), - 0); + gdb_find_static_feature("riscv-64bit-virt= ual.xml")); break; default: g_assert_not_reached(); @@ -381,7 +376,6 @@ void riscv_cpu_register_gdb_regs_for_features(CPUState = *cs) =20 if (cpu->cfg.ext_zicsr) { gdb_register_coprocessor(cs, riscv_gdb_get_csr, riscv_gdb_set_csr, - riscv_gen_dynamic_csr_feature(cs, cs->gdb= _num_regs), - 0); + riscv_gen_dynamic_csr_feature(cs, cs->gdb= _num_regs)); } } diff --git a/target/s390x/gdbstub.c b/target/s390x/gdbstub.c index 9ae715add4d..efdaaefa6d0 100644 --- a/target/s390x/gdbstub.c +++ b/target/s390x/gdbstub.c @@ -347,34 +347,33 @@ void s390_cpu_gdb_init(CPUState *cs) { gdb_register_coprocessor(cs, cpu_read_ac_reg, cpu_write_ac_reg, - gdb_find_static_feature("s390-acr.xml"), 0); + gdb_find_static_feature("s390-acr.xml")); =20 gdb_register_coprocessor(cs, cpu_read_fp_reg, cpu_write_fp_reg, - gdb_find_static_feature("s390-fpr.xml"), 0); + gdb_find_static_feature("s390-fpr.xml")); =20 gdb_register_coprocessor(cs, cpu_read_vreg, cpu_write_vreg, - gdb_find_static_feature("s390-vx.xml"), 0); + gdb_find_static_feature("s390-vx.xml")); =20 gdb_register_coprocessor(cs, cpu_read_gs_reg, cpu_write_gs_reg, - gdb_find_static_feature("s390-gs.xml"), 0); + gdb_find_static_feature("s390-gs.xml")); =20 #ifndef CONFIG_USER_ONLY gdb_register_coprocessor(cs, cpu_read_c_reg, cpu_write_c_reg, - gdb_find_static_feature("s390-cr.xml"), 0); + gdb_find_static_feature("s390-cr.xml")); =20 gdb_register_coprocessor(cs, cpu_read_virt_reg, cpu_write_virt_reg, - gdb_find_static_feature("s390-virt.xml"), 0); + gdb_find_static_feature("s390-virt.xml")); =20 if (kvm_enabled()) { gdb_register_coprocessor(cs, cpu_read_virt_kvm_reg, cpu_write_virt_kvm_reg, - gdb_find_static_feature("s390-virt-kvm.xm= l"), - 0); + gdb_find_static_feature("s390-virt-kvm.xm= l")); } #endif } diff --git a/target/sparc/gdbstub.c b/target/sparc/gdbstub.c index 792bf70a145..2874ce1b350 100644 --- a/target/sparc/gdbstub.c +++ b/target/sparc/gdbstub.c @@ -271,20 +271,16 @@ void sparc_cpu_register_gdb_regs(CPUState *cs) #if defined(TARGET_ABI32) || !defined(TARGET_SPARC64) gdb_register_coprocessor(cs, sparc_fpu_gdb_read_register, sparc_fpu_gdb_write_register, - gdb_find_static_feature("sparc32-fpu.xml"), - 0); + gdb_find_static_feature("sparc32-fpu.xml")); gdb_register_coprocessor(cs, sparc_cp0_gdb_read_register, sparc_cp0_gdb_write_register, - gdb_find_static_feature("sparc32-cp0.xml"), - 0); + gdb_find_static_feature("sparc32-cp0.xml")); #else gdb_register_coprocessor(cs, sparc_fpu_gdb_read_register, sparc_fpu_gdb_write_register, - gdb_find_static_feature("sparc64-fpu.xml"), - 0); + gdb_find_static_feature("sparc64-fpu.xml")); gdb_register_coprocessor(cs, sparc_cp0_gdb_read_register, sparc_cp0_gdb_write_register, - gdb_find_static_feature("sparc64-cp0.xml"), - 0); + gdb_find_static_feature("sparc64-cp0.xml")); #endif } --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158124; cv=none; d=zohomail.com; s=zohoarc; b=APiY18rpFPEBE/cyZubpO+WFtWjfSQngyM//kYwR5VcHoHF91n6JwvbkoehZptYd7Qc1X3hGgV4yt9ce0yjN29jlS9g2jTkl9MtWCNKD0Y5MlDwKX0okM+O0oi00nwhZMT1Qt+efI3dL9DWYciLJkP7dAlJ1Fu7Um+DhwGyKXKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158124; 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=2BJTest1a3cNWKq4Nrr1+dAp93rwCNK3uFyM4eX7U/M=; b=A8eukmeOcssw45+Z5MgSm5rXR8CzpkMQ7dBP1KK/oP0GJv74+eiOFw8d2eFKye4YyD+8v/LjaHf05z4Hz66sE3qwpY1hEONCcRwVsyeg40HVBCq+pL0r2kZl4/NLHeVR5LxQwWrLw0k+sbHnscyNc9JhzEx9bUrIpZMHJlGBLUo= 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 1773158124899803.5860497096359; Tue, 10 Mar 2026 08:55:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzPp-0003nb-5V; Tue, 10 Mar 2026 11:54:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzzPj-0003CF-O6 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:31 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzzPh-0006cv-GY for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:31 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-48535a0ef86so22863715e9.1 for ; Tue, 10 Mar 2026 08:54:29 -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-4853149caffsm104944765e9.1.2026.03.10.08.54.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158067; x=1773762867; 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=2BJTest1a3cNWKq4Nrr1+dAp93rwCNK3uFyM4eX7U/M=; b=xQS1gKVHvJpx70k4XZHmbqfyCC6oYZ3gA1WN8tPkxO6/ZRt9tKIxmP9FwdRzy8daJ3 fpzEuaalV9RyUmznnRERFquHHWXh59JN7nGnK45QHTZxMiT0gNAizQI92hLrzW1UZmWU N2JvjiYBg5zBIeXU8PBoz4ClFhbAeeHzaVLw4+DTSJe1fqjOixrFSOnrBr1DEv4jEexf H0GZhsYgwuH4pfnypoWnfVswUjnjqfyrSsmaSPCIn7XyaCfU3llneujFNgkfWmW1pDW0 Og5lzkI7hE4423gfrLD+Ja3ppDS8IxqRkuiRWlljemTL/a80CVAJkMQHZ1VN85A5xCnT JYRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158067; x=1773762867; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2BJTest1a3cNWKq4Nrr1+dAp93rwCNK3uFyM4eX7U/M=; b=cDiFcQxBf5jouQpvTIiJ2/3RyN+oEJepGYBasBZj+Ajdl82lqRvFJ4FmLHzOWSH7ni 33OSLUGDDI94FDgkqcIh7QkxmglnbIpfolj7CHWAguEjftdV1YVj/e5HmrmLUZtnFXR0 uV/CwEvlFF4Wr7IilBjcAS+RNFptryyYajIk782Ls2DoOoAhzzP0vzJ7o18zDepQLnDp Kp1OdKfUvRc3U1vNofUGYMG+CpWH9OwKFEo2hQdqiBHW34pP04ZKR/tawzavw1dKkfjC Jk4mldMQiG69lQVC2+WKg9jtfRvLfe1D37Z22O72nJxSYeJ8EHei6ZeL0ZWjCck6v9jT nOoA== X-Gm-Message-State: AOJu0Yx0hsIyRe8hHj2XF55eFcQ8A9zTT/S2iBUKK6StofkodK09cZnU K3K8F7JYuri5H9GchWhmgZOSdmjirQSBBxY/4ZhMOSQZAhFqQvObDqUJPWPBgyFUkc/e7A3ehIm GxUM/HZA= X-Gm-Gg: ATEYQzxnSSIwIN7JkIGM/NAmQgxp4zrny+4XXCvWHbCbCKP5OGGJz9UeyFiS89YN+Ri OBIoZyoSHjwjLV38qaJcwnr8IjDhFhy6G513xs1EZtgJlqIDfxsUJ3GbceZyqXt3Yh204vpNj7P OnUuz61yMg04nDgnreqoJIDuOTr6756519OTK9IkQUBq0wqBVnXSdpyy+sJpi5aDftrrZZEP5Wn tSXq5A4DlA2UQiPTu3LKD195fHM+7uwPEoBR8C8n6bOKPEnNKx26Pnr0/8DSQZ/4CGGyaNC/78y THL5m/AQXiaL+Vgc8ZQgUqJ+N5oQQfi9rRGhb4qSwpkNCe/xV+jLe7GxJx7UZ/Kk4LSCvhYZ/ij ri9R0sCwh3L2ymlIlpfzG9T1jMCwudmmyYGAIHm9QNnLD7lJc5lkLZBpfiFz6JeR7IALU8nuyxS k/TjCy9eCTo5cpTgmE75v6hpuk8FjV46IEMQDV1NwngQYZ196WotcPrbiVs7i7UZSIk+a4zoG1b T3MEz2qh4k= X-Received: by 2002:a05:600c:1e88:b0:477:6d96:b3e5 with SMTP id 5b1f17b1804b1-48526916beamr283774855e9.7.1773158067340; Tue, 10 Mar 2026 08:54:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 08/13] gdbstub: Emit base_register index in GDBFeature entries Date: Tue, 10 Mar 2026 16:53:24 +0100 Message-ID: <20260310155329.48772-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1773158126870154100 Record the base register index in the generated C file. Check at runtime that either @g_pos argument of gdb_register_coprocessor() is zero, or it the base register index. This change pass 'make check-tcg' test suite, which runs the tests/tcg/multiarch/gdbstub/registers.py test, itself calling gdb_register_coprocessor() for each target tested. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/exec/gdbstub.h | 1 + scripts/feature_to_c.py | 1 + 2 files changed, 2 insertions(+) diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 79e47a024ec..75eb4d9c365 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -6,6 +6,7 @@ typedef struct GDBFeature { const char *xml; const char *name; const char * const *regs; + int base_reg; int num_regs; } GDBFeature; =20 diff --git a/scripts/feature_to_c.py b/scripts/feature_to_c.py index 1329695ad04..a52cd2e9ec6 100644 --- a/scripts/feature_to_c.py +++ b/scripts/feature_to_c.py @@ -102,6 +102,7 @@ def writeliteral(indent, bytes): sys.stdout.write(',\n') =20 sys.stdout.write( ' },\n') + sys.stdout.write(f' .base_reg =3D {base_reg},\n') sys.stdout.write(f' .num_regs =3D {num_regs},\n') sys.stdout.write( ' },\n') =20 --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158152; cv=none; d=zohomail.com; s=zohoarc; b=aa+YJKyp1vDkK79uui1iesjRaopL1+PAoqL3Q+a1QTaB2nhMajaAIeFWL2YvJdqmNZ2xx4ayS6ouTct3N664pGm9vayNGsCKlz8chcPabMCXT0ruDdeNOEMDBP1zaeb6HNKWiinl+ybsMXnoqMCMJz1FdsOeA7O5evKhwwxK9pQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158152; 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=YW+XYGQCeSgcIjfg8jHdlieGTiidwq557ZHdo7cIdpE=; b=ED1e49Oq7d12S3QrGDG4oNb1p6/QlPLSC3+Em6LiatXGOIGWaWLKv3XzmqxP4EICFioebG8fowdgDbirvCAzQN46Rch0BWUDFqw0ePktUXRxaeZLhTtTXDyLppR39f/kCjkh/kzW0FRnkU/TttMZrmSW+zdWDH1Z8Kn/e7JAQyU= 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 1773158152876782.7557902783424; Tue, 10 Mar 2026 08:55:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzPr-00040T-C2; Tue, 10 Mar 2026 11:54: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 1vzzPp-0003tR-UI for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:37 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzzPo-0006eP-4A for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:37 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-485445e80bdso7372655e9.0 for ; Tue, 10 Mar 2026 08:54: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-48541aa73easm81204435e9.3.2026.03.10.08.54.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:54:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158074; x=1773762874; 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=YW+XYGQCeSgcIjfg8jHdlieGTiidwq557ZHdo7cIdpE=; b=IuNqx570Uj1/iRPc7C4fEdxLXTSSErrj7x3Dlh0J0h8QhU/HND9CWe+sKbexNxRTZZ I4LHTRLnyEHhSgtcybPo1HPJlOq35b5Mufp/sPC73uGjPxPPs4IUWHH2OQj//hP4htpc annxaP8hQmrclsunBcnK/S1rVZMgJaKpcPpMiHX2S9Db6MAfXrspsixVSLXdIWWeBM+W V9vxyjgrAdJJy6vomWWEZR1V3/EFpz0Zf8sTEwIMWicWGVX+67x7OKOYUIzDkBaLQwJl YgA/kSrwmfrPBZsPH8SmZ6H+kvsq6i5lVRhDGCtKSehLesu9YaEv6qiRdIVcFcYAGnHJ CoLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158074; x=1773762874; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YW+XYGQCeSgcIjfg8jHdlieGTiidwq557ZHdo7cIdpE=; b=v6iTMhkb6idpbioMNGNQN8H5DtPoPpWyMybGYkFg93PmAnEF4BM9zBxCU1b/bInPsz IXPAAxvJ+gOkBwDKZWqkLLKFAnJ74mx5TLUyb0YxlCah8OMdjJ0gXY7bBl13E0naR5gP ebIa5/RCYWaCgyqPRRK3Wu6M12IIiYpflism6gyGWKHaNGWiTo9j07WK1HDGCOXJ6ciY JBKy7m5F6EIkgrcDScwMzBG0DJYYvfmiHezJ9gh3Dhh9PL/TBCCwt33KJvti5XJpI9Z6 dAYtJFDNUQ9sz1F/+EVKkFno9lFvMCAtxzjrf86sVrQ38OtbsYSCRHowM3t7On40np+Q JiPQ== X-Gm-Message-State: AOJu0Ywe2fYSR3K72pks+vla4d/zNmuEYtWOG2FrEh6T1w9aSr6cblnF HEEHQZ4PzdTOUKAWHRl2Hk9Xx7miJOUpJIA4O+JoTt8PmGYW/zEe24GcRI+SyJvlmJS3WRwsReo YE3JOeA8= X-Gm-Gg: ATEYQzxYoxWsVrwpiPm31O4Ii/MIx9DQW+gX8jl/6/DjBHEt05qjUerRxTTuIG9i+u4 vFltACeN2U8LSYi1UPNnihzd1e7wsh6FMDe3DrwyYm5s0ZSsLrJbzrU1wrK++xQmlgx1Ln7LQTt wjGFJ7x+swXlm8fxZeobScKjFL9j3IX2cEO3PBnuyfmZ7M2FPDPHIqHTDSXwrkWgsZcPKpVxgDO Aa0RHlUm0gmqVzZJKEU+5DXbwSNaQM9VL6IO4nsHDiuj5veSJkOXN25p6NQbbJQvjGYa7oavxPT Ea0bP5qmXgybIpUjDUOs9kKb7KaiVUsXdRBr+zUQ6XpL14JHdfG/LzvySj3awcc7rrYBFsOXqJw dCZGjDr347CIATPIGrfDIwv/zel5nb4sniQ4Kk9MLo0WXdKaUuw5FQvCTfFMrkYKipO8jtiZfdb XUAW+5CdZq7VMF/GDalw2fYWyDO0TKd+gOa/yqUdIJF0J+HO35an5XiLZqI06mvw9RqMuSJcxm X-Received: by 2002:a05:600c:4e8f:b0:485:3f65:94a1 with SMTP id 5b1f17b1804b1-4853f6596b4mr102730635e9.18.1773158074142; Tue, 10 Mar 2026 08:54:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 09/13] gdbstub: Use GDBFeature::base_reg in gdb_register_feature() Date: Tue, 10 Mar 2026 16:53:25 +0100 Message-ID: <20260310155329.48772-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: qemu development 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: 1773158153306154100 When a feature XML file provides a "regnum=3D" tag to indicate the registers base index, respect it, as it might not be the same as our current number of registered entries, in particular when there are gaps. This fixes a bug with the "power-fpu.xml" file [*] which was loaded at index 70 while the base register is 71. This latent bug was exposed by commit 1ec0fbe2dda ("target/ppc: Fix CPUClass::gdb_num_core_regs value"). [*] https://lore.kernel.org/qemu-devel/e44df309-d40d-46f0-88a8-7ac55f9a3634= @fhofhammer.de/ Reported-by: Florian Hofhammer Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- gdbstub/gdbstub.c | 16 ++++++++++------ gdbstub/trace-events | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index ad4bdc0623d..6976f31933f 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -556,19 +556,19 @@ int gdb_write_register(CPUState *cpu, uint8_t *mem_bu= f, int reg) return 0; } =20 -static void gdb_register_feature(CPUState *cpu, int base_reg, +static void gdb_register_feature(CPUState *cpu, gdb_get_reg_cb get_reg, gdb_set_reg_cb se= t_reg, const GDBFeature *feature) { GDBRegisterState s =3D { - .base_reg =3D base_reg, + .base_reg =3D feature->base_reg, .get_reg =3D get_reg, .set_reg =3D set_reg, .feature =3D feature }; =20 trace_gdbxml_register_feature(feature->name, feature->xmlname, - base_reg, feature->num_regs); + feature->base_reg, feature->num_regs); g_array_append_val(cpu->gdb_regs, s); } =20 @@ -597,7 +597,8 @@ void gdb_init_cpu(CPUState *cpu) if (xmlfile) { assert(!cc->gdb_num_core_regs); feature =3D gdb_find_static_feature(xmlfile); - gdb_register_feature(cpu, 0, + assert(feature->base_reg =3D=3D 0); + gdb_register_feature(cpu, cc->gdb_read_register, cc->gdb_write_register, feature); cpu->gdb_num_regs =3D cpu->gdb_num_g_regs =3D feature->num_regs; @@ -617,7 +618,6 @@ void gdb_register_coprocessor(CPUState *cpu, { GDBRegisterState *s; guint i; - int base_reg =3D cpu->gdb_num_regs; =20 for (i =3D 0; i < cpu->gdb_regs->len; i++) { /* Check for duplicates. */ @@ -627,7 +627,11 @@ void gdb_register_coprocessor(CPUState *cpu, } } =20 - gdb_register_feature(cpu, base_reg, get_reg, set_reg, feature); + if (cpu->gdb_num_regs < feature->base_reg) { + trace_gdbxml_register_coprocessor_gap(cpu->gdb_num_regs, + feature->base_reg); + } + gdb_register_feature(cpu, get_reg, set_reg, feature); =20 /* Add to end of list. */ cpu->gdb_num_regs +=3D feature->num_regs; diff --git a/gdbstub/trace-events b/gdbstub/trace-events index 44ef3339934..7036818a387 100644 --- a/gdbstub/trace-events +++ b/gdbstub/trace-events @@ -29,6 +29,7 @@ gdbstub_err_checksum_incorrect(uint8_t expected, uint8_t = got) "got command packe gdbstub_err_unexpected_runpkt(uint8_t ch) "unexpected packet (0x%02x) whil= e target running" =20 gdbxml_init_cpu(const char *typename, unsigned id, unsigned gdb_num_regs, = unsigned gdb_num_g_regs, unsigned gdb_num_core_regs) "%s:%d regs:%u g_regs:= %u core_regs:%u" +gdbxml_register_coprocessor_gap(unsigned gdb_num_regs, unsigned base_reg) = "regs %u -> %u" gdbxml_register_feature(const char *featname, const char *xmlname, unsigne= d base_reg, unsigned num_regs) "%s (%s) @%u +%u" gdbxml_feature_builder_header(const char *name, const char *xmlname, int n= um_regs) "%s (%s) regs:%d" gdbxml_feature_builder_content(const char *xml) "%s" --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158103; cv=none; d=zohomail.com; s=zohoarc; b=Utt7yQys6WJo+JHPtsRE1/Dj7vgjw9yFRa9jHDXuK74uCFIik7nMKCiO9nnO0G7EFqd/IM9RBxhVDsVbXnfvOgsQw7A6LZJy5jboGrmBeHJMguJ1npshV/6yo21ol1gQZJ5Fq4MdxlAyV82zmJLJqoVGiAV/uYN1KtKjMBh7ITY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158103; 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=9C2vZcOnycahYVmKRiW0cgrjpEH0GI7TXcNCfNbnBP4=; b=i2r2AyhXHJq9F/T2PPBKhCZCsRqCWk2GGy2aAbvHyzjfE+QcHXC1Fwx3y7gDcc56Zwgz+LQocxMlt7s5kagNjt2cMXSD/b3S+NtsuhYlMdxco3qSC7dK6A2pLqshwSXB2B+WHvSnIYZ4QLH9Zyj9KGs+bHlGVX0NgGmQHvim1d0= 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 1773158103840966.626816518935; Tue, 10 Mar 2026 08:55:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzPx-0004aP-Tb; Tue, 10 Mar 2026 11:54:45 -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 1vzzPw-0004X6-VV for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:44 -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 1vzzPv-0006fe-8o for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:44 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4852ff06541so33502495e9.2 for ; Tue, 10 Mar 2026 08:54:42 -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-4853927825csm66749545e9.9.2026.03.10.08.54.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:54:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158081; x=1773762881; 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=9C2vZcOnycahYVmKRiW0cgrjpEH0GI7TXcNCfNbnBP4=; b=bOy1DeJomN4sKs9/v6KnpoRhIjEqC5N5pnueB2T1VhUc/f7TUSlWJcauCHwhJkw6qN T7y4VEUxD9yFpXDEvDcJ+ySuzsCBgOpptntmPepl3YLDtADGICuX6C7QlxDe7rkD6TNW ELLaymfNct+x/FHmB+XU2ZfqPTzzUl8YXWivXJIyF0wdShXQbkX4LskDzKn9RscGOo9w QAqzDxmKo7Ty+7RLhahAixtbJGvFAqZqXSf9ritTH92vsgvR906dAysJ4inZFp18aDsE nPbIxxHI/gPrNrprkPH0CSXLJo0IjSWGkkJLUsqjXthqKOayiDQp3+1eYYCRZFTV40Ne DVoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158081; x=1773762881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9C2vZcOnycahYVmKRiW0cgrjpEH0GI7TXcNCfNbnBP4=; b=kL9TiGfOLa0xbmNmxLD2hDo/rqS3dBDP4xxbgVfCvCnyH3ywyjZzWylctsF9HrHpY4 Y9438/RHV51eQBoaX8DgddNbT+x6r3nl4rKQJ3pBut2Vk94h2R1jwh35BkS4Y0DZYgiK Kj+ju3Bvy4xAUibIrzYOMrTyf0ZP7yWWpwO3DfwS7sbeqCYYedVi5oBt1rJ34GLX6IiH CBGN0aTIOMj6uairbjUR5wy1XIyHUPkziDmv7qFY13cXelkxYiQRZ4EFEduE96oC0LZ0 dumC49pS+ssta+ZBaQ8UQtzQRAHzemEAruOjWEjMfHkIVpeXXlGxK6QQWxadWOPICjoG pNDg== X-Gm-Message-State: AOJu0YxgABGwyYJcv183pp+bZnMOUVT1O4MqnfZNBKRi2uLZZkCrLx/T +wcg/oYzOmKhsSC+39VCwRXqXNWvRIVdASWXm4a0kUDiJ1N0NBCPj7f8c+o0vjlhDm9fO/MUuTZ kT7TBqlk= X-Gm-Gg: ATEYQzzPlKT3FdRn0aowYSRfztozbdZTtIQ8Kmr69LYLLMPg1L0pDI80X534fLjpN5k nfwK+lqv/h25HEe1D5bUl0YUYNzUOO7B1nGbA4jprvDQBTcCGSPZBkfp2Vx12fFeq/ZTxIs73QK IFsNDp6eQET5+xknMy7BUGIAkaZtn1Ss1As2clo7wThYAv9R5pkw8ZPBlvdnlsL5gP3Oc3IJ29v 5C8Pyba2gRoDh6rBaHXd7O+nUJkGF1FPq4GQnKXZL+RwfgCfsDMIlFouPcgDj4v0FLXt2euXZIO KBNm1lLOlJq7qEDAftL0uHOBpu2l1nAnFCZIzXQi8r5zbSeQQrn8bZwhC+K1eVaAfKvuqwmswdq KWx5pb4eBsOIno7VcAzU0xSkJA54q7Bce3rgqAtMI7RUjOEiFREi9fwEGCtsuAq94wcPF4uLtyF Md/Lz0X5aVTumneVt69Tel6kyjr6Fota0tp5QWTnRaKLh8pjqxpAX/tk6i5Z7Q4TwqTdG+feoc X-Received: by 2002:a05:600c:1c25:b0:485:3e6c:aacb with SMTP id 5b1f17b1804b1-4853e6cae44mr116714075e9.4.1773158081290; Tue, 10 Mar 2026 08:54:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 10/13] gdbstub: Remove GDBRegisterState::base_reg Date: Tue, 10 Mar 2026 16:53:26 +0100 Message-ID: <20260310155329.48772-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1773158106451154100 @base_reg is always provided by GDBFeature, which is referenced by GDBRegisterState. Deref and remove GDBRegisterState::base_reg field. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- gdbstub/gdbstub.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 6976f31933f..6abc8a85eb3 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -50,7 +50,6 @@ #include "internals.h" =20 typedef struct GDBRegisterState { - int base_reg; gdb_get_reg_cb get_reg; gdb_set_reg_cb set_reg; const GDBFeature *feature; @@ -511,7 +510,7 @@ GArray *gdb_get_register_list(CPUState *cpu) for (int i =3D 0; i < r->feature->num_regs; i++) { const char *name =3D r->feature->regs[i]; GDBRegDesc desc =3D { - r->base_reg + i, + r->feature->base_reg + i, name, r->feature->name }; @@ -524,7 +523,8 @@ GArray *gdb_get_register_list(CPUState *cpu) =20 int gdb_read_register(CPUState *cpu, GByteArray *buf, int reg) { - GDBRegisterState *r; + const GDBRegisterState *r; + unsigned base_reg; =20 if (reg < cpu->cc->gdb_num_core_regs) { return cpu->cc->gdb_read_register(cpu, buf, reg); @@ -532,8 +532,9 @@ int gdb_read_register(CPUState *cpu, GByteArray *buf, i= nt reg) =20 for (guint i =3D 0; i < cpu->gdb_regs->len; i++) { r =3D &g_array_index(cpu->gdb_regs, GDBRegisterState, i); - if (r->base_reg <=3D reg && reg < r->base_reg + r->feature->num_re= gs) { - return r->get_reg(cpu, buf, reg - r->base_reg); + base_reg =3D r->feature->base_reg; + if (base_reg <=3D reg && reg < base_reg + r->feature->num_regs) { + return r->get_reg(cpu, buf, reg - base_reg); } } return 0; @@ -541,7 +542,8 @@ int gdb_read_register(CPUState *cpu, GByteArray *buf, i= nt reg) =20 int gdb_write_register(CPUState *cpu, uint8_t *mem_buf, int reg) { - GDBRegisterState *r; + const GDBRegisterState *r; + unsigned base_reg; =20 if (reg < cpu->cc->gdb_num_core_regs) { return cpu->cc->gdb_write_register(cpu, mem_buf, reg); @@ -549,8 +551,9 @@ int gdb_write_register(CPUState *cpu, uint8_t *mem_buf,= int reg) =20 for (guint i =3D 0; i < cpu->gdb_regs->len; i++) { r =3D &g_array_index(cpu->gdb_regs, GDBRegisterState, i); - if (r->base_reg <=3D reg && reg < r->base_reg + r->feature->num_re= gs) { - return r->set_reg(cpu, mem_buf, reg - r->base_reg); + base_reg =3D r->feature->base_reg; + if (base_reg <=3D reg && reg < base_reg + r->feature->num_regs) { + return r->set_reg(cpu, mem_buf, reg - base_reg); } } return 0; @@ -561,7 +564,6 @@ static void gdb_register_feature(CPUState *cpu, const GDBFeature *feature) { GDBRegisterState s =3D { - .base_reg =3D feature->base_reg, .get_reg =3D get_reg, .set_reg =3D set_reg, .feature =3D feature --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158169; cv=none; d=zohomail.com; s=zohoarc; b=mNE9cs2+YOI83X/VXCVWlII8pUoJk3LTpQhQ/6bz02jJIOqR22TkOPL27u5AL94uojnaDky7cjLZ9/1vTq4jSrrDGYhfSrFKsQ7ek6Zh+5NaBxQOHdaAUq1Dtmu8Wa9OBCUdgcqC1dJd6QCxbx0L/ALG6JeKS+qqLl/xhfz3CVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158169; 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=z8Vz/ciWV44A1kCCSsyBSXM8t9CCkvptX5aWX76jOyc=; b=YuaIX5qRupGiuBVr7Kws0XlNxl99r2simKj8rhkRVy07imNZ5FqKyLbHb7AATHSrPIQwsKEjZMEC4eGFLAVqu+fC8zFKpoQ0Wk3A0L1UpUHo2HahzWNxBCF38xskxSjMhLqj9EOs9lUuUI4c3Iqn0XI1a5NrGy5lxj0h1FkHHKg= 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 1773158169785978.9479187042002; Tue, 10 Mar 2026 08:56:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzQ8-0004rF-GF; Tue, 10 Mar 2026 11:54:56 -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 1vzzQ6-0004no-N7 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:54 -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 1vzzQ2-0006gm-6f for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:54:54 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-485345e1013so48575e9.1 for ; Tue, 10 Mar 2026 08:54: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-48541b6f6b7sm111293655e9.9.2026.03.10.08.54.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158088; x=1773762888; 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=z8Vz/ciWV44A1kCCSsyBSXM8t9CCkvptX5aWX76jOyc=; b=t3WxDlZDeLyz3XNzh6MICtNM55QX1p6/3HiE63NmHwpiWB8cCoMuCjdQWk/6mnROQH IoSQnGzArZJRA+WYv6HgaxkNnIoP/8PRTmTCY63XqOnIouVhGOlOUTgdhalk221bDKGT lXsY1sJ++/mQXiD2I3IfbcWFfcFS/XtO3+rTA5c7HrfDebxxWdstgd8AaWGxQKT2qVUl zKsleqfG+xsOJQoL8b9C1yoGwTr125wUm9JTbkQf138FnUc0xRyZ+PFoCSs2zflBuMaM Ib+Ts9f7zE4K+yDhmIjeCEvYfT76s8AdLy1ytUs8r3coKSGWjoZFiXIksbvAng78kiGT AHaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158088; x=1773762888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=z8Vz/ciWV44A1kCCSsyBSXM8t9CCkvptX5aWX76jOyc=; b=T0W/yMDlcUZWVropbOErP+LMwyWnJCo4hS8UvxlMBdFhvezIFc30StaR9/gH8yTB5p DEcLcNkFSOi/VHbGarbWlekiqzFSDVkv7XLm5MZ1ckbbPqD/F5veqaJ9AqdLVshUgRKz i0PO2CqdS9SsOmSfSrE6qHUnphna888AGCJQgiWbcf0PvUkcNVVA/XT4F8G0E8SYsGVR d1XfDxQg2YAbn2vvB35tSsljlIlHW2XTBGmBz5hHdW4v8kXbV772WeWDArJLH9bq/hfJ m2tPUyYFHhHv6LdOEN+gamlWL+hUvQvcr1ubk6WpQ7lSOlpW1hT6a3p2aaSfE2TT5wgk Vn4w== X-Gm-Message-State: AOJu0Yxh7InMvA6iyjMBNVhIJFycQzP1Mmc36zDiDhTtoe9Ka9FMekVb ELbhuKroBYSJCwKBEZ5yvv3m7lvLh9by7RsBVlkGUcnpzD3P4zTxLRBS0bfdhH2pkf/z6csQcBj bqw5Rm4g= X-Gm-Gg: ATEYQzxePsuxIM/odRS31wQc/bn7SSdqHkM9DbqpHCjxwrNZ6/DXJQA31V7+N2lIW+i R2P6Z88aokXoDXdhbU8VbshNgWOx22FVyEHkwo2lwSkfi6IrI0cME/c4whRPGXFzJkMO6XqUsUi gwUF9jaPCsdr/4DPfyAWdkMNK7yf9MaTHPGz8sitwz2cIv8xmNuAO681CeKV4pJN6gHY/Wmdiqz HokuC+svMFXC5oYAXqBQCdCP2nTLUctkKGF+Leg8nIGNcpWPfZU+VzyVYC36Ol/bEkt7bg+p6ND aTVBg17T3pdszDMijimK7DMRH3O4l9uTkVLJalCiUpoMICicZ27AKYt8QUIDeN5PhuJCTlU9LPN /sJm3RYK79Uj6htl+gJwCTqpOdia9EklS8HS8xvIyyMUq2BnZacLPkD9w9eQUG8A28QvxU+LueJ jLGzav6oWg05PCKaObultrC3Fgg9ucZuPm35v1/E6L+VV39MdfINx1K31Jdenb09aTeBBcCHWz8 zQojBCxufk= X-Received: by 2002:a05:600c:1d04:b0:485:3428:774c with SMTP id 5b1f17b1804b1-485419a286cmr66849905e9.4.1773158088075; Tue, 10 Mar 2026 08:54:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 11/13] gdbstub: Remove 'gdb-xml/' directory prefix in TARGET_XML_FILES Date: Tue, 10 Mar 2026 16:53:27 +0100 Message-ID: <20260310155329.48772-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1773158171795158500 All GDB XML files are in the gdb-xml/ directory. No need to be so verbose in TARGET_XML_FILES, let meson prepend the directory. Except meson.build lines, this is a mechanical change done running: $ sed -i -e s,gdb-xml/,,g $(git grep -l gdb-xml configs/targets/) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Warner Losh Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Acked-by: Alex Benn=C3=A9e --- configs/targets/aarch64-bsd-user.mak | 2 +- configs/targets/aarch64-linux-user.mak | 2 +- configs/targets/aarch64-softmmu.mak | 2 +- configs/targets/aarch64_be-linux-user.mak | 2 +- configs/targets/alpha-linux-user.mak | 2 +- configs/targets/alpha-softmmu.mak | 2 +- configs/targets/arm-bsd-user.mak | 2 +- configs/targets/arm-linux-user.mak | 2 +- configs/targets/arm-softmmu.mak | 2 +- configs/targets/armeb-linux-user.mak | 2 +- configs/targets/avr-softmmu.mak | 2 +- configs/targets/hexagon-linux-user.mak | 2 +- configs/targets/i386-bsd-user.mak | 2 +- configs/targets/i386-linux-user.mak | 2 +- configs/targets/i386-softmmu.mak | 2 +- configs/targets/loongarch64-linux-user.mak | 2 +- configs/targets/loongarch64-softmmu.mak | 2 +- configs/targets/m68k-linux-user.mak | 2 +- configs/targets/m68k-softmmu.mak | 2 +- configs/targets/microblaze-linux-user.mak | 2 +- configs/targets/microblaze-softmmu.mak | 2 +- configs/targets/microblazeel-linux-user.mak | 2 +- configs/targets/or1k-linux-user.mak | 2 +- configs/targets/or1k-softmmu.mak | 2 +- configs/targets/ppc-linux-user.mak | 2 +- configs/targets/ppc-softmmu.mak | 2 +- configs/targets/ppc64-linux-user.mak | 2 +- configs/targets/ppc64-softmmu.mak | 2 +- configs/targets/ppc64le-linux-user.mak | 2 +- configs/targets/riscv32-linux-user.mak | 2 +- configs/targets/riscv32-softmmu.mak | 2 +- configs/targets/riscv64-bsd-user.mak | 2 +- configs/targets/riscv64-linux-user.mak | 2 +- configs/targets/riscv64-softmmu.mak | 2 +- configs/targets/rx-softmmu.mak | 2 +- configs/targets/s390x-linux-user.mak | 2 +- configs/targets/s390x-softmmu.mak | 2 +- configs/targets/sparc-linux-user.mak | 2 +- configs/targets/sparc-softmmu.mak | 2 +- configs/targets/sparc32plus-linux-user.mak | 2 +- configs/targets/sparc64-linux-user.mak | 2 +- configs/targets/sparc64-softmmu.mak | 2 +- configs/targets/x86_64-bsd-user.mak | 2 +- configs/targets/x86_64-linux-user.mak | 2 +- configs/targets/x86_64-softmmu.mak | 2 +- meson.build | 6 +++++- 46 files changed, 50 insertions(+), 46 deletions(-) diff --git a/configs/targets/aarch64-bsd-user.mak b/configs/targets/aarch64= -bsd-user.mak index 03979d82402..814ed2d8bfe 100644 --- a/configs/targets/aarch64-bsd-user.mak +++ b/configs/targets/aarch64-bsd-user.mak @@ -1,4 +1,4 @@ TARGET_ARCH=3Daarch64 TARGET_BASE_ARCH=3Darm -TARGET_XML_FILES=3D gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-x= ml/aarch64-pauth.xml gdb-xml/aarch64-mte.xml gdb-xml/aarch64-sme2.xml +TARGET_XML_FILES=3D aarch64-core.xml aarch64-fpu.xml aarch64-pauth.xml aar= ch64-mte.xml aarch64-sme2.xml TARGET_LONG_BITS=3D64 diff --git a/configs/targets/aarch64-linux-user.mak b/configs/targets/aarch= 64-linux-user.mak index bf328b3b80c..ddfacc092dd 100644 --- a/configs/targets/aarch64-linux-user.mak +++ b/configs/targets/aarch64-linux-user.mak @@ -1,6 +1,6 @@ TARGET_ARCH=3Daarch64 TARGET_BASE_ARCH=3Darm -TARGET_XML_FILES=3D gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-x= ml/aarch64-pauth.xml gdb-xml/aarch64-mte.xml gdb-xml/aarch64-sme2.xml +TARGET_XML_FILES=3D aarch64-core.xml aarch64-fpu.xml aarch64-pauth.xml aar= ch64-mte.xml aarch64-sme2.xml TARGET_HAS_BFLT=3Dy CONFIG_SEMIHOSTING=3Dy CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy diff --git a/configs/targets/aarch64-softmmu.mak b/configs/targets/aarch64-= softmmu.mak index d14bcfc4900..9a20187e2c1 100644 --- a/configs/targets/aarch64-softmmu.mak +++ b/configs/targets/aarch64-softmmu.mak @@ -1,7 +1,7 @@ TARGET_ARCH=3Daarch64 TARGET_BASE_ARCH=3Darm TARGET_KVM_HAVE_GUEST_DEBUG=3Dy -TARGET_XML_FILES=3D gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-x= ml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sy= sregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-prof= ile-mve.xml gdb-xml/aarch64-pauth.xml gdb-xml/aarch64-sme2.xml +TARGET_XML_FILES=3D aarch64-core.xml aarch64-fpu.xml arm-core.xml arm-vfp.= xml arm-vfp3.xml arm-vfp-sysregs.xml arm-neon.xml arm-m-profile.xml arm-m-p= rofile-mve.xml aarch64-pauth.xml aarch64-sme2.xml # needed by boot.c TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D64 diff --git a/configs/targets/aarch64_be-linux-user.mak b/configs/targets/aa= rch64_be-linux-user.mak index 284430add7b..83209fa2ae5 100644 --- a/configs/targets/aarch64_be-linux-user.mak +++ b/configs/targets/aarch64_be-linux-user.mak @@ -1,7 +1,7 @@ TARGET_ARCH=3Daarch64 TARGET_BASE_ARCH=3Darm TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3D gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-x= ml/aarch64-pauth.xml gdb-xml/aarch64-mte.xml gdb-xml/aarch64-sme2.xml +TARGET_XML_FILES=3D aarch64-core.xml aarch64-fpu.xml aarch64-pauth.xml aar= ch64-mte.xml aarch64-sme2.xml TARGET_HAS_BFLT=3Dy CONFIG_SEMIHOSTING=3Dy CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy diff --git a/configs/targets/alpha-linux-user.mak b/configs/targets/alpha-l= inux-user.mak index 2f1312f0362..fbb9c680915 100644 --- a/configs/targets/alpha-linux-user.mak +++ b/configs/targets/alpha-linux-user.mak @@ -2,6 +2,6 @@ TARGET_ARCH=3Dalpha TARGET_SYSTBL_ABI=3Dcommon TARGET_SYSTBL=3Dsyscall.tbl TARGET_LONG_BITS=3D64 -TARGET_XML_FILES=3D gdb-xml/alpha-core.xml +TARGET_XML_FILES=3D alpha-core.xml TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy diff --git a/configs/targets/alpha-softmmu.mak b/configs/targets/alpha-soft= mmu.mak index 5c6af0eafc1..fb412d1b53f 100644 --- a/configs/targets/alpha-softmmu.mak +++ b/configs/targets/alpha-softmmu.mak @@ -1,5 +1,5 @@ TARGET_ARCH=3Dalpha TARGET_LONG_BITS=3D64 -TARGET_XML_FILES=3D gdb-xml/alpha-core.xml +TARGET_XML_FILES=3D alpha-core.xml TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy diff --git a/configs/targets/arm-bsd-user.mak b/configs/targets/arm-bsd-use= r.mak index 472a4f9fb11..b520819e776 100644 --- a/configs/targets/arm-bsd-user.mak +++ b/configs/targets/arm-bsd-user.mak @@ -1,3 +1,3 @@ TARGET_ARCH=3Darm -TARGET_XML_FILES=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-v= fp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-prof= ile.xml gdb-xml/arm-m-profile-mve.xml +TARGET_XML_FILES=3D arm-core.xml arm-vfp.xml arm-vfp3.xml arm-vfp-sysregs.= xml arm-neon.xml arm-m-profile.xml arm-m-profile-mve.xml TARGET_LONG_BITS=3D32 diff --git a/configs/targets/arm-linux-user.mak b/configs/targets/arm-linux= -user.mak index bf35ded7fea..3793782d067 100644 --- a/configs/targets/arm-linux-user.mak +++ b/configs/targets/arm-linux-user.mak @@ -1,7 +1,7 @@ TARGET_ARCH=3Darm TARGET_SYSTBL_ABI=3Dcommon,oabi TARGET_SYSTBL=3Dsyscall.tbl -TARGET_XML_FILES=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-v= fp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-prof= ile.xml gdb-xml/arm-m-profile-mve.xml +TARGET_XML_FILES=3D arm-core.xml arm-vfp.xml arm-vfp3.xml arm-vfp-sysregs.= xml arm-neon.xml arm-m-profile.xml arm-m-profile-mve.xml TARGET_HAS_BFLT=3Dy CONFIG_SEMIHOSTING=3Dy CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy diff --git a/configs/targets/arm-softmmu.mak b/configs/targets/arm-softmmu.= mak index 6a5a8eda949..35af7da79f2 100644 --- a/configs/targets/arm-softmmu.mak +++ b/configs/targets/arm-softmmu.mak @@ -1,5 +1,5 @@ TARGET_ARCH=3Darm -TARGET_XML_FILES=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-v= fp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-prof= ile.xml gdb-xml/arm-m-profile-mve.xml +TARGET_XML_FILES=3D arm-core.xml arm-vfp.xml arm-vfp3.xml arm-vfp-sysregs.= xml arm-neon.xml arm-m-profile.xml arm-m-profile-mve.xml # needed by boot.c TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D32 diff --git a/configs/targets/armeb-linux-user.mak b/configs/targets/armeb-l= inux-user.mak index 35fa4d91b3c..536bc95af71 100644 --- a/configs/targets/armeb-linux-user.mak +++ b/configs/targets/armeb-linux-user.mak @@ -2,7 +2,7 @@ TARGET_ARCH=3Darm TARGET_SYSTBL_ABI=3Dcommon,oabi TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-v= fp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-prof= ile.xml gdb-xml/arm-m-profile-mve.xml +TARGET_XML_FILES=3D arm-core.xml arm-vfp.xml arm-vfp3.xml arm-vfp-sysregs.= xml arm-neon.xml arm-m-profile.xml arm-m-profile-mve.xml TARGET_HAS_BFLT=3Dy CONFIG_SEMIHOSTING=3Dy CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy diff --git a/configs/targets/avr-softmmu.mak b/configs/targets/avr-softmmu.= mak index baf20fb7f2f..0a00f128749 100644 --- a/configs/targets/avr-softmmu.mak +++ b/configs/targets/avr-softmmu.mak @@ -1,4 +1,4 @@ TARGET_ARCH=3Davr -TARGET_XML_FILES=3D gdb-xml/avr-cpu.xml +TARGET_XML_FILES=3D avr-cpu.xml TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy diff --git a/configs/targets/hexagon-linux-user.mak b/configs/targets/hexag= on-linux-user.mak index 6763e2111d5..51fde5d60e6 100644 --- a/configs/targets/hexagon-linux-user.mak +++ b/configs/targets/hexagon-linux-user.mak @@ -1,5 +1,5 @@ TARGET_ARCH=3Dhexagon -TARGET_XML_FILES=3Dgdb-xml/hexagon-core.xml gdb-xml/hexagon-hvx.xml +TARGET_XML_FILES=3Dhexagon-core.xml hexagon-hvx.xml TARGET_SYSTBL=3Dsyscall.tbl TARGET_SYSTBL_ABI=3Dcommon,32,hexagon,time32,stat64,rlimit,renameat TARGET_LONG_BITS=3D32 diff --git a/configs/targets/i386-bsd-user.mak b/configs/targets/i386-bsd-u= ser.mak index 70e098da491..485f571cb6c 100644 --- a/configs/targets/i386-bsd-user.mak +++ b/configs/targets/i386-bsd-user.mak @@ -1,3 +1,3 @@ TARGET_ARCH=3Di386 -TARGET_XML_FILES=3D gdb-xml/i386-32bit.xml +TARGET_XML_FILES=3D i386-32bit.xml TARGET_LONG_BITS=3D32 diff --git a/configs/targets/i386-linux-user.mak b/configs/targets/i386-lin= ux-user.mak index ea68a266fce..a3ea4c39c52 100644 --- a/configs/targets/i386-linux-user.mak +++ b/configs/targets/i386-linux-user.mak @@ -1,5 +1,5 @@ TARGET_ARCH=3Di386 TARGET_SYSTBL_ABI=3Di386 TARGET_SYSTBL=3Dsyscall_32.tbl -TARGET_XML_FILES=3D gdb-xml/i386-32bit.xml gdb-xml/i386-32bit-linux.xml +TARGET_XML_FILES=3D i386-32bit.xml i386-32bit-linux.xml TARGET_LONG_BITS=3D32 diff --git a/configs/targets/i386-softmmu.mak b/configs/targets/i386-softmm= u.mak index 19ef4a6690d..38a8f85201f 100644 --- a/configs/targets/i386-softmmu.mak +++ b/configs/targets/i386-softmmu.mak @@ -1,6 +1,6 @@ TARGET_ARCH=3Di386 TARGET_KVM_HAVE_GUEST_DEBUG=3Dy TARGET_KVM_HAVE_RESET_PARKED_VCPU=3Dy -TARGET_XML_FILES=3D gdb-xml/i386-32bit.xml +TARGET_XML_FILES=3D i386-32bit.xml TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy diff --git a/configs/targets/loongarch64-linux-user.mak b/configs/targets/l= oongarch64-linux-user.mak index 4ea12794705..63b0bfc07b8 100644 --- a/configs/targets/loongarch64-linux-user.mak +++ b/configs/targets/loongarch64-linux-user.mak @@ -1,7 +1,7 @@ # Default configuration for loongarch64-linux-user TARGET_ARCH=3Dloongarch64 TARGET_BASE_ARCH=3Dloongarch -TARGET_XML_FILES=3Dgdb-xml/loongarch-base64.xml gdb-xml/loongarch-fpu.xml = gdb-xml/loongarch-lsx.xml gdb-xml/loongarch-lasx.xml +TARGET_XML_FILES=3Dloongarch-base64.xml loongarch-fpu.xml loongarch-lsx.xm= l loongarch-lasx.xml TARGET_SYSTBL=3Dsyscall.tbl TARGET_SYSTBL_ABI=3Dcommon,64 TARGET_LONG_BITS=3D64 diff --git a/configs/targets/loongarch64-softmmu.mak b/configs/targets/loon= garch64-softmmu.mak index 38c0f68ddbc..476407f9413 100644 --- a/configs/targets/loongarch64-softmmu.mak +++ b/configs/targets/loongarch64-softmmu.mak @@ -1,7 +1,7 @@ TARGET_ARCH=3Dloongarch64 TARGET_BASE_ARCH=3Dloongarch TARGET_KVM_HAVE_GUEST_DEBUG=3Dy -TARGET_XML_FILES=3D gdb-xml/loongarch-base32.xml gdb-xml/loongarch-base64.= xml gdb-xml/loongarch-fpu.xml gdb-xml/loongarch-lsx.xml gdb-xml/loongarch-l= asx.xml +TARGET_XML_FILES=3D loongarch-base32.xml loongarch-base64.xml loongarch-fp= u.xml loongarch-lsx.xml loongarch-lasx.xml # all boards require libfdt TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D64 diff --git a/configs/targets/m68k-linux-user.mak b/configs/targets/m68k-lin= ux-user.mak index 2d9bae22707..b64f33e759a 100644 --- a/configs/targets/m68k-linux-user.mak +++ b/configs/targets/m68k-linux-user.mak @@ -2,6 +2,6 @@ TARGET_ARCH=3Dm68k TARGET_SYSTBL_ABI=3Dcommon TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3D gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-cor= e.xml gdb-xml/m68k-fp.xml +TARGET_XML_FILES=3D cf-core.xml cf-fp.xml m68k-core.xml m68k-fp.xml TARGET_HAS_BFLT=3Dy TARGET_LONG_BITS=3D32 diff --git a/configs/targets/m68k-softmmu.mak b/configs/targets/m68k-softmm= u.mak index bacc52e96a9..0bc889f326e 100644 --- a/configs/targets/m68k-softmmu.mak +++ b/configs/targets/m68k-softmmu.mak @@ -1,4 +1,4 @@ TARGET_ARCH=3Dm68k TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3D gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-cor= e.xml gdb-xml/m68k-fp.xml +TARGET_XML_FILES=3D cf-core.xml cf-fp.xml m68k-core.xml m68k-fp.xml TARGET_LONG_BITS=3D32 diff --git a/configs/targets/microblaze-linux-user.mak b/configs/targets/mi= croblaze-linux-user.mak index 37727797695..31150f980c8 100644 --- a/configs/targets/microblaze-linux-user.mak +++ b/configs/targets/microblaze-linux-user.mak @@ -3,5 +3,5 @@ TARGET_SYSTBL_ABI=3Dcommon TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy TARGET_HAS_BFLT=3Dy -TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr= otect.xml +TARGET_XML_FILES=3Dmicroblaze-core.xml microblaze-stack-protect.xml TARGET_LONG_BITS=3D32 diff --git a/configs/targets/microblaze-softmmu.mak b/configs/targets/micro= blaze-softmmu.mak index cf635798c90..f2b6ab93fbe 100644 --- a/configs/targets/microblaze-softmmu.mak +++ b/configs/targets/microblaze-softmmu.mak @@ -2,6 +2,6 @@ TARGET_ARCH=3Dmicroblaze TARGET_BIG_ENDIAN=3Dy # needed by boot.c TARGET_NEED_FDT=3Dy -TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr= otect.xml +TARGET_XML_FILES=3Dmicroblaze-core.xml microblaze-stack-protect.xml TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy diff --git a/configs/targets/microblazeel-linux-user.mak b/configs/targets/= microblazeel-linux-user.mak index a51a05488d3..5dcd4b5b183 100644 --- a/configs/targets/microblazeel-linux-user.mak +++ b/configs/targets/microblazeel-linux-user.mak @@ -2,5 +2,5 @@ TARGET_ARCH=3Dmicroblaze TARGET_SYSTBL_ABI=3Dcommon TARGET_SYSTBL=3Dsyscall.tbl TARGET_HAS_BFLT=3Dy -TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr= otect.xml +TARGET_XML_FILES=3Dmicroblaze-core.xml microblaze-stack-protect.xml TARGET_LONG_BITS=3D32 diff --git a/configs/targets/or1k-linux-user.mak b/configs/targets/or1k-lin= ux-user.mak index 9f8c178ef10..ecb95253680 100644 --- a/configs/targets/or1k-linux-user.mak +++ b/configs/targets/or1k-linux-user.mak @@ -2,6 +2,6 @@ TARGET_ARCH=3Dor1k TARGET_BIG_ENDIAN=3Dy TARGET_SYSTBL_ABI=3Dcommon,32,or1k,time32,stat64,rlimit,renameat TARGET_SYSTBL=3Dsyscall.tbl -TARGET_XML_FILES=3D gdb-xml/or1k-core.xml +TARGET_XML_FILES=3D or1k-core.xml TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/configs/targets/or1k-softmmu.mak b/configs/targets/or1k-softmm= u.mak index 24d89bc3e65..c3ca0a2c6ba 100644 --- a/configs/targets/or1k-softmmu.mak +++ b/configs/targets/or1k-softmmu.mak @@ -2,7 +2,7 @@ TARGET_ARCH=3Dor1k TARGET_BIG_ENDIAN=3Dy # needed by boot.c and all boards TARGET_NEED_FDT=3Dy -TARGET_XML_FILES=3D gdb-xml/or1k-core.xml +TARGET_XML_FILES=3D or1k-core.xml TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/configs/targets/ppc-linux-user.mak b/configs/targets/ppc-linux= -user.mak index 970d04a5ba1..5ddec598760 100644 --- a/configs/targets/ppc-linux-user.mak +++ b/configs/targets/ppc-linux-user.mak @@ -2,5 +2,5 @@ TARGET_ARCH=3Dppc TARGET_SYSTBL_ABI=3Dcommon,nospu,32 TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3D gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/p= ower-altivec.xml gdb-xml/power-spe.xml +TARGET_XML_FILES=3D power-core.xml power-fpu.xml power-altivec.xml power-s= pe.xml TARGET_LONG_BITS=3D32 diff --git a/configs/targets/ppc-softmmu.mak b/configs/targets/ppc-softmmu.= mak index 9bfa7df6c36..867898bd47c 100644 --- a/configs/targets/ppc-softmmu.mak +++ b/configs/targets/ppc-softmmu.mak @@ -1,5 +1,5 @@ TARGET_ARCH=3Dppc TARGET_BIG_ENDIAN=3Dy TARGET_KVM_HAVE_GUEST_DEBUG=3Dy -TARGET_XML_FILES=3D gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/p= ower-altivec.xml gdb-xml/power-spe.xml +TARGET_XML_FILES=3D power-core.xml power-fpu.xml power-altivec.xml power-s= pe.xml TARGET_LONG_BITS=3D32 diff --git a/configs/targets/ppc64-linux-user.mak b/configs/targets/ppc64-l= inux-user.mak index 461f1c67d15..fcedce1b4e0 100644 --- a/configs/targets/ppc64-linux-user.mak +++ b/configs/targets/ppc64-linux-user.mak @@ -4,5 +4,5 @@ TARGET_ABI_DIR=3Dppc TARGET_SYSTBL_ABI=3Dcommon,nospu,64 TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3D gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml= /power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml +TARGET_XML_FILES=3D power64-core.xml power-fpu.xml power-altivec.xml power= -spe.xml power-vsx.xml TARGET_LONG_BITS=3D64 diff --git a/configs/targets/ppc64-softmmu.mak b/configs/targets/ppc64-soft= mmu.mak index 74572864b36..10d7a2681e7 100644 --- a/configs/targets/ppc64-softmmu.mak +++ b/configs/targets/ppc64-softmmu.mak @@ -2,7 +2,7 @@ TARGET_ARCH=3Dppc64 TARGET_BASE_ARCH=3Dppc TARGET_BIG_ENDIAN=3Dy TARGET_KVM_HAVE_GUEST_DEBUG=3Dy -TARGET_XML_FILES=3D gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml= /power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml +TARGET_XML_FILES=3D power64-core.xml power-fpu.xml power-altivec.xml power= -spe.xml power-vsx.xml # all boards require libfdt TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D64 diff --git a/configs/targets/ppc64le-linux-user.mak b/configs/targets/ppc64= le-linux-user.mak index cf9d8a400d9..b5a81b58868 100644 --- a/configs/targets/ppc64le-linux-user.mak +++ b/configs/targets/ppc64le-linux-user.mak @@ -3,5 +3,5 @@ TARGET_BASE_ARCH=3Dppc TARGET_ABI_DIR=3Dppc TARGET_SYSTBL_ABI=3Dcommon,nospu,64 TARGET_SYSTBL=3Dsyscall.tbl -TARGET_XML_FILES=3D gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml= /power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml +TARGET_XML_FILES=3D power64-core.xml power-fpu.xml power-altivec.xml power= -spe.xml power-vsx.xml TARGET_LONG_BITS=3D64 diff --git a/configs/targets/riscv32-linux-user.mak b/configs/targets/riscv= 32-linux-user.mak index a0ef03c0c3f..f069ab9a0f9 100644 --- a/configs/targets/riscv32-linux-user.mak +++ b/configs/targets/riscv32-linux-user.mak @@ -1,7 +1,7 @@ TARGET_ARCH=3Driscv32 TARGET_BASE_ARCH=3Driscv TARGET_ABI_DIR=3Driscv -TARGET_XML_FILES=3D gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm= l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml +TARGET_XML_FILES=3D riscv-32bit-cpu.xml riscv-32bit-fpu.xml riscv-64bit-fp= u.xml riscv-32bit-virtual.xml CONFIG_SEMIHOSTING=3Dy CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy TARGET_SYSTBL_ABI=3D32 diff --git a/configs/targets/riscv32-softmmu.mak b/configs/targets/riscv32-= softmmu.mak index 7476e596082..26080599be7 100644 --- a/configs/targets/riscv32-softmmu.mak +++ b/configs/targets/riscv32-softmmu.mak @@ -1,6 +1,6 @@ TARGET_ARCH=3Driscv32 TARGET_BASE_ARCH=3Driscv -TARGET_XML_FILES=3D gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm= l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml +TARGET_XML_FILES=3D riscv-32bit-cpu.xml riscv-32bit-fpu.xml riscv-64bit-fp= u.xml riscv-32bit-virtual.xml # needed by boot.c TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D32 diff --git a/configs/targets/riscv64-bsd-user.mak b/configs/targets/riscv64= -bsd-user.mak index c6348a79629..bc85d9ed04e 100644 --- a/configs/targets/riscv64-bsd-user.mak +++ b/configs/targets/riscv64-bsd-user.mak @@ -1,5 +1,5 @@ TARGET_ARCH=3Driscv64 TARGET_BASE_ARCH=3Driscv TARGET_ABI_DIR=3Driscv -TARGET_XML_FILES=3D gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm= l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml +TARGET_XML_FILES=3D riscv-64bit-cpu.xml riscv-32bit-fpu.xml riscv-64bit-fp= u.xml riscv-64bit-virtual.xml TARGET_LONG_BITS=3D64 diff --git a/configs/targets/riscv64-linux-user.mak b/configs/targets/riscv= 64-linux-user.mak index aac7568305d..bca08645124 100644 --- a/configs/targets/riscv64-linux-user.mak +++ b/configs/targets/riscv64-linux-user.mak @@ -1,7 +1,7 @@ TARGET_ARCH=3Driscv64 TARGET_BASE_ARCH=3Driscv TARGET_ABI_DIR=3Driscv -TARGET_XML_FILES=3D gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm= l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml +TARGET_XML_FILES=3D riscv-64bit-cpu.xml riscv-32bit-fpu.xml riscv-64bit-fp= u.xml riscv-64bit-virtual.xml CONFIG_SEMIHOSTING=3Dy CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy TARGET_SYSTBL_ABI=3D64 diff --git a/configs/targets/riscv64-softmmu.mak b/configs/targets/riscv64-= softmmu.mak index f836f08c5b9..5059c550480 100644 --- a/configs/targets/riscv64-softmmu.mak +++ b/configs/targets/riscv64-softmmu.mak @@ -1,7 +1,7 @@ TARGET_ARCH=3Driscv64 TARGET_BASE_ARCH=3Driscv TARGET_KVM_HAVE_GUEST_DEBUG=3Dy -TARGET_XML_FILES=3D gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm= l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml gdb-xml/riscv= -32bit-cpu.xml gdb-xml/riscv-32bit-virtual.xml +TARGET_XML_FILES=3D riscv-64bit-cpu.xml riscv-32bit-fpu.xml riscv-64bit-fp= u.xml riscv-64bit-virtual.xml riscv-32bit-cpu.xml riscv-32bit-virtual.xml # needed by boot.c TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D64 diff --git a/configs/targets/rx-softmmu.mak b/configs/targets/rx-softmmu.mak index 281a165873a..1959d1b4ccc 100644 --- a/configs/targets/rx-softmmu.mak +++ b/configs/targets/rx-softmmu.mak @@ -1,5 +1,5 @@ TARGET_ARCH=3Drx -TARGET_XML_FILES=3D gdb-xml/rx-core.xml +TARGET_XML_FILES=3D rx-core.xml # all boards require libfdt TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D32 diff --git a/configs/targets/s390x-linux-user.mak b/configs/targets/s390x-l= inux-user.mak index e3723f5dc54..2dbcae0a6e2 100644 --- a/configs/targets/s390x-linux-user.mak +++ b/configs/targets/s390x-linux-user.mak @@ -2,6 +2,6 @@ TARGET_ARCH=3Ds390x TARGET_SYSTBL_ABI=3Dcommon,64 TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3D gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/= s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml = gdb-xml/s390-virt-kvm.xml gdb-xml/s390-gs.xml +TARGET_XML_FILES=3D s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xml= s390-cr.xml s390-virt.xml s390-virt-kvm.xml s390-gs.xml TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/configs/targets/s390x-softmmu.mak b/configs/targets/s390x-soft= mmu.mak index 544657cfe2d..e273075f1a9 100644 --- a/configs/targets/s390x-softmmu.mak +++ b/configs/targets/s390x-softmmu.mak @@ -1,6 +1,6 @@ TARGET_ARCH=3Ds390x TARGET_BIG_ENDIAN=3Dy TARGET_KVM_HAVE_GUEST_DEBUG=3Dy -TARGET_XML_FILES=3D gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/= s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml = gdb-xml/s390-virt-kvm.xml gdb-xml/s390-gs.xml +TARGET_XML_FILES=3D s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xml= s390-cr.xml s390-virt.xml s390-virt-kvm.xml s390-gs.xml TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/configs/targets/sparc-linux-user.mak b/configs/targets/sparc-l= inux-user.mak index 01446e28783..2b6f8077399 100644 --- a/configs/targets/sparc-linux-user.mak +++ b/configs/targets/sparc-linux-user.mak @@ -2,6 +2,6 @@ TARGET_ARCH=3Dsparc TARGET_SYSTBL_ABI=3Dcommon,32 TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3Dgdb-xml/sparc32-cpu.xml gdb-xml/sparc32-fpu.xml gdb-xml= /sparc32-cp0.xml +TARGET_XML_FILES=3Dsparc32-cpu.xml sparc32-fpu.xml sparc32-cp0.xml TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/configs/targets/sparc-softmmu.mak b/configs/targets/sparc-soft= mmu.mak index ed846735f41..126ce12abb0 100644 --- a/configs/targets/sparc-softmmu.mak +++ b/configs/targets/sparc-softmmu.mak @@ -1,6 +1,6 @@ TARGET_ARCH=3Dsparc TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3Dgdb-xml/sparc32-cpu.xml gdb-xml/sparc32-fpu.xml gdb-xml= /sparc32-cp0.xml +TARGET_XML_FILES=3Dsparc32-cpu.xml sparc32-fpu.xml sparc32-cp0.xml TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/configs/targets/sparc32plus-linux-user.mak b/configs/targets/s= parc32plus-linux-user.mak index cf49c53ce44..a1d8530ecfd 100644 --- a/configs/targets/sparc32plus-linux-user.mak +++ b/configs/targets/sparc32plus-linux-user.mak @@ -5,6 +5,6 @@ TARGET_ABI_DIR=3Dsparc TARGET_SYSTBL_ABI=3Dcommon,32 TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3Dgdb-xml/sparc64-cpu.xml gdb-xml/sparc64-fpu.xml gdb-xml= /sparc64-cp0.xml +TARGET_XML_FILES=3Dsparc64-cpu.xml sparc64-fpu.xml sparc64-cp0.xml TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/configs/targets/sparc64-linux-user.mak b/configs/targets/sparc= 64-linux-user.mak index 81d18fcc85b..c48a03aeb9e 100644 --- a/configs/targets/sparc64-linux-user.mak +++ b/configs/targets/sparc64-linux-user.mak @@ -4,6 +4,6 @@ TARGET_ABI_DIR=3Dsparc TARGET_SYSTBL_ABI=3Dcommon,64 TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3Dgdb-xml/sparc64-cpu.xml gdb-xml/sparc64-fpu.xml gdb-xml= /sparc64-cp0.xml +TARGET_XML_FILES=3Dsparc64-cpu.xml sparc64-fpu.xml sparc64-cp0.xml TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/configs/targets/sparc64-softmmu.mak b/configs/targets/sparc64-= softmmu.mak index 602783ef0f6..4e621fb8e39 100644 --- a/configs/targets/sparc64-softmmu.mak +++ b/configs/targets/sparc64-softmmu.mak @@ -1,7 +1,7 @@ TARGET_ARCH=3Dsparc64 TARGET_BASE_ARCH=3Dsparc TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3Dgdb-xml/sparc64-cpu.xml gdb-xml/sparc64-fpu.xml gdb-xml= /sparc64-cp0.xml +TARGET_XML_FILES=3Dsparc64-cpu.xml sparc64-fpu.xml sparc64-cp0.xml TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/configs/targets/x86_64-bsd-user.mak b/configs/targets/x86_64-b= sd-user.mak index d62d656f2c6..d754186347f 100644 --- a/configs/targets/x86_64-bsd-user.mak +++ b/configs/targets/x86_64-bsd-user.mak @@ -1,4 +1,4 @@ TARGET_ARCH=3Dx86_64 TARGET_BASE_ARCH=3Di386 -TARGET_XML_FILES=3D gdb-xml/i386-64bit.xml +TARGET_XML_FILES=3D i386-64bit.xml TARGET_LONG_BITS=3D64 diff --git a/configs/targets/x86_64-linux-user.mak b/configs/targets/x86_64= -linux-user.mak index b093ab5a167..7f9527fd1de 100644 --- a/configs/targets/x86_64-linux-user.mak +++ b/configs/targets/x86_64-linux-user.mak @@ -2,5 +2,5 @@ TARGET_ARCH=3Dx86_64 TARGET_BASE_ARCH=3Di386 TARGET_SYSTBL_ABI=3Dcommon,64 TARGET_SYSTBL=3Dsyscall_64.tbl -TARGET_XML_FILES=3D gdb-xml/i386-64bit.xml gdb-xml/i386-64bit-linux.xml +TARGET_XML_FILES=3D i386-64bit.xml i386-64bit-linux.xml TARGET_LONG_BITS=3D64 diff --git a/configs/targets/x86_64-softmmu.mak b/configs/targets/x86_64-so= ftmmu.mak index 151862158c7..c7f8746b4f5 100644 --- a/configs/targets/x86_64-softmmu.mak +++ b/configs/targets/x86_64-softmmu.mak @@ -2,6 +2,6 @@ TARGET_ARCH=3Dx86_64 TARGET_BASE_ARCH=3Di386 TARGET_KVM_HAVE_GUEST_DEBUG=3Dy TARGET_KVM_HAVE_RESET_PARKED_VCPU=3Dy -TARGET_XML_FILES=3D gdb-xml/i386-64bit.xml gdb-xml/i386-64bit-apx.xml +TARGET_XML_FILES=3D i386-64bit.xml i386-64bit-apx.xml TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy diff --git a/meson.build b/meson.build index db8918dd303..8e8440941c0 100644 --- a/meson.build +++ b/meson.build @@ -4329,9 +4329,13 @@ foreach target : target_dirs endif =20 if 'TARGET_XML_FILES' in config_target + gdbstub_xml_files =3D [] + foreach gdbstub_xml : config_target['TARGET_XML_FILES'].split() + gdbstub_xml_files +=3D 'gdb-xml/' + gdbstub_xml + endforeach gdbstub_xml =3D custom_target(target + '-gdbstub-xml.c', output: target + '-gdbstub-xml.c', - input: files(config_target['TARGET_XML_FIL= ES'].split()), + input: files(gdbstub_xml_files), command: [feature_to_c, '@INPUT@'], capture: true) arch_srcs +=3D gdbstub_xml --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158137; cv=none; d=zohomail.com; s=zohoarc; b=iM3t3aThP+P1ICOKs9YhNXOU6o4FNLoa/+GRXUu2HDkftm7vjDdrdKM1YDJlSM7QxLlYfjvGBzcz5uNM2BeBer2HL6jfaKMloB8mO9w9baoZW4x3efbSaNXFHpdrSk2Br69GifNx7my2vGRcA4ve1eutpMtlW3mIAKIkzAYGfHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158137; 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=XaUcpr5oh1nZ026ekr7jJnvY9oE4jZ0XDyz82JH+E6M=; b=IhrHoaNQ5u28rcZ1Z71OJhN8AxbS8inLwkLpZ+Q24BUba9R3Bt3HKA3IboF09YQ2qrx0w1Y+ub5ERtcLj76m7g6oFS8YySFFRXg3k+iw3AAygHVFDkIdZygyB7S9k9Aogf95cGG+o55r/rl8rzk2ljhw87/xfh2y3egERHpLcJk= 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 1773158137940386.8780932729551; Tue, 10 Mar 2026 08:55:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzQE-0005Br-Ko; Tue, 10 Mar 2026 11:55:02 -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 1vzzQC-00053z-Dm for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:55:00 -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 1vzzQ9-0006i4-4s for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:55:00 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-439cd6b09f8so4666305f8f.3 for ; Tue, 10 Mar 2026 08:54:56 -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-439dae56300sm36846140f8f.37.2026.03.10.08.54.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:54:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158095; x=1773762895; 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=XaUcpr5oh1nZ026ekr7jJnvY9oE4jZ0XDyz82JH+E6M=; b=tldErnRWhjP0KsPQh6WtAOMxS3ut56K6CvZB1TuuW+wg+SSsKnjAYyuHXaMHyXI6Yj 8lF1UI8RNQX+jkwWB5rhGdtkcRGWwSebeRtu75F+op9kDaKmV3dtmXHf1YCp/Dn8A7fp tVn3HFkzXaNeB4dmcyjbwg0BGB+OHlKpDb+TIJ4zfRNpvlj0oCxMJ50fq4k01d9MULhl nk8lY74+DqX4eyVLIfDtlOxxok16DBaC8BpmgX4CjvLpXcX/llrisovPwVco7gUkgquQ qqKHbla2zZ+5GMcS75QxMTMcX4GeksFRO1ZxocKzwdPHQHTNnrUqsfWQ1SUa17gAVxrO 7mbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158095; x=1773762895; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=XaUcpr5oh1nZ026ekr7jJnvY9oE4jZ0XDyz82JH+E6M=; b=u4aJCE3SDI5lPAwxhw+VctoafPffRCpK2q+35lyQ13rygE6JOCVQUHDAsCCYGWOdl/ 4P27fr0f0E5EoeXz4DgDLGdnj25PX+HctxtfNM7k0fwJotyq8FdWoLj8MhjpVUywPe8c 3bciInN+Tfrh9RZg8PCNSZcBjxKfvzSffTdacC0/2jjyV+CPIhIUBNMDsqxH4vGqSsB7 xfj0yW2VRyh8VXOxFb78u/Sj2m/G+RAO1cpOWogpwMwasxO/7c2/kIjG2kflGgtp8vwT 3+rvomfxM+k/pXKJu1FmnzhediUqxFceIst8/PXXsisURAjAq3xKsQUZqz07dyFf3n4+ LvMA== X-Gm-Message-State: AOJu0YyYPvu1YoDA+ue38lv/oDoclbTZgWwpda2kemStcINWeZMJa6iV XG/s/hqD81lGiQrsxmOENpgLVE5Uvcp99ZpqHo/gCovXxyfwy+QUAZaissUpBilz+WVAL1O7Srb Om+1Djas= X-Gm-Gg: ATEYQzxxUim8OiRLmgR0ybHBJI6BKMBBcq/P5hXHFkgiU3SC+WlUPQQlMR2Gf8YjRRA mfPJSmYE2jTs6UAjzguQb3STi4EvhxmwO2CJSudlc925KpsTNnDHkNkoUKQ0QRtlhGD0epe/b+6 2x3rKdbsj0IqrQBAB4dxoTiUBR++1KFYCqdZZTlUvkl2a8PTTYbw5GhGk6sWMBlMK9TPIPKxMZs 4hO/PItj+rUdgZi1JPPAnvb5gNcN6j+S0WDyCHkZcLZ6OlCB37K4x5/x38ZjxAODAmP2wlQw/77 ESSDVI00TkwYwWKt/taKhGMRxWm6TstDragnAsyl/7kniD9E1ZaaVeCUGH+aaYm+QkQXZW5lh6u i3sYhnS2A/VUCUWHFPX7fOI6j7Xoe6dyR81bHb3ER/yyaTydOOGhOK6Afe3MPLOQmo8QTa1PXzr DXRBLZ8gXxI12KuL57m+GWWu0B5DSmjINfkiGz5AR+15zZSJZO8TER8DKkKCMkEKoTkznQpDF5 X-Received: by 2002:a05:6000:290d:b0:439:ab3d:1c37 with SMTP id ffacd0b85a97d-439da31dec6mr27801951f8f.7.1773158094815; Tue, 10 Mar 2026 08:54:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 12/13] gdbstub: Move gdb-xml/ within gdbstub/ Date: Tue, 10 Mar 2026 16:53:28 +0100 Message-ID: <20260310155329.48772-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1773158139314158500 gdb-xml/ files are only consumed by gdbstub API. No need for a top-level entry, move them to gdbstub/. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Acked-by: Alex Benn=C3=A9e --- MAINTAINERS | 19 +++++++++---------- docs/devel/codebase.rst | 2 -- meson.build | 2 +- {gdb-xml =3D> gdbstub/gdb-xml}/aarch64-core.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/aarch64-fpu.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/aarch64-mte.xml | 0 .../gdb-xml}/aarch64-pauth.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/aarch64-sme2.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/alpha-core.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/arm-core.xml | 0 .../gdb-xml}/arm-m-profile-mve.xml | 0 .../gdb-xml}/arm-m-profile.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/arm-neon.xml | 0 .../gdb-xml}/arm-vfp-sysregs.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/arm-vfp.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/arm-vfp3.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/avr-cpu.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/cf-core.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/cf-fp.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/hexagon-core.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/hexagon-hvx.xml | 0 .../gdb-xml}/i386-32bit-linux.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/i386-32bit.xml | 0 .../gdb-xml}/i386-64bit-apx.xml | 0 .../gdb-xml}/i386-64bit-linux.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/i386-64bit.xml | 0 .../gdb-xml}/loongarch-base32.xml | 0 .../gdb-xml}/loongarch-base64.xml | 0 .../gdb-xml}/loongarch-fpu.xml | 0 .../gdb-xml}/loongarch-lasx.xml | 0 .../gdb-xml}/loongarch-lsx.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/m68k-core.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/m68k-fp.xml | 0 .../gdb-xml}/microblaze-core.xml | 0 .../gdb-xml}/microblaze-stack-protect.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/or1k-core.xml | 0 .../gdb-xml}/power-altivec.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/power-core.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/power-fpu.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/power-spe.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/power-vsx.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/power64-core.xml | 0 .../gdb-xml}/riscv-32bit-cpu.xml | 0 .../gdb-xml}/riscv-32bit-fpu.xml | 0 .../gdb-xml}/riscv-32bit-virtual.xml | 0 .../gdb-xml}/riscv-64bit-cpu.xml | 0 .../gdb-xml}/riscv-64bit-fpu.xml | 0 .../gdb-xml}/riscv-64bit-virtual.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/rx-core.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/s390-acr.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/s390-cr.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/s390-fpr.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/s390-gs.xml | 0 .../gdb-xml}/s390-virt-kvm.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/s390-virt.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/s390-vx.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/s390x-core64.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/sparc32-cp0.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/sparc32-cpu.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/sparc32-fpu.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/sparc64-cp0.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/sparc64-cpu.xml | 0 {gdb-xml =3D> gdbstub/gdb-xml}/sparc64-fpu.xml | 0 63 files changed, 10 insertions(+), 13 deletions(-) rename {gdb-xml =3D> gdbstub/gdb-xml}/aarch64-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/aarch64-fpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/aarch64-mte.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/aarch64-pauth.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/aarch64-sme2.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/alpha-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/arm-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/arm-m-profile-mve.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/arm-m-profile.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/arm-neon.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/arm-vfp-sysregs.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/arm-vfp.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/arm-vfp3.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/avr-cpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/cf-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/cf-fp.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/hexagon-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/hexagon-hvx.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/i386-32bit-linux.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/i386-32bit.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/i386-64bit-apx.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/i386-64bit-linux.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/i386-64bit.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/loongarch-base32.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/loongarch-base64.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/loongarch-fpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/loongarch-lasx.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/loongarch-lsx.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/m68k-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/m68k-fp.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/microblaze-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/microblaze-stack-protect.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/or1k-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/power-altivec.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/power-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/power-fpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/power-spe.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/power-vsx.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/power64-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/riscv-32bit-cpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/riscv-32bit-fpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/riscv-32bit-virtual.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/riscv-64bit-cpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/riscv-64bit-fpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/riscv-64bit-virtual.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/rx-core.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/s390-acr.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/s390-cr.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/s390-fpr.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/s390-gs.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/s390-virt-kvm.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/s390-virt.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/s390-vx.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/s390x-core64.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/sparc32-cp0.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/sparc32-cpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/sparc32-fpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/sparc64-cp0.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/sparc64-cpu.xml (100%) rename {gdb-xml =3D> gdbstub/gdb-xml}/sparc64-fpu.xml (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 9d1614fd7e9..247799c817c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -106,7 +106,7 @@ M: Thomas Huth S: Supported F: configs/devices/s390x-softmmu/default.mak F: configs/targets/s390x-softmmu.mak -F: gdb-xml/s390*.xml +F: gdbstub/gdb-xml/s390*.xml F: hw/char/sclp*.[hc] F: hw/char/terminal3270.c F: hw/intc/s390_flic.c @@ -221,8 +221,8 @@ F: include/hw/cpu/a*mpcore.h F: docs/system/target-arm.rst F: docs/system/arm/cpu-features.rst F: docs/system/arm/emulation.rst -F: gdb-xml/arm*.xml -F: gdb-xml/aarch64*.xml +F: gdbstub/gdb-xml/arm*.xml +F: gdbstub/gdb-xml/aarch64*.xml =20 ARM SMMU M: Eric Auger @@ -237,7 +237,7 @@ AVR TCG CPUs M: Michael Rolnik S: Maintained F: docs/system/target-avr.rst -F: gdb-xml/avr-cpu.xml +F: gdbstub/gdb-xml/avr-cpu.xml F: target/avr/ F: tests/functional/avr/ =20 @@ -252,7 +252,7 @@ F: tests/tcg/hexagon/ F: disas/hexagon.c F: configs/targets/hexagon-linux-user/default.mak F: docker/dockerfiles/debian-hexagon-cross.docker -F: gdb-xml/hexagon*.xml +F: gdbstub/gdb-xml/hexagon*.xml T: git https://github.com/quic/qemu.git hex-next =20 Hexagon idef-parser @@ -311,7 +311,7 @@ M: Stafford Horne S: Odd Fixes F: docs/system/or1k/cpu-features.rst F: target/or1k/ -F: gdb-xml/or1k-core.xml +F: gdbstub/gdb-xml/or1k-core.xml F: hw/or1k/ F: include/hw/or1k/ F: tests/functional/or1k/meson.build @@ -411,7 +411,7 @@ M: Mark Cave-Ayland M: Artyom Tarasenko S: Maintained F: target/sparc/ -F: gdb-xml/sparc*.xml +F: gdbstub/gdb-xml/sparc*.xml F: hw/sparc/ F: hw/sparc64/ F: include/hw/sparc/sparc64.h @@ -499,7 +499,7 @@ S: Supported F: target/s390x/kvm/ F: target/s390x/machine.c F: target/s390x/sigp.c -F: gdb-xml/s390*.xml +F: gdbstub/gdb-xml/s390*.xml T: git https://github.com/borntraeger/qemu.git s390-next L: qemu-s390x@nongnu.org =20 @@ -1352,7 +1352,7 @@ F: include/hw/intc/loongson_ipi_common.h F: hw/intc/loongarch_*.c F: hw/intc/loongson_ipi_common.c F: hw/rtc/ls7a_rtc.c -F: gdb-xml/loongarch*.xml +F: gdbstub/gdb-xml/loongarch*.xml =20 M68K Machines ------------- @@ -3311,7 +3311,6 @@ F: docs/system/gdb.rst F: gdbstub/* F: include/exec/gdbstub.h F: include/gdbstub/* -F: gdb-xml/ F: tests/tcg/multiarch/gdbstub/* F: scripts/feature_to_c.py F: scripts/probe-gdb-support.py diff --git a/docs/devel/codebase.rst b/docs/devel/codebase.rst index 69d88271178..f09307b8971 100644 --- a/docs/devel/codebase.rst +++ b/docs/devel/codebase.rst @@ -88,8 +88,6 @@ yet, so sometimes the source code is all you have. `VirtFS `_ support. * `gdbstub `_: `GDB ` support. -* `gdb-xml `_: - Set of XML files describing architectures and used by `gdbstub `. * `host `_: Various architecture specific header files (crypto, atomic, memory operations). diff --git a/meson.build b/meson.build index 8e8440941c0..503cde5ea90 100644 --- a/meson.build +++ b/meson.build @@ -4331,7 +4331,7 @@ foreach target : target_dirs if 'TARGET_XML_FILES' in config_target gdbstub_xml_files =3D [] foreach gdbstub_xml : config_target['TARGET_XML_FILES'].split() - gdbstub_xml_files +=3D 'gdb-xml/' + gdbstub_xml + gdbstub_xml_files +=3D 'gdbstub/gdb-xml/' + gdbstub_xml endforeach gdbstub_xml =3D custom_target(target + '-gdbstub-xml.c', output: target + '-gdbstub-xml.c', diff --git a/gdb-xml/aarch64-core.xml b/gdbstub/gdb-xml/aarch64-core.xml similarity index 100% rename from gdb-xml/aarch64-core.xml rename to gdbstub/gdb-xml/aarch64-core.xml diff --git a/gdb-xml/aarch64-fpu.xml b/gdbstub/gdb-xml/aarch64-fpu.xml similarity index 100% rename from gdb-xml/aarch64-fpu.xml rename to gdbstub/gdb-xml/aarch64-fpu.xml diff --git a/gdb-xml/aarch64-mte.xml b/gdbstub/gdb-xml/aarch64-mte.xml similarity index 100% rename from gdb-xml/aarch64-mte.xml rename to gdbstub/gdb-xml/aarch64-mte.xml diff --git a/gdb-xml/aarch64-pauth.xml b/gdbstub/gdb-xml/aarch64-pauth.xml similarity index 100% rename from gdb-xml/aarch64-pauth.xml rename to gdbstub/gdb-xml/aarch64-pauth.xml diff --git a/gdb-xml/aarch64-sme2.xml b/gdbstub/gdb-xml/aarch64-sme2.xml similarity index 100% rename from gdb-xml/aarch64-sme2.xml rename to gdbstub/gdb-xml/aarch64-sme2.xml diff --git a/gdb-xml/alpha-core.xml b/gdbstub/gdb-xml/alpha-core.xml similarity index 100% rename from gdb-xml/alpha-core.xml rename to gdbstub/gdb-xml/alpha-core.xml diff --git a/gdb-xml/arm-core.xml b/gdbstub/gdb-xml/arm-core.xml similarity index 100% rename from gdb-xml/arm-core.xml rename to gdbstub/gdb-xml/arm-core.xml diff --git a/gdb-xml/arm-m-profile-mve.xml b/gdbstub/gdb-xml/arm-m-profile-= mve.xml similarity index 100% rename from gdb-xml/arm-m-profile-mve.xml rename to gdbstub/gdb-xml/arm-m-profile-mve.xml diff --git a/gdb-xml/arm-m-profile.xml b/gdbstub/gdb-xml/arm-m-profile.xml similarity index 100% rename from gdb-xml/arm-m-profile.xml rename to gdbstub/gdb-xml/arm-m-profile.xml diff --git a/gdb-xml/arm-neon.xml b/gdbstub/gdb-xml/arm-neon.xml similarity index 100% rename from gdb-xml/arm-neon.xml rename to gdbstub/gdb-xml/arm-neon.xml diff --git a/gdb-xml/arm-vfp-sysregs.xml b/gdbstub/gdb-xml/arm-vfp-sysregs.= xml similarity index 100% rename from gdb-xml/arm-vfp-sysregs.xml rename to gdbstub/gdb-xml/arm-vfp-sysregs.xml diff --git a/gdb-xml/arm-vfp.xml b/gdbstub/gdb-xml/arm-vfp.xml similarity index 100% rename from gdb-xml/arm-vfp.xml rename to gdbstub/gdb-xml/arm-vfp.xml diff --git a/gdb-xml/arm-vfp3.xml b/gdbstub/gdb-xml/arm-vfp3.xml similarity index 100% rename from gdb-xml/arm-vfp3.xml rename to gdbstub/gdb-xml/arm-vfp3.xml diff --git a/gdb-xml/avr-cpu.xml b/gdbstub/gdb-xml/avr-cpu.xml similarity index 100% rename from gdb-xml/avr-cpu.xml rename to gdbstub/gdb-xml/avr-cpu.xml diff --git a/gdb-xml/cf-core.xml b/gdbstub/gdb-xml/cf-core.xml similarity index 100% rename from gdb-xml/cf-core.xml rename to gdbstub/gdb-xml/cf-core.xml diff --git a/gdb-xml/cf-fp.xml b/gdbstub/gdb-xml/cf-fp.xml similarity index 100% rename from gdb-xml/cf-fp.xml rename to gdbstub/gdb-xml/cf-fp.xml diff --git a/gdb-xml/hexagon-core.xml b/gdbstub/gdb-xml/hexagon-core.xml similarity index 100% rename from gdb-xml/hexagon-core.xml rename to gdbstub/gdb-xml/hexagon-core.xml diff --git a/gdb-xml/hexagon-hvx.xml b/gdbstub/gdb-xml/hexagon-hvx.xml similarity index 100% rename from gdb-xml/hexagon-hvx.xml rename to gdbstub/gdb-xml/hexagon-hvx.xml diff --git a/gdb-xml/i386-32bit-linux.xml b/gdbstub/gdb-xml/i386-32bit-linu= x.xml similarity index 100% rename from gdb-xml/i386-32bit-linux.xml rename to gdbstub/gdb-xml/i386-32bit-linux.xml diff --git a/gdb-xml/i386-32bit.xml b/gdbstub/gdb-xml/i386-32bit.xml similarity index 100% rename from gdb-xml/i386-32bit.xml rename to gdbstub/gdb-xml/i386-32bit.xml diff --git a/gdb-xml/i386-64bit-apx.xml b/gdbstub/gdb-xml/i386-64bit-apx.xml similarity index 100% rename from gdb-xml/i386-64bit-apx.xml rename to gdbstub/gdb-xml/i386-64bit-apx.xml diff --git a/gdb-xml/i386-64bit-linux.xml b/gdbstub/gdb-xml/i386-64bit-linu= x.xml similarity index 100% rename from gdb-xml/i386-64bit-linux.xml rename to gdbstub/gdb-xml/i386-64bit-linux.xml diff --git a/gdb-xml/i386-64bit.xml b/gdbstub/gdb-xml/i386-64bit.xml similarity index 100% rename from gdb-xml/i386-64bit.xml rename to gdbstub/gdb-xml/i386-64bit.xml diff --git a/gdb-xml/loongarch-base32.xml b/gdbstub/gdb-xml/loongarch-base3= 2.xml similarity index 100% rename from gdb-xml/loongarch-base32.xml rename to gdbstub/gdb-xml/loongarch-base32.xml diff --git a/gdb-xml/loongarch-base64.xml b/gdbstub/gdb-xml/loongarch-base6= 4.xml similarity index 100% rename from gdb-xml/loongarch-base64.xml rename to gdbstub/gdb-xml/loongarch-base64.xml diff --git a/gdb-xml/loongarch-fpu.xml b/gdbstub/gdb-xml/loongarch-fpu.xml similarity index 100% rename from gdb-xml/loongarch-fpu.xml rename to gdbstub/gdb-xml/loongarch-fpu.xml diff --git a/gdb-xml/loongarch-lasx.xml b/gdbstub/gdb-xml/loongarch-lasx.xml similarity index 100% rename from gdb-xml/loongarch-lasx.xml rename to gdbstub/gdb-xml/loongarch-lasx.xml diff --git a/gdb-xml/loongarch-lsx.xml b/gdbstub/gdb-xml/loongarch-lsx.xml similarity index 100% rename from gdb-xml/loongarch-lsx.xml rename to gdbstub/gdb-xml/loongarch-lsx.xml diff --git a/gdb-xml/m68k-core.xml b/gdbstub/gdb-xml/m68k-core.xml similarity index 100% rename from gdb-xml/m68k-core.xml rename to gdbstub/gdb-xml/m68k-core.xml diff --git a/gdb-xml/m68k-fp.xml b/gdbstub/gdb-xml/m68k-fp.xml similarity index 100% rename from gdb-xml/m68k-fp.xml rename to gdbstub/gdb-xml/m68k-fp.xml diff --git a/gdb-xml/microblaze-core.xml b/gdbstub/gdb-xml/microblaze-core.= xml similarity index 100% rename from gdb-xml/microblaze-core.xml rename to gdbstub/gdb-xml/microblaze-core.xml diff --git a/gdb-xml/microblaze-stack-protect.xml b/gdbstub/gdb-xml/microbl= aze-stack-protect.xml similarity index 100% rename from gdb-xml/microblaze-stack-protect.xml rename to gdbstub/gdb-xml/microblaze-stack-protect.xml diff --git a/gdb-xml/or1k-core.xml b/gdbstub/gdb-xml/or1k-core.xml similarity index 100% rename from gdb-xml/or1k-core.xml rename to gdbstub/gdb-xml/or1k-core.xml diff --git a/gdb-xml/power-altivec.xml b/gdbstub/gdb-xml/power-altivec.xml similarity index 100% rename from gdb-xml/power-altivec.xml rename to gdbstub/gdb-xml/power-altivec.xml diff --git a/gdb-xml/power-core.xml b/gdbstub/gdb-xml/power-core.xml similarity index 100% rename from gdb-xml/power-core.xml rename to gdbstub/gdb-xml/power-core.xml diff --git a/gdb-xml/power-fpu.xml b/gdbstub/gdb-xml/power-fpu.xml similarity index 100% rename from gdb-xml/power-fpu.xml rename to gdbstub/gdb-xml/power-fpu.xml diff --git a/gdb-xml/power-spe.xml b/gdbstub/gdb-xml/power-spe.xml similarity index 100% rename from gdb-xml/power-spe.xml rename to gdbstub/gdb-xml/power-spe.xml diff --git a/gdb-xml/power-vsx.xml b/gdbstub/gdb-xml/power-vsx.xml similarity index 100% rename from gdb-xml/power-vsx.xml rename to gdbstub/gdb-xml/power-vsx.xml diff --git a/gdb-xml/power64-core.xml b/gdbstub/gdb-xml/power64-core.xml similarity index 100% rename from gdb-xml/power64-core.xml rename to gdbstub/gdb-xml/power64-core.xml diff --git a/gdb-xml/riscv-32bit-cpu.xml b/gdbstub/gdb-xml/riscv-32bit-cpu.= xml similarity index 100% rename from gdb-xml/riscv-32bit-cpu.xml rename to gdbstub/gdb-xml/riscv-32bit-cpu.xml diff --git a/gdb-xml/riscv-32bit-fpu.xml b/gdbstub/gdb-xml/riscv-32bit-fpu.= xml similarity index 100% rename from gdb-xml/riscv-32bit-fpu.xml rename to gdbstub/gdb-xml/riscv-32bit-fpu.xml diff --git a/gdb-xml/riscv-32bit-virtual.xml b/gdbstub/gdb-xml/riscv-32bit-= virtual.xml similarity index 100% rename from gdb-xml/riscv-32bit-virtual.xml rename to gdbstub/gdb-xml/riscv-32bit-virtual.xml diff --git a/gdb-xml/riscv-64bit-cpu.xml b/gdbstub/gdb-xml/riscv-64bit-cpu.= xml similarity index 100% rename from gdb-xml/riscv-64bit-cpu.xml rename to gdbstub/gdb-xml/riscv-64bit-cpu.xml diff --git a/gdb-xml/riscv-64bit-fpu.xml b/gdbstub/gdb-xml/riscv-64bit-fpu.= xml similarity index 100% rename from gdb-xml/riscv-64bit-fpu.xml rename to gdbstub/gdb-xml/riscv-64bit-fpu.xml diff --git a/gdb-xml/riscv-64bit-virtual.xml b/gdbstub/gdb-xml/riscv-64bit-= virtual.xml similarity index 100% rename from gdb-xml/riscv-64bit-virtual.xml rename to gdbstub/gdb-xml/riscv-64bit-virtual.xml diff --git a/gdb-xml/rx-core.xml b/gdbstub/gdb-xml/rx-core.xml similarity index 100% rename from gdb-xml/rx-core.xml rename to gdbstub/gdb-xml/rx-core.xml diff --git a/gdb-xml/s390-acr.xml b/gdbstub/gdb-xml/s390-acr.xml similarity index 100% rename from gdb-xml/s390-acr.xml rename to gdbstub/gdb-xml/s390-acr.xml diff --git a/gdb-xml/s390-cr.xml b/gdbstub/gdb-xml/s390-cr.xml similarity index 100% rename from gdb-xml/s390-cr.xml rename to gdbstub/gdb-xml/s390-cr.xml diff --git a/gdb-xml/s390-fpr.xml b/gdbstub/gdb-xml/s390-fpr.xml similarity index 100% rename from gdb-xml/s390-fpr.xml rename to gdbstub/gdb-xml/s390-fpr.xml diff --git a/gdb-xml/s390-gs.xml b/gdbstub/gdb-xml/s390-gs.xml similarity index 100% rename from gdb-xml/s390-gs.xml rename to gdbstub/gdb-xml/s390-gs.xml diff --git a/gdb-xml/s390-virt-kvm.xml b/gdbstub/gdb-xml/s390-virt-kvm.xml similarity index 100% rename from gdb-xml/s390-virt-kvm.xml rename to gdbstub/gdb-xml/s390-virt-kvm.xml diff --git a/gdb-xml/s390-virt.xml b/gdbstub/gdb-xml/s390-virt.xml similarity index 100% rename from gdb-xml/s390-virt.xml rename to gdbstub/gdb-xml/s390-virt.xml diff --git a/gdb-xml/s390-vx.xml b/gdbstub/gdb-xml/s390-vx.xml similarity index 100% rename from gdb-xml/s390-vx.xml rename to gdbstub/gdb-xml/s390-vx.xml diff --git a/gdb-xml/s390x-core64.xml b/gdbstub/gdb-xml/s390x-core64.xml similarity index 100% rename from gdb-xml/s390x-core64.xml rename to gdbstub/gdb-xml/s390x-core64.xml diff --git a/gdb-xml/sparc32-cp0.xml b/gdbstub/gdb-xml/sparc32-cp0.xml similarity index 100% rename from gdb-xml/sparc32-cp0.xml rename to gdbstub/gdb-xml/sparc32-cp0.xml diff --git a/gdb-xml/sparc32-cpu.xml b/gdbstub/gdb-xml/sparc32-cpu.xml similarity index 100% rename from gdb-xml/sparc32-cpu.xml rename to gdbstub/gdb-xml/sparc32-cpu.xml diff --git a/gdb-xml/sparc32-fpu.xml b/gdbstub/gdb-xml/sparc32-fpu.xml similarity index 100% rename from gdb-xml/sparc32-fpu.xml rename to gdbstub/gdb-xml/sparc32-fpu.xml diff --git a/gdb-xml/sparc64-cp0.xml b/gdbstub/gdb-xml/sparc64-cp0.xml similarity index 100% rename from gdb-xml/sparc64-cp0.xml rename to gdbstub/gdb-xml/sparc64-cp0.xml diff --git a/gdb-xml/sparc64-cpu.xml b/gdbstub/gdb-xml/sparc64-cpu.xml similarity index 100% rename from gdb-xml/sparc64-cpu.xml rename to gdbstub/gdb-xml/sparc64-cpu.xml diff --git a/gdb-xml/sparc64-fpu.xml b/gdbstub/gdb-xml/sparc64-fpu.xml similarity index 100% rename from gdb-xml/sparc64-fpu.xml rename to gdbstub/gdb-xml/sparc64-fpu.xml --=20 2.53.0 From nobody Wed Apr 8 02:52:00 2026 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=1773158149; cv=none; d=zohomail.com; s=zohoarc; b=n9sHGkYuFSrzJ466RBpbuJ2ycb2oAqAlHvVJ3O5FSNCuXcZtjuhnMmrs4pc22cddeu40x3jUuVkfBK4wAEKHPqra7ry/J91AsOp4kcVIjB4YED09k+vWFHwmsxLOP5KLlVMG79PTi2pSwdWFeoKo2zxcOztIzV/RxRa2pwrbqUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773158149; 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=Y8ZSWTRc08ExH1rnCtqpock1Z5jkgGW0xJjAXZvGINU=; b=hG7BAi857iusSwvjuVjsOHu9iXlzqdRUxBVOueVfGR9TE/nQ/Uev+soj/EDLWndA+ECeud+ZiubjQ4jwwfS9j0i74Refn01mbs2sVM499gpVdviMb65fJgeBXogV5JD2UB+S7VuVjAqA7nTsyKUgj38jKngSIK6Dh+h7hOMGj7w= 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 1773158149529878.5026207436126; Tue, 10 Mar 2026 08:55:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzzQW-0005fz-Qo; Tue, 10 Mar 2026 11:55:22 -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 1vzzQI-0005S2-Nb for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:55:08 -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 1vzzQF-0006jX-Dv for qemu-devel@nongnu.org; Tue, 10 Mar 2026 11:55:05 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-483487335c2so110020085e9.2 for ; Tue, 10 Mar 2026 08:55:03 -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-48541a9e6aesm83973185e9.11.2026.03.10.08.55.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 08:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773158102; x=1773762902; 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=Y8ZSWTRc08ExH1rnCtqpock1Z5jkgGW0xJjAXZvGINU=; b=y981/YifxBO2tjJvl/V+bEDgISQJKBhHyo3N7BcRP1obkisxp8gHmlVaz+3Wyki4ND M2ye0RVWRaGbmuDCBXmiETDNbNgd0J0q+lHwcwdbLTqm8krj8lyunnubcEqqvz7eaJpW Cd7bWp1A9h92JUTZdxv+3rF4TBeoxSQpaotynGvb8Xx+pbVE8Bn7Bw/PQPS3TZr4mwLt yEo9N5D2EWM/qpTgkhwHetzjwW+Uw6LxXb8aKO7wjKRPaSqv+ITx53iTPrYRB0Bxk1sN OVkry/u8MeiPbQtn34Uur2ElQWT7oUq+j94JRcaipIzGP3mbJImFG1X8yS2oMJeyh+Dy PWkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773158102; x=1773762902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Y8ZSWTRc08ExH1rnCtqpock1Z5jkgGW0xJjAXZvGINU=; b=up6oCceBaajdf5G4JsU9O0r2Fw1X8PE2rAyfqfOLIItl3jyJ2wUS+o9SR+BAjHZQ/O 3EDfdqBATVn8BOJkJWFw1bYptUFJY3mzQIKJdpIfcTYDzK6qBB0ZeCuBxLtkX2ZNHloN oStCGoMgxBc0p2BGCu/N450jcjshFEXs6N3od2ejb+Bwwt1l3BdP2yGNhmKGrfJ8N6HM fJsdww4qNkCgjjXZURYyGxN29i5ccAesjWbS3u3nmVUSZK5/DB5dMupsuGOxUevTh1RX 0nTC+lIP/pnvQchKZ9Vnj2QH2Sf0Y/HuA94Sj6EEVMF8waDdfYn8mjkJxXzR8A8yaLFi 9hgQ== X-Gm-Message-State: AOJu0Yxjl032uO969ahQ35LAys8uuwvLowhWgpg77BabMSiL7hCOAY23 O8XdZvd1U2V7zg3UVg6HUCQY4JI0zSDnWcUYgk5blUS7ZTYI3ZXZKIUT2SerlVQXjJFPoO4pce/ tChMbl90= X-Gm-Gg: ATEYQzzQKHYN4K5QXvyL95wkH/T0vcfiWzuty28vBi6kF9eEoyCR0PdoQ7DTx8xQtub z6637EaAbp3B4p283ROmT5BUwKc9rjYhNC9TZS99ukjdaeM+Fx7uV2ZdUc5NDFtDUYvQCLUybhf QAW09XUcxOMqub7FyDUiMWPbOB+5THHiDkPACXyvpaT2xwmtavnZXGq9LYBLVTGDbUYJ3s7yeuo sW/woE0ufCaj8xvnNIvVUj3icloQqVcg7iL24oXk6xyKGxGID40gj45GsRuS5FHuYSwB1LYI/xr ZxOxPnR3TVNrMdNAgxkh1qUNg1tEVQHr1B0Xi7JRsagyVh8uG2ukEthuYeuxD2NXuJEaUhJQizZ TgRYzhRxhh+IW0y55loJAlRe+lBcjS99efCQesA9ihlJuJ0VNv/J4OQmYTY88jpFyEtvMmuJfUF itLhJOoTmOpKF69QB6X2HyvN1btMup0s+WYoVprLCT1Y0yZzo9QiySU3Pyzpb3sBluA1QlNUEw X-Received: by 2002:a05:600c:8209:b0:485:3a93:3aa3 with SMTP id 5b1f17b1804b1-4853a933e17mr122630325e9.12.1773158101590; Tue, 10 Mar 2026 08:55:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Florian Hofhammer , Pierrick Bouvier , Chao Liu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , qemu-ppc@nongnu.org Subject: [PATCH v2 13/13] gdbstub: Generate a single gdbstub-xml.c / gdb_static_features[] Date: Tue, 10 Mar 2026 16:53:29 +0100 Message-ID: <20260310155329.48772-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310155329.48772-1-philmd@linaro.org> References: <20260310155329.48772-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1773158151181154100 gdb_static_features[] does not depend on target-specific code. Instead of generating one file per target, generate a single file with a single gdb_static_features[] array. Co-developed-by: Chao Liu Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Chao Liu Acked-by: Alex Benn=C3=A9e --- meson.build | 14 -------------- stubs/gdbstub.c =3D> gdbstub/gdb-xml-stub.c | 0 gdbstub/meson.build | 23 +++++++++++++++++++++++ stubs/meson.build | 2 -- 4 files changed, 23 insertions(+), 16 deletions(-) rename stubs/gdbstub.c =3D> gdbstub/gdb-xml-stub.c (100%) diff --git a/meson.build b/meson.build index 503cde5ea90..538efb7092d 100644 --- a/meson.build +++ b/meson.build @@ -4248,7 +4248,6 @@ if have_rust endif =20 =20 -feature_to_c =3D find_program('scripts/feature_to_c.py') rust_root_crate =3D find_program('scripts/rust/rust_root_crate.sh') =20 if host_os =3D=3D 'darwin' @@ -4328,19 +4327,6 @@ foreach target : target_dirs endif endif =20 - if 'TARGET_XML_FILES' in config_target - gdbstub_xml_files =3D [] - foreach gdbstub_xml : config_target['TARGET_XML_FILES'].split() - gdbstub_xml_files +=3D 'gdbstub/gdb-xml/' + gdbstub_xml - endforeach - gdbstub_xml =3D custom_target(target + '-gdbstub-xml.c', - output: target + '-gdbstub-xml.c', - input: files(gdbstub_xml_files), - command: [feature_to_c, '@INPUT@'], - capture: true) - arch_srcs +=3D gdbstub_xml - endif - if target in config_target_info arch_srcs +=3D config_target_info[target] else diff --git a/stubs/gdbstub.c b/gdbstub/gdb-xml-stub.c similarity index 100% rename from stubs/gdbstub.c rename to gdbstub/gdb-xml-stub.c diff --git a/gdbstub/meson.build b/gdbstub/meson.build index 15c666f5752..b61d2e915c1 100644 --- a/gdbstub/meson.build +++ b/gdbstub/meson.build @@ -4,6 +4,29 @@ # types such as hwaddr. # =20 +gdbstub_xml_files =3D [] +foreach target : target_dirs + config_target =3D config_target_mak[target] + if 'TARGET_XML_FILES' in config_target + foreach gdbstub_xml : config_target['TARGET_XML_FILES'].split() + if not gdbstub_xml_files.contains('gdb-xml/' + gdbstub_xml) + gdbstub_xml_files +=3D 'gdb-xml/' + gdbstub_xml + endif + endforeach + endif +endforeach +if gdbstub_xml_files.length() > 0 + feature_to_c =3D find_program('../scripts/feature_to_c.py') + gdbstub_xml =3D custom_target('gdbstub-xml.c', + output: 'gdbstub-xml.c', + input: files(gdbstub_xml_files), + command: [feature_to_c, '@INPUT@'], + capture: true) +else + gdbstub_xml =3D files('gdb-xml-stub.c') +endif +common_ss.add(gdbstub_xml) + # We build two versions of gdbstub, one for each mode user_ss.add(files( 'gdbstub.c', diff --git a/stubs/meson.build b/stubs/meson.build index fad796a49da..7189ff63ed5 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -89,8 +89,6 @@ if have_system endif =20 if have_system or have_user - stub_ss.add(files('gdbstub.c')) - # Also included in have_system for --disable-tcg builds stub_ss.add(files('replay.c')) =20 --=20 2.53.0