From nobody Wed Apr 8 04:42:28 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=1773179999; cv=none; d=zohomail.com; s=zohoarc; b=c613VxJorsBBcfSdUQJ4Pc0qcOHxyph84uHrMipoLBmwzZk4fQUvlctzsZR117RvmvWlWQklQCb5XawX/pmvEG0yrQ+cgEZ0mpw0OlIYl8zy2i7Iwz7Z250NXFjnfJVcZK8u6Y0pc6yAKjtjJ5rl1fRiAnYdikwdmt0RrBMNMR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773179999; 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=ygexItUeEXdttgzQPivHC99NM1O1p6z1Tt4gdda1o/8=; b=BnMuI1tjK9w4jcALRwp5jWzeP3aLaLZGDVrcLS3KmgpAePJ6e6Ufv/K4gwvXjv1vcWMnRo+MMgOI2Co79Lli8znz7/yKJBOTzgGePDTGsQd5QVZml0gPE4Dcrs33VGsAe9jniFMyodw8VvilYxTxyELiAMqUu7QDI8lwbTT3eNw= 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 1773179999820628.3319534397582; Tue, 10 Mar 2026 14:59:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w056x-00084o-DC; Tue, 10 Mar 2026 17:59: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 1w056v-00084f-11 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 17:59:29 -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 1w056s-00036T-U5 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 17:59:28 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-485410a0a8aso18929315e9.2 for ; Tue, 10 Mar 2026 14:59:26 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b0f0b5dsm2245435e9.26.2026.03.10.14.59.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 14:59:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773179965; x=1773784765; 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=ygexItUeEXdttgzQPivHC99NM1O1p6z1Tt4gdda1o/8=; b=tm3Xn+R36i+wyKf9h5bkhLTzUT1Wjq4sB7T1GYDidNisngHI6rD8U2wl24YpilaTDz k4JbglWPpgfvihpsXH9IMHSr43MQxCmCe0lBU6hHYG8Sn2z2H03WiIWHOM4EVNwlC9m2 wtLOc0k0hacV4i2auW1IzUIUqVBSDG/GTccxezXdssgrz0UPGAUJ3TvxeC9hgnsaOKUJ nMRbba8eE5ks0YPfsrUA4QoHo9F/HuVCaiMGF97B9z/ydKM4vXWIQEvXyN2A7eDqqAxe RRMdL24yhiBaOuirWgkQHol/buK8QZNi1ZEJJU5brIsuWOgb7+oykeOsmCmMWGl69lOj xoZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773179965; x=1773784765; 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=ygexItUeEXdttgzQPivHC99NM1O1p6z1Tt4gdda1o/8=; b=LeO9hCwEnS+EoRZqlfax/cBEivxw6mlFVLgpSJ8aQQHuMI9ZnQSj9IcjtTwAY9K+e7 iKBJrHiNryYcNeTR1bPAm36ZIW6aB46oKHHJGXBfcSbItzo+QCspb7YBbyQ6uL0+bIhg 6sngANA0h18PspRHsju8xBR8zwVgFY6+ImGvcjTQuUklmAHrwNjd/G4vomGNKWYZRErI t66NwaoTcXaPgy2k7UkMOPsWFcJtso2xuqx5CvJfa94urdGenzLnjIP9xB5BEmYfht9a Zgy0gtL4jNFyR8DYbiiGNYwHqnOYVzz0MCkJllKFS8vk6MUEQ34Ob1618ALQ8YERO7fe lVlQ== X-Gm-Message-State: AOJu0YzXBheSNUqPdAhJo7o1TSc8WcSMDzW64korR0ZFLFiIXfryQV+9 +f5UnK6iJa80c4YVhC1N0r+iDoQ2IX11AHptL8ys06VFzgMaobCCTKrQWG2ssjuFNMphAsLzZLQ rMJ4Aj8A= X-Gm-Gg: ATEYQzy7kHczBCjT0b2ja62EFN1YRgoy9V1boU91PgNgJpz2awa+0XL7rK01oJ214Kw XajeTuavDpuZLHmXdLoxNUbzs2z99kmL4ZuCr53177B6Rf9qE+cifca3iBC3uoYTugw3lk7Keur vrTgVqMP8zuCZgMWd/HNK94EEDwrSmr7D81NY3oYo+7o/EFcyz/Esp/iIXmdO6MqWBYpFT+zB3B 9H3ts8+9S5Gbq0bhRX0+ihbfZnKs3859TMEfHmUgTj7MOZKuvV4fZ5DqkeEPQ/LiwSmP1zUuJPf UYgZlErcBr5CVPmMclLP0CGuC5+q3dXBBx23GQ3NaAXblmwubAIyjvIDCdTlsQQj4jnnzM4pUmR 22FVs/qY+QzZFGH+chdrE42m58Aghf8nlSxUMFUjwxONCTYHOnV1cY0w80F1Y2tvBiGisx0pWQv /UEqT/Vl4ZyhaWDyQKXBSIvQDHtauPMGcVrRaFw8jXuFqTKsGHxt22itVEB8dEQtl3op/1OcgXx PKafDBsnUU= X-Received: by 2002:a05:600c:3e10:b0:483:badb:618f with SMTP id 5b1f17b1804b1-4854b11694dmr4962505e9.25.1773179964852; Tue, 10 Mar 2026 14:59:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 01/12] target/i386/gdbstub: Remove stale comment Date: Tue, 10 Mar 2026 22:59:04 +0100 Message-ID: <20260310215916.55815-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1773180002333154100 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 Tested-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 04:42:28 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=1773180207; cv=none; d=zohomail.com; s=zohoarc; b=HNuTsIagB7SslQXBFSHMSIRu+c5dby2wbYubjDhc53iLDU54mERvMgUPZKLOyiHRfxUgmWNykyGU0koA0/V1zESrVD/9bzW0PdBe86GRAbk8FRBKT1fKj/vn5DjPJw06rBqTXZHKFOrYhm7ZtvraZirDc+J54YSfJJLNyHUAIjE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180207; 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=WcpEAr1YaUV0MxrRLaYMsS9o2JaUdS3K79AazfW6DUPf3AiG4xyatoKcICsFHE8DagA9mczeyKtz8NhNzEozEGkRggFYePNMihqL6iQt/oCN2WyNAYjQiW9jtsvCJ/9f67n1BrSbD/pOTLRHsRKrDPppR+ejbs6kHV++toSO0/4= 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 1773180207189172.46412881680737; Tue, 10 Mar 2026 15:03:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05A6-0000i6-BE; Tue, 10 Mar 2026 18:02:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w05A4-0000hx-MO for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:02:44 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w05A2-00059d-S4 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:02:44 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48540355459so20314885e9.3 for ; Tue, 10 Mar 2026 15:02: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-48541b6f6e6sm184687925e9.10.2026.03.10.15.02.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:02:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180160; x=1773784960; 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=nm/x9TGcsbvYqgs/VaGYfyMSIh8QnT9I6qs+3dLup7fv6pqWzDW2shC4tO6TgcxMTe EbFFX19/kSrWPmvAtjx6Ju53y12fY7gnJJKs0NMFU9rAFWWMc/3YeKes+CkuRyaiM5fd ++tlyravhmo+0P64ag535Mdo7bUaCXqkDzKIJlSjoUGVpkc7dEIFw+NHPKI1I6U+enuG /Aq+87zSu2yQHSIgusRPTEoIO5p+6BbKEOU7FHNKIArhyxmyrJxysPBf+i1Mu4HWBtvY HRQG6Bv4/nXq4nk565TREvK1BsqUCQxiwxafpN4zF3t7+Mtj9fFARSOzv36N2+mbqE3o j72w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180160; x=1773784960; 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=NCefdvggrxKHWldabqJfVwE+zIXPgopW3ANhR608lfcRCAlV0afupJ1AlfInXzR4TG oh+PpWOEvZ8esK9rRHn2Q133i5lfcvowivd+yxBiLafJjomAkbJNUUzid+klDqZCeKkS ewLpgmdKdBGjaOkoyj3PygxSkHLL7tNmFrFMbI0x5lLVk5L3uM51uSrjsDS1KjdncYKq n/JNyiaVz0IHg8ejQB6Mgv6HkTG1icYUd3mDt1T1ng8JH7RoTCstcKhnBnwBVXBNjIK1 ks3kuKH/rvwzO/01poyt6kigBCz03+/vj1bO1Y+4pzTFy2R04Cx2N6k7nUP/7LqCj1oQ Z/lQ== X-Gm-Message-State: AOJu0Yztio0Gvhlgtxlrt+LaV7djFxTQHJMgpjEtFJ6D861Htl0vln9q z1hM+DaIAfaQyEHIcJEHTi2uSrt+HJ95r5syiKTE5wS51OS1ZrVNkMnfO9bPdzoL2Aq/Fp2Yl/0 VkzxdhK8= X-Gm-Gg: ATEYQzxTMZP29gYkQprPv9HLj+/LFR2/LGC02GCHpJj9YuIjjvqJGcjV5UZSF2B19fx cnqHoHfsq/gFi+B/XQcynsKvNV7xmBg34nrMk2faUvAoDm3tbV1JFV9gofOcEpkuLdJjJWLvxWz eM1LbKBhn8KKFI/q3rw3RnrOIPeFbUGQ7mx+e9w3hir68uQ2JpC2Lq8Hkvp7hNJjL9rWeP85C14 KVNnPB7ZeYLw8Lr/OsCnDwf9Nr/dts1v4qBAxXbsZqPGKEs3dRDd9lPz81MERrqBRf9g7Kjwo6x 3UlAZnbtKiYWQPYdDA1PikfgSAq/hlvFgVzeU3n2nnQCu87TXdnqzM5q6B/DYb5r09M4V3i35BD /bSahgRlmsJO2YwQsO9FM/OMmqa7IJmNmQYxpuUfLjFSl7dPmJ4sIqDF/V4Uv00VmjfGmOjFGwj uXQmfA4oZwRvH1QeQeVI59otLBTzSNzXj7NRrBiR3cellbVVhRS+bmN7Yu2tmgwyCyU7i+jnsw X-Received: by 2002:a05:600c:4ed0:b0:485:40a6:442e with SMTP id 5b1f17b1804b1-4854ad71905mr7581765e9.0.1773180160477; Tue, 10 Mar 2026 15:02:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 02/12] meson: Restrict gdbstub to user/system builds Date: Tue, 10 Mar 2026 22:59:05 +0100 Message-ID: <20260310215916.55815-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: 1773180208719154100 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 Tested-by: Pierrick Bouvier --- 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 04:42:28 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=1773180189; cv=none; d=zohomail.com; s=zohoarc; b=YyDWOlzMR6LEnhdIJHdwWtK4fK4RnT2qaFCBxNHEhTPVvBXtOy2f7n6avLRDEk0SlP0sMvhhhsJ6CAguxezhA3bF2iKBEqS8Y1gkzg993xfuurZLZQd7wfksKGkmeAcNGzCPH+1dEotKkMrOmMyNmW5XdqDUw+9A/lJXl1SVTqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180189; 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=uIpIWa58YkeuMC/dlDkFzMSQak6otlzxcm060/sRvzE=; b=FWkGhPUYbnsi2kRCap0XPLkzyhGiIbUrnJKo/3x2YUVCD12dlE4jf2oe2DJInHQzmbWBBYcIw7dFCvo18l+60y8QDfeiyyKiw/mU5MafN6BvQNw7G65jAro6ct2sFs3jnL1izggd/FQFR3xiEzEGy8clrDfOyxsjRGnKPRlSP9o= 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 1773180189468784.1308499757473; Tue, 10 Mar 2026 15:03:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05AB-0000im-Ie; Tue, 10 Mar 2026 18:02:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w05AA-0000ia-Jt for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:02:50 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w05A9-0005AC-3H for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:02:50 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4853e1ce427so28768315e9.3 for ; Tue, 10 Mar 2026 15:02:48 -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-48541ad1e4esm108553795e9.8.2026.03.10.15.02.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:02:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180167; x=1773784967; 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=uIpIWa58YkeuMC/dlDkFzMSQak6otlzxcm060/sRvzE=; b=FXHQHHgGlN6FsoilzZLLqCf08j/K555CBcewFv5guQMSk+JeT/BmoXudJ6PPCdAajS bSsxI8K02M9ufSxhOs8ydDJ5i6+d6dhMj3xAmdPeIoVqbBKclC0wr6i8gm3w7Qmk/3cE tCbXkLn03lvUkS3yo630t4ytBWEVesxMl1SVm+9LZrtSNVXDwVTsRWgoHINz/tGogQ3y uVe/cVkrRQOPQ+U6OcoL0Sw+V6L6hjUyBZJYPJX2vW2+tGLfD91K+HbVFYdPcGohH8li KS2o7J6WZup6zc4C7MH9LjQ7OjI9wVhioo0UaiZqhBFZHAmi4NwpAx6ag6ccL4PC8xZx MeJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180167; x=1773784967; 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=uIpIWa58YkeuMC/dlDkFzMSQak6otlzxcm060/sRvzE=; b=wOYzUBxTAwFV5o03db7v0oZN6yFW8YSP+twAsVfx5fMG20uNNKjKWQQV+S0Tm28Gfh NchkxHWQqYX6y5PtIZOQGi9DP/qTQIrkpA8NaEyPrFaDUe/yWkJuZvYPgqJT1uUq1Q47 XkqQU985mUHOE4zQrFywlMIM083cjRLQ185Htm8+nEqoJFW39BvUnE8suvZLGhVrOrL/ 7dqMqhpyTy9nEDJqYTetBciB7WcM9p9ykq8IlmDlsV74OgIJORRMf0vdet7FAQrVCvuO OfBkRiR8uLzy1FxwNWLYlWL/UYpTIyY0Uh07FPhlmEaQvuDofOPJubF0p2dr78ww1xXT OrMA== X-Gm-Message-State: AOJu0Yy879zfBPtOxIGzlTDsgwU/iru6iGpY7LdgxNQmNryMjkedgoyG uVxU0+P5++oxJKbDtGlN3+troGvHMFYSiUrLJnIUf1/kbDKuvU+Cp0rtMeJP1QTL/bqk7vh2SXs +y3TltZ4= X-Gm-Gg: ATEYQzwOLxbwlR10HBv3EX95SKC7qPnskQZvRzT9IO+JdcJmOF0UKkpvjQpmow5RNgj HSBqWIg2QKzVpTA6PCEd1kcxZ4Z/4tDbi2qYXXSx3ymvsQZDXhzHZ/Nvk/ifnkMsn0Fa+Jyp5sr RxpiDxzUqzS7lzFT6ten0M4viD8Iz+EkXhsHCGXcaKzR07/5eB5nd23qRD6vbXZ4L8C/lhTXJ3k +PtmiCF4SQxuw3vUW3QMB9arUWdyrekwwWWXYus9CPyyhHtbF49Je93kkD0ZBIMvO7N4go4Ayx5 EA02937M3kqSPqJnBJJEpGZjXZ62voHjgONjO1YHlNOBXQDJaFO+Vvh7s1hYWRz9bzAq87oQWH6 89NX+hSsBah4hXuosBjVvaXhjJRjYEt9/IUGoNLtBjGgHf11L8O5xDNghR28qiPqir8ZnRjSwNm m/ZqXRT2MEPm8QPc2wXEAKDGcpemGC2KHpNzxZ0DCVpJgRaUaylmwrHUM3XoCXQQs6ba5JCeuf X-Received: by 2002:a05:600c:4710:b0:485:34b3:8587 with SMTP id 5b1f17b1804b1-4854b0bb77dmr6345645e9.10.1773180167147; Tue, 10 Mar 2026 15:02:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 03/12] gdbstub: Simplify gdb_init_cpu() logic Date: Tue, 10 Mar 2026 22:59:06 +0100 Message-ID: <20260310215916.55815-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1773180191447158500 Ensure we either set gdb_num_core_regs or have a XML file. We shouldn't modify CPUClass content, so mark it const. Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Pierrick Bouvier --- gdbstub/gdbstub.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 90f4b95135b..221951c22b0 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -582,22 +582,20 @@ 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 { 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 04:42:28 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=1773180574; cv=none; d=zohomail.com; s=zohoarc; b=KwYfSiH4EqZbf10L6lmlxP0o2dZoSW4URdOgxCKm+u4llsG8hsr410Drt+E3C0VIb855KKIvmkXtiNIIaD4yOkArF9QncV8dMRsYhfmHv7oSzWvr+H6IGUwAPwjuw1gcyO8polvus4UpEjdEyjrC0vdFR8c+NjJHjbBE3lIzfIE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180574; 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=qP6mhvfboagZfdnGf3ePpi/j0YnGinN2WFbaLK9p8Qk=; b=fs9/FV0s2bmdVdnpnnlUYA5EHOPIEp7LEAn8Vbi3MG1jSo9nS0HVaWFBNcj2vPySSDmb0aTGJx8W6C2YyRzL+97zpxRDZ+LHNFcJ1oa32s2UP+um/YlXSF723o0HZbaxPSnx7OyImPU2tHKzCBvE0TSBcthToxubkrjsJAGhO3M= 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 1773180574558420.23050276605466; Tue, 10 Mar 2026 15:09:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05GW-0002jK-4t; Tue, 10 Mar 2026 18:09:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w05GU-0002eu-SO for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:09:22 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w05GS-00024F-JY for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:09:22 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4852a8482fcso39746455e9.3 for ; Tue, 10 Mar 2026 15:09:19 -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-48541b7f406sm101442325e9.13.2026.03.10.15.09.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:09:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180558; x=1773785358; 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=qP6mhvfboagZfdnGf3ePpi/j0YnGinN2WFbaLK9p8Qk=; b=FyzJq8ompTB1vnmDeHT7mrlRPVs6mT8Y5Xj8TI6RJxTtTLCHubM8X7wGM2wyUBcWeY y8/COXycor8j1zp6j+dw1Kq/sphbVCL3dzl5c5fAESfeVU1G9QV9cFefTmpCUduhbCrG XqF22Zk1zRFGhjmqOTyv7E+8hFSr8C16uL0SI2FOr8/Zb1n2YJQkVsBb9uAVPtCywgUq axU9X1l0nuXAsNpHEJZBWrpLZEthhF/I2ut0qW5wj2KlQHazN+7kNBtIwTOeS8au9JVJ ZCvYCEk0Vn3AtrVRgllbHEGDPmcZcCmTpgkaMYmaYXcf+xRBLE2OES1ZPxskl+L/3iCw D0lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180558; x=1773785358; 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=qP6mhvfboagZfdnGf3ePpi/j0YnGinN2WFbaLK9p8Qk=; b=j73EtwPurIU3zQcRrdeWE7GVpXAf5XGgIokoP88werH+H4pUHEIdCevEvFP36O5hS6 1OTofX+L17ttE7h1mTJ9/6abk8GctOe5nBnDLKXr8BMMH7VCRtCwv6VIMejLOPbzI6u/ nBs3c1idEBRr7MGa7R2zZ2uVjmIODFbQ/KgMmMLgpprKq5S84/J9ZqyfHdjXy6leQ7Xv VDmujcdYL5pVPu16T9ZuGrmxKdhAjKYh5djryhNq4c28Kxkv2kgjrIQjgYo1QDfFb6lb uhdz77BsH0mw2Df9lduG55lbVxC0CGSLbkqugUJUSVsG3ucVZhwX0BPD5wMukNIVxsGW se5w== X-Gm-Message-State: AOJu0YyCIsfYGbPk3xiVgMTi2Dxws6JoFDz18Oy8olI4Zwo8/jzeHXmS 5vYSZDMv0Y54T3TawEAiJDfOppYN8CUi8Hz9WejmGTJ2kw/HhUkwS9VszVYsae9q99f8qLq/7Jp afAPbrJQ= X-Gm-Gg: ATEYQzxiOukRZ1GeBx11c/vNEtWck9zzUsT9CMB0q4LzrecZV1Fxp8/xX9g0DPpMZd5 Vsfg2EKvRiKL/IFAFVsDsvcpdA0JQXrS/gXGOvCpRV79aE5Ae0uDXUOEasDDndqnpCQN4k3skhA ZkVeJ9G4SID9wS7o0JsUw3Jbj4ADwZf2G0S3BPFIkcidB0DYTYx67kkdjwd+vTjNKgaU+E9XFox UuAvhNWNTWY4lM1p4VNVdTnPIRI2xUZF0lnt+k+8K3IGpRjERbfpUF+/H3QlBjwe202SEdaHKLE abysqAAL5JPPWuAHl8cQ6xi6Dxcv55Shs0EEqGQCjx8tpZ9ysP5E4pLQd0aEmPVnBH1FENZ5QDI 3amJr3txslhatR4+qZua4DqeemqtbZxPIqa27c053LPADO94Y4sBLz4IW/cYE64vOYwLOXcW96Y /Glvq62EZbHgGkWCfWpyAFdat+u2SW120x5rUIlJk6TSxBGYehmP6pay6I7OoBzNQn6wUSVTyz X-Received: by 2002:a05:600c:3106:b0:485:39d1:b500 with SMTP id 5b1f17b1804b1-4854b10576cmr7933025e9.16.1773180557569; Tue, 10 Mar 2026 15:09:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 04/12] gdbstub: Add trace events for around XML parsing / generation Date: Tue, 10 Mar 2026 22:59:07 +0100 Message-ID: <20260310215916.55815-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1773180576358154100 Add trace events to help follow how the various files in gdb-xml/ are parsed or generated at runtime. Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Pierrick Bouvier --- gdbstub/gdbstub.c | 14 ++++++++++++++ gdbstub/trace-events | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 221951c22b0..5c1a18e055c 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) @@ -511,6 +515,10 @@ GArray *gdb_get_register_list(CPUState *cpu) name, r->feature->name }; + trace_gdbxml_get_register_list(r->feature->name, + r->feature->xmlname, + r->feature->base_reg, + r->base_reg + i, name); g_array_append_val(results, desc); } } @@ -563,6 +571,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 @@ -598,6 +608,10 @@ void gdb_init_cpu(CPUState *cpu) } else { 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..8caee36c242 100644 --- a/gdbstub/trace-events +++ b/gdbstub/trace-events @@ -28,5 +28,11 @@ 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" +gdbxml_get_register_list(const char *featname, const char *xmlname, unsign= ed feat_base_reg, unsigned base_reg, const char *regname) "%s (%s) [%u,%u]:= %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 04:42:28 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=1773180591; cv=none; d=zohomail.com; s=zohoarc; b=gFmDppNPyMWZz06IUNhkmWwuSYAVhS7C0UGBHhh4eQf5b/it+/G0MNMjxhffFhPCyigEWTEgUJh067532YrDnwDZzdyJcAiWeiu7yyusYR95B6GFhGzHZDX9Yb7dgBAse1nsCLLoqV/R0SDm0ZLoyhUWu5cef2frXjbZBPekaCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180591; 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=dDaL++HBMS9omWpSb5+h6hPSvNLeFDhB9+BTCn0I6aIGDzfeQjKUo60GynM2f1VwtdtmeA7LRt1rP2HMQxN8PwmOiaIY3nEFNLTFig0dojRqn9V+rJ3eyXRC5n2rSt9Su/lBSTJJJ7lcpTv30FeGN2vQD+pZkA+e/YXwYUDryus= 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 1773180591743270.20470848427476; Tue, 10 Mar 2026 15:09:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05Gc-0002le-4N; Tue, 10 Mar 2026 18:09:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w05Ga-0002l9-Il for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:09:28 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w05GY-00025L-Sn for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:09:28 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-439c6fc2910so5202924f8f.0 for ; Tue, 10 Mar 2026 15:09:26 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439f81f1318sm1233248f8f.21.2026.03.10.15.09.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:09:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180564; x=1773785364; 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=yVpj+Tm7RZcQW3qFgeVJxT++0upMn/rV/KR0FBrcGgGj9pHtu34E3/DZC+AJhYnLk5 4n92vh1dyJgenGtTr4x68btYeDrapJSM6KzEdVX7bWDh9aPtgQ5DhHK/j5ed/yRhoIGc 8i54MbNhm9tZduqTw1Ahf3UanYfpJofaJabdPDfLeYPCncyKOnM6jevT9xTtuGdsbF47 EDBZS9vL7YieJtORsJKl2lVRpZkkl5QDQHctMOSToXEnLf8r86AAtnZe+KZbX7jn+nRm qOIKP8IHvdOskfteWk3Jpj/0ZmqpIUXrZj/kJBAnP3+nSy40dmmGO0PPt5EluiPhVKDV KIBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180564; x=1773785364; 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=pMQsqQJ+lDNciVOgB/gjqqTPdgjfiCHvaVgBBS/E8Cg76jl2lGi+mBIWRAmoFaJe3d UyozeWq9+1kHHDAA1+K04Oj7YfdbfmHxZJYEI+E7SDTdegrg8W/SnvzscbMlQbpHbIKc ba0XfDkAjZJLfHLu7poBw6zHwa4m9rijwGEbN6L/PtcU8H8NF+wtXlPFJiPIqOfcTtrx 7G2aZMUVxb7alfGfxt3UNB8UpwbG3i4Xjz52pG40nSiJh2nL2BUBtVXQ7U7+encpFCSb d3ytkSg/ez894ir+xGTYOs/PzTPBGaDXHC0tA5vxhT/XWNmHjcWjlawFE7LojwrsKY/5 2Yvw== X-Gm-Message-State: AOJu0Yz11z0kQVmSj81W13v2U2AYQtSrzhqmX7noBxmuV59+GzzYYDTP DBXdUHFr6m5mjdLi61PNoodoYsD6iawzhT+s/Yr3DDxW8swcTSz7advSNiCjUE/SlZ0TRPD5pMt /KTQgiGs= X-Gm-Gg: ATEYQzzNb0MLc4fTOGB7zMmPC5e8vAZ1fFMXDCojCKigL0svW/EA8A+xj3U067Expwg GNQsrXS75Mw9Z3kzMl/yCAZhUXsetW2StapBvsnNLjbdE3C6XzK18JXBqUQ+OMSjERnb7AmbXaJ 9VMl53aund7X+2EO2c/RdXW6OI1pqr08pqn8cjB5mALLUuebCH2JGtSShjo/gWdOjNKBwguqm63 Udbt3u20AOZmyuCVOzqaA7JCTvhmNGaFglUqAGgs7UEBT5W1eweD/f6O8/NBvYFm3kQn1vI3Qs+ 1CNzeD2luNpISsN69mUKHqNPFWNfYUMQ7bKabmjBNVG4PcCCegZAKR1nRmswDvCAcSSza0QtInm 33qJGFBKI/FWiRtl4jgUtZ9Z59UBp+tQa4AekfJg8NC1n2VIqSlgsCOpoyHRzEjuYKGSf3yzYL0 fGqtuqMBITwN7hq/bm84pa54YFmxHwWdN8i4Ne2c4+29emJ8uf2td3nywWIw7b4s6QucPqiKzs X-Received: by 2002:a05:6000:3112:b0:439:bce5:6508 with SMTP id ffacd0b85a97d-439f81fc613mr885186f8f.14.1773180564480; Tue, 10 Mar 2026 15:09:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 05/12] gdbstub: Have scripts/feature_to_c.py generate more verbose output Date: Tue, 10 Mar 2026 22:59:08 +0100 Message-ID: <20260310215916.55815-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1773180592795158500 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 Tested-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 04:42:28 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=1773180639; cv=none; d=zohomail.com; s=zohoarc; b=YLbCPOU85YmAIrDsrfVRmEjtAVAcCoELtXhYNg342EOPDcQjhM/NSJ24aqcXV+onAxcILTw/qqgK1yIPt+OlH1i6Bb39+gb8Ilu1FpbVd+GWLU0AzPpK96UyjkGj/kUFi3catPyqKeEmIiW9MTBNpEPxkjoxOjsyPrxsvCqaIgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180639; 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=hBM3Xmt75d7eyelWkooLkKiDrmKXxTC/AImhTRAst7ej8nBaZo5oJ/+tojqcmOE4reUgOBsct1b6GUwuyNgKa3GjEoFl4N1xQdtUErN6tS/aqKo6+A7+oI1o8gRfKFaqQnedpH5QaMvDwHpm/y+rLHnAlYXCAd7vFgp9kvJIv7Q= 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 1773180639524507.41801156123097; Tue, 10 Mar 2026 15:10:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05Hb-0003cg-Of; Tue, 10 Mar 2026 18:10: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 1w05Ha-0003cV-M7 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:10:30 -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 1w05HZ-0002N8-33 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:10:30 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4852e9ca034so37170975e9.2 for ; Tue, 10 Mar 2026 15:10:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541b8d4easm117918415e9.15.2026.03.10.15.09.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180627; x=1773785427; 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=QgRn4z7UHDFNYXasuO3hbTj40lsU0VLw4ChIqX229YvZ2RovUdPGU7+HJWQjM+PdMe cSAvdNU7SY2drHGKvKTt26zjTuwJ1qrBFl4y9WXuiqhqemSSDRbww5AgU0/+v7m3hdGO owQ5n47vH/w+LJ2URX1NN1J3qaMlLemGcBfXDCw25ul+yjhrD5WqCoZO1uSnaOoiEbG7 YCsEfzCW/7h2Kn88iEeI9tYLns6Ai267jictKovjwbjnqqd8INoBR53PbNto5fBttn4S sUcVETsvv9un6iV6tlvu/MAo9WTkcQ1PU41mB1qvEl5STFIzo4+K9EWanvXyro3fCM5R N/fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180627; x=1773785427; 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=fmDSOFldxUrnDgQKfs3ICgRkhBrFIhXd+Xj91gXYuoqVDHsDvzQrs5JLKL0YIPpa51 oWDTNzQR4oOYz+dHrurR2PT3AQGMtcPzJ2Tf2yGz3f8X8gM4v5sJn+0iF/E4xaD9w5S+ jY/qy8EhxQl0TVyk9dFgGi9GzLWA3dbrH1WcDAlbHDT8kHxggm3+i9zafiuQxwfIDUAV RkgPiyyNVXJSBV9EejKIvjrNSUp4MB+v2ws1gJ3IpIhStFov8vCX+1fbrE+sJCJYJVbV NDKnH69bG64ogVD6oH2LAGQ6uPbVEZG4kESqd/NecAzw8Zz2Cs2KdzuUq1rNUJQGK5tL 0AHA== X-Gm-Message-State: AOJu0YxtR/zfWh85EeIcjaBMZfB6rnvI8GubZqDNVia45PMSKuR7Tejz CPV6wbG9lcHcegInzQHxIfvYrM4vEQEg0sR+jn+dXjP9ZfWICXeedny7e+UOecmFzOuzSdbuka3 PmRP8Ce8= X-Gm-Gg: ATEYQzz9naQjpw2XSJgVlAsjqOrh+wnYxtrQjpN7nUYU8D2PF9C1rFLbR+pbhFCQLEa g4K6+Ko0Y3L1Etlt4vmz1nXftj+jaHaBfVW4l2r2RYM5zzpQfdZUSTncIj9MdwiP1IChUsqxUnd LNso/2uAKjEnVJcABWRyiGQ1gCMYeyNL5OzTMjfQ7cHxintF5PDdzubvww941rsT0FglXadzZFa mcg2rbzFjNm6gopmFHKxPQOgD5ECKLC51NI3Zkac44J2vYhaeZY0uRTrm2DZAKedPwSjDa/dB9n HWEX7sT5SCmY2A7txAFhbbAiczHy3EXVSd8WG8YqzocMIfoPljKzGyju/cZLP0CKB+zSRhGwXwE XelJobuWMqFh1UTWAh8aYLpjWIJTM1ZoNMQhTEnuf+oXBCiV42bQMkQ7oJ0A689+xI8QVw3kcA7 fwXHWPLojw7xSEjFKdaqfM7q69b1zJK0z6UX8oXOL6JaQAb/V4wSykIBryda6mYpCHe4oRpjoH X-Received: by 2002:a05:600c:8b0a:b0:485:3ae8:2236 with SMTP id 5b1f17b1804b1-4854b123cd6mr6063875e9.32.1773180626934; Tue, 10 Mar 2026 15:10:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 06/12] gdbstub: Make base register explicit in m68k GDB XML files Date: Tue, 10 Mar 2026 22:59:09 +0100 Message-ID: <20260310215916.55815-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1773180641031158500 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 Tested-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 04:42:28 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=1773180653; cv=none; d=zohomail.com; s=zohoarc; b=eI8pdEeY34GDr1bwXVaH2GFte+O/0c/5CvHXNTmPDJaXwkh3oNfLwq7IPpPdrD7Y6458l+iZkLx9R2unfvfrlaDK7ucRNLXJfaw2xZN21BmcdFB+TY2AAJblccMS4v9ZNOxcsyS2CAaSyyU3YFX8QAtdvEnjHdnfiqAfbxFXqF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180653; 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=kBupqZhFQ9J3Yuw/KGczkN2BtMXDdfm6L3KiE0wMuZs=; b=NLcPeu2NCE55/ASN+9dWHgxAhRfBmkCUXruMba7T0zj9FYQ0TfUgdwDyS3nPO/uspw4xdqV8gw44P/fXGoOG7Hu4k5rXv9vqUz29xaiRQcbH81G6x3ogAbDTKXPgjYchHnDmEv8DSl12vfqOcx/KeHMEvW/lpxvqXrH8qo0kOM8= 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 1773180653855852.344372271012; Tue, 10 Mar 2026 15:10:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05Hk-0003gQ-1A; Tue, 10 Mar 2026 18:10:40 -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 1w05Hi-0003du-9P for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:10:38 -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 1w05Hf-0002Na-O7 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:10:38 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso109805645e9.1 for ; Tue, 10 Mar 2026 15:10: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-4854b0dc76csm2419325e9.24.2026.03.10.15.10.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:10:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180634; x=1773785434; 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=kBupqZhFQ9J3Yuw/KGczkN2BtMXDdfm6L3KiE0wMuZs=; b=uLT6w2OdLeu80pujH3xp+SnIfEvMpuuQz9d/DaHQ2Z5rqnXAIONEW7qll3WoqXf1U5 LOm0S6fIlRAo/5Bnc3iRUpq7NJ1nQtIlDEDOpyANnFSCluRvibM0FM84rv+bVqhXvDcz eG4Bh1Ge4Df2GsjA4Ut6SXvbNSJwYwJJRwCh1MRVrTQ75PwC3LZSExzb0akA+CvXYpI3 00NAJekdcI9CBGAIoClsPhHg5rXmKvqr5dbclFVawlFdut/zLrBxS4hSontFLBH1EQhy xcKa8lVSBQJ/wLVtyMqk08VnFPJoXs80c+QCRFcL5uoYoeTgLP1EB+iKlIw++b6MKPjM NJlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180634; x=1773785434; 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=kBupqZhFQ9J3Yuw/KGczkN2BtMXDdfm6L3KiE0wMuZs=; b=vFax29hO5mqbciaHqn47KTFoee+wokucRfNPlkzYixu6226hQNvcPXtjRy4lWmn+ZL YE/H1yD+Eu7ByB8Ap5fKqFKCqh+hAJ4q0Dko+nEXMLGJaKzXk++JOJphUPa2qle28OV6 OPw2puBkTKRfeiK6Ti+TkCrcj+GqD6betOQHcx/03/ke61o8GM4Ro6zUXmfVWXYunY3n JsT3QqZLPbPGrokpR2HFMXFgORazN837qo58KauHTreL1vkqrM28IkoVhwumPQ1knkVg CuBsuuL6TRq8vQbOKEZW65I6q4OLdlwAT30JuatBLPN151/t0ZuA+k8CFFboCxb5RCEa FpJw== X-Gm-Message-State: AOJu0YxtQNuSl92it4VjJ8egXeJFP/ugOlZIKUq/k0AWJM1oK8/vcsv+ rHjRyCTRw45t3sC/pwpDyar5kzZ/OpgCM2mM6/yJkCg87WofG5fSY9sDb8lQzIyOi4LkAUh6Wlz xBP2mNfs= X-Gm-Gg: ATEYQzztnwF9GJrVouKs7NZTX1QkGXiNwKy4nloRyPQwS9ZBOvRAQjk/l9B1EDJvTFj 7ljbF2wN/fzNjXHwPtUTfXa49BOLu0RRW8BcpTRY2mmT+XLGj+Mqg7PUC/jTeC6JJzdRNRiqKVG gnGw/zGu56NoVd/demV6ergZkwBrtbe6DHoG8rgl51Oo+bXqf5NN22Vcb5c+watgIODFzwULdIo uK72jY+0yiznG5yAJqpeure2wIXupySDFxFoUWKCgDJ/n0bRh2Rk1330oIcFa5LQyL1r0YUISBQ f29VxkwN/wZ1KdmSVuClcAI9gS2zBBbK/I1+XBroNBEeDXdv+WD2zC5ydKBx6ZnKf+TX7Vox4ON qDVxo9ez2acI4j9STozFAXzpZ/cAFt8+OPNUxGQiPtjDvtrBseYDJymkkLK0w9HxQoLKZ8UjDc+ zHZyYP+Qosn0zNgJYlBw+qVhB8rnZWAoQYQiLkXccDBsp0YkBgp8iXwdKs8LWX1oeMoefFX4bi X-Received: by 2002:a05:600c:46d3:b0:485:3c66:e230 with SMTP id 5b1f17b1804b1-4854b12ced9mr6139655e9.29.1773180633734; Tue, 10 Mar 2026 15:10:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 07/12] gdbstub: Remove @g_pos argument in gdb_register_coprocessor() Date: Tue, 10 Mar 2026 22:59:10 +0100 Message-ID: <20260310215916.55815-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-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: 1773180655158158500 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 Tested-by: Pierrick Bouvier --- 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 5c1a18e055c..69038c66f2b 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -616,7 +616,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; @@ -634,14 +634,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 04:42:28 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=1773180661; cv=none; d=zohomail.com; s=zohoarc; b=SHzYjKceWGmDh7tzkWqKjEzPfDW7XgTOy+X2kAoymD3JXaamZH2ocuArtBOTeR9W/tSpMKObJAV4fsjS2Se4/QoedsWRJBLyCfasO7lTnqO/9Awyc4Aqlk2HjU3bb/fwuBu8noZvh4851NSEscyt1y/kqdl6Uf78AEwdx1zs8uE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180661; 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=CjEcsXNZ036Ec7T4C0lyTdBs5iNZFcT8u0tdedwboOLwOYtlOMTQV2GCX6+ML17BNszNnpZgAee1i9BfmvWe+yV6/hC0Jio/mNmAQIxFgZcfsd3iC27vL26IgaNiayZLfbGz1M9uDtcHEc8sLjvqRBBYFFIxIsTKGw2vBFox+mc= 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 1773180661656434.08901628694684; Tue, 10 Mar 2026 15:11:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05Ho-0003vQ-TO; Tue, 10 Mar 2026 18:10: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 1w05Ho-0003tT-0h for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:10:44 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w05Hm-0002OP-CQ for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:10:43 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4853c1ca73aso22677525e9.2 for ; Tue, 10 Mar 2026 15:10:41 -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-4854b65fe27sm3520665e9.9.2026.03.10.15.10.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:10:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180640; x=1773785440; 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=spx0Y0s5IrRaAR+SdTE264i6RE2gjHXYVulBFbK0Otg4tgYZC2bjxTqMDJerlXFXre h3GsfwQoVggOeT9m6ANZNhteFr91speG6oZoadIwyPUNOUtanhS7XmJnqtIQQtq0lm+q 6CwLeaLoLSkI98vAUhn63R55xqNYNbw9xblC/T5LDZ0avyzxq1lTQpNyvcD3vcyWIKaD jxF2QWAqmd/bUTd20/ZLxIvAhGOz4oqzdAcEd1rPkiPh5PXVpIgBGSSVhgDXasuxgLKD zP1ZylxCefY4Devh8ijlNCaqJ1fj+pqjubnIBHLGSpcM8CK42bQw+MdNm6ywTAwtUzQB qUzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180640; x=1773785440; 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=XvL6pZMtajBo6UooTIlB9eWDRrk6L+Ga4lQzZvfcioDvsCROtnhE9RpVnJtDmnTiZZ Wjy2sl2fvqfF10XhPIj2ojor3hW3DKpS4AZuoS8tHPsnXvkik9Mbp77IKa3CNYDgrnKY h6xz98YpUKmKOxF5Y+FQ2hafkIhBU4NXbRKITdCI8LSioPQ3iw3JyMP9eaT+Nm+bVPa3 wxARagud+V9sLaUGpppglkqoL+YTL/pM5cK1sUOHD6JsZF+XznSNia1ZOnIYVQr0Jnoe nB6MgCs0GeOqMT67D5mMZIGV10MSViDB4Unz8b7uK6YdK+Zemu7Zmlem+GU+icSMazMV zUYg== X-Gm-Message-State: AOJu0YwEnUq+C/LN1YjdJOzGHkGRL2SqjEOd2WwjK3zHYIYI9OT/m0iK fJCjy6m6iGf8F6mFXGuDKlDp5FMhTIuaC0Ro6HO0LRyl/2WeRe/XcBRuZDDmexWTxxGecrBAyfh rn0ssqX8= X-Gm-Gg: ATEYQzwiRlQJpSokoXOMsc+AFgRt2pje2nG3mqyjrrmj2DYxPEw47Ns1yGYwCC3vcaJ DZFNxT7ffOrt6Lw6ZrBtGQfxexq1mF4xJ1BHwH+40Pc9x4QJIGIvUfzPxM9LpBxNSPjRWf55BDa soAqpjupRwSoUsgrqu01PHvdTOVXsMl0JgZYlZkCDDUpqHg25OoNstBxT4CT9JvrK/wb4KH7ShN Z7C/JgHTKl6ASMvTLkycvJWwdbd3fmh+ioxA868uvt8bJh7Ohga2SsefvTtqEL8UrOFFAT3DJ2J qni4+m8gz6rPcbkg6Dcyn8JafGFbJA4uY8P5VdAtVBH3tRRDfhicZGi4olFiJJsUq/fHPJbQXMp Yhy2+8nqzsagIognrNfLyvIXYWUJjMADu83fFgUmaFf1mYFhmaYrmtUQYcwQwEF7hIrq6TBdFOb 6FTkbntjw3Tjb5IgP2NX+XAFqD4rEojkT/jIqAy94771BpS1ZMDvz4zvJ4gQyT0WNzr5RwT8WWV q2yd+4FaTE= X-Received: by 2002:a05:600c:35c2:b0:485:3f58:da1 with SMTP id 5b1f17b1804b1-4854b0bb3famr7103655e9.9.1773180640491; Tue, 10 Mar 2026 15:10:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 08/12] gdbstub: Emit base_register index in GDBFeature entries Date: Tue, 10 Mar 2026 22:59:11 +0100 Message-ID: <20260310215916.55815-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1773180663296158500 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 Tested-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 04:42:28 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=1773180670; cv=none; d=zohomail.com; s=zohoarc; b=XqNvEdQQsoEBQufNpFTzDmwB9bjEO1lwtOssxftm8XUOW2ZFAv2tsUS5AcE2dc0LZkX7PaJva7Sh+ZFjI1nkl7wuLCqjILW6ZYbaOTzbcAJotWg60wPuN2yTECjxUppy6rV9LRbg5yHjFLqloOiN4mKW5mb8PYcTW5n26joM9mE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180670; 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=+taZkY3dMwbzz+K23pIIxQ5+P3Tgxt3EnFelTHI+VHA=; b=Bfyf9DugUzvov56u9rhlG3+kWF6GfNI5okn7Dmb4HZQMv9LWnoCNyF9BsC9wbIi8nzIhCAMML2Kb8SrWr4bdd7kezJrXWz+HWrYufAQZhLZ6R7zqgp4HDV5hM7I25MpIJTTs5hppA9N20Y2QXh4BNmS871uCXFbCChicZHBPzhk= 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 1773180670166102.83884716559703; Tue, 10 Mar 2026 15:11:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05I4-0004BZ-5z; Tue, 10 Mar 2026 18:11: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 1w05Hv-00047M-1s for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:10:52 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w05Ht-0002Oz-AN for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:10:50 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4853f2826f7so24813745e9.1 for ; Tue, 10 Mar 2026 15:10:48 -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-48541aba60esm108944135e9.5.2026.03.10.15.10.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180647; x=1773785447; 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=+taZkY3dMwbzz+K23pIIxQ5+P3Tgxt3EnFelTHI+VHA=; b=XCcPI8MQPtVwgMrvcFa7zupQGXqnUKNlv8uFoYXwOYg86fCd+VcLeAudJzfWm5FkNF aBwnfbydw/J5QGfw9Apjnfev+JvpSmbHC9AmIZ4DC4maIv13VT1q8G7mcelWHAmkXUFR f1sjHTUJO9tXsLBJI2BdZ9oeaoh7VK0Py3fJ6Avmfaa5kFNuwsojKPaqKoenLxP3qWi6 CWyS/6spEXC1B/kmDSV9eQer8xKIDns0N2wpKLHIb/2D255ubVR9KEnWuQWg3ozP3L8W 2mx70Ci7+KSUeCjynOOCQOtGguLsxJphKa4bRrzZN14M/VFwS3TTH5NZFauymYUyoJ3a fhgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180647; x=1773785447; 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=+taZkY3dMwbzz+K23pIIxQ5+P3Tgxt3EnFelTHI+VHA=; b=D1XXfsPo/Nn4Yr03iuh4nCS17R4UgIGPrIAspWMjsF4/6fToaOJpw6o6hLdnqk9bWS gW4x+wXD3T3TrpC4r2LvIXCoR5vzZQco8hRNDcfkjWowIIy2HwUU33xLv/ecrc4PRfvr BQQ9cRz+mUq4oL6WZMUkFBa1Ncue99zfDF0i/og05QCQH8s6o36Z5oN2zFf30sVXn9NL OLHICWzaEhbvlgagIEBv+qoiYrGvpCDwKRWZy+oaejSaF5fSsX45smMtk0sbuloCUuxV atA/Frs97VMeLwx6juaxGD+a+9l0pduvwSi5n3vSz01Pwmdw7v7p2j7P263QWza2Cytr Mo9Q== X-Gm-Message-State: AOJu0Ywvd4U+fU9vj5FZEfBAH27zDU8dVHgwwS5WYw3V5o7zUKj+G2DI k0rhHs2owwXqqjQH0hqgMo41BSSm1K69vCS6Yq8pEDPku1bnbjs1+DcE8sUG4W7ZglSGUyvMcuA eWyrtM+U= X-Gm-Gg: ATEYQzwBbSu/LFbZZD5PuOS3oxk6GBmCWV/fpRZ3UchKC+ozc96Isi+DZGhGLXcD6GC NsAiIJ26zzTgRRoM8Z3pbQ8GfVOsdXLXwLsDK+9eZb07xxjwkg170EKWQtNXRUTsQ+lwQVmmSFI Gr9JbCFCKr++WTn+xTU22td1z1cnPs+KrGjPM3tCYiX/IiEj1cRFUzjDFE//mFe7Yk2LRHMK05D /SL2zDrYm3HqX4GNQ54WUDKEDfM9wjj/6AIxaQPkSuiCfruz/0BaCcKClU4RTFT298E2zxuvCaI xE0gbzlbsAODTt5kjSNplf79X/xjReM/z3LBrYEyHrMc1YyzP67KVdsqyM6bXHIgSeVQMH846tj M5NR9vGOK5kuiAwG9wYL983n0+u+s5fqWnhaWmJAmN6ASVWiqvulgzXoQtDCfzxfOSu9qdV4/VV Sg2JNsr2SSihQPpeRZsfWTOjqXajGL7wm4fj9wBSiY2fzX0eTv3ihki400IOfaZH1Smz5RPPPB X-Received: by 2002:a05:600d:6444:10b0:485:3423:727d with SMTP id 5b1f17b1804b1-4854b1b1918mr4068865e9.26.1773180647465; Tue, 10 Mar 2026 15:10:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 09/12] gdbstub: Consider GDBFeature::base_reg in gdb_register_coprocessor() Date: Tue, 10 Mar 2026 22:59:12 +0100 Message-ID: <20260310215916.55815-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1773180671212158500 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 Reviewed-by: Pierrick Bouvier Tested-by: Pierrick Bouvier --- gdbstub/gdbstub.c | 6 ++++++ gdbstub/trace-events | 1 + 2 files changed, 7 insertions(+) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 69038c66f2b..c3c944e965b 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -601,6 +601,7 @@ void gdb_init_cpu(CPUState *cpu) if (xmlfile) { assert(!cc->gdb_num_core_regs); feature =3D gdb_find_static_feature(xmlfile); + assert(feature->base_reg =3D=3D 0); gdb_register_feature(cpu, 0, cc->gdb_read_register, cc->gdb_write_register, feature); @@ -630,6 +631,11 @@ void gdb_register_coprocessor(CPUState *cpu, } } =20 + if (base_reg < feature->base_reg) { + trace_gdbxml_register_coprocessor_gap(base_reg, + feature->base_reg); + base_reg =3D feature->base_reg; + } gdb_register_feature(cpu, base_reg, get_reg, set_reg, feature); =20 /* Add to end of list. */ diff --git a/gdbstub/trace-events b/gdbstub/trace-events index 8caee36c242..5bc83946743 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 04:42:28 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=1773180687; cv=none; d=zohomail.com; s=zohoarc; b=czSTQZz3SKy9ePeD4vEJMNl5ruvJ+u9exN1Bruv4gX38VU4sN1/AMgilVztlVcEuOsSUl+/fKsqIcNv83PndVbjKvYM8dZm2Sq9Sd0Z/S14C7DKhaTwP/rimn2Bmchi5HeaUqBeJNsdYGH50cbQQjJglw7yeJps2OrZ3vb61Xuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180687; 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=UUYbJkwfIGlRwaVX9xXpNb5HrAiVYeKo1aUSQWkJjWkL5AYfu7Hlyaj90RIfb2hzGhGFpg6T9WMP786BTwcA2+8p2ill12OAhEI7/gg5eo5oEYPvPCXEnCkNAPJMNs8E13D8XEmxF7w0ryAsQcWKXj0tcAs6ElbiHBdzccZoNFQ= 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 1773180687351862.8199942721343; Tue, 10 Mar 2026 15:11:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05IM-0004OT-VG; Tue, 10 Mar 2026 18:11:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w05I6-0004Fb-6F for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:11:03 -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 1w05I2-0002QI-92 for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:11:01 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4852ff06541so36912175e9.2 for ; Tue, 10 Mar 2026 15:10:57 -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-4854a30c0fcsm4998075e9.10.2026.03.10.15.10.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180656; x=1773785456; 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=omlpStjt2s3WepDfeSy8geX0bU7+wa6mwJHQsQNvdMllYU7riOFefyhmfh5swAAS/I vBRCP6tjfFOR++bX+PAonsNZWtXZGayUgXGVt7m5Np77wDClDzcgZPiHv/P5aFqFXElh j48BgSrFgHP9BHBdq9TYKrjeElVrzQoYIOHmYHCRg5Egr03CHNatOf0xLX0mJt75WCWG u9EnK2RDvXOLFX3yZPAaTbnE5RU7z6YUAYHMP2Udawwt09I9NmOQ0wfZNpTe5NLnJ1Py PbcDHalgqJBHU6uSaS4INh5tSMFH1BbTDqbmHjtsDo3GYLssDoBaD2OZEfXZrBycymBw S4rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180656; x=1773785456; 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=gJDRJSFS3X+8E1x/caFTl4e+1J6OFmq/6PqRT6OX8LlLogq07gIYDFoN9CEjrTZIKt 2tv2+79T6xg1ljaj5jbm94B0MOgA9gkWe70y+Da/MmzIhdauPj4A0epdX6+8Za2FtJ6f AcZCEmLMIlXvlMOmClBg5vGhSyVCY2yAbMT8JlDUTEuOFuuiOp+LjTcuzm0/Xr/TpSnB DoItweYVHwMG0OK987Y7kv+/8kDY5eQ+7stBBpxUEGSm8fNRcMqzWEvIe1iHoKZE3uTu 83tpbmiXDJKSy2J4lvwjUAIIzVdJwVstTdcKSSG8APUooAW5ioIKltesjXkMnkZpP4lu OFeg== X-Gm-Message-State: AOJu0Yx91BGr42iInoUwomIyJwEXdWD+xrGYXsUbFEvjUq5hzJdECnJv ji/A8RLWk7GDFY2ZGu7Tb7KbeaUfWg4ca0wzW0p/uqQm2DNLwEKGu/zFsdnfBg0h/crQHauWeTp uCTJb18c= X-Gm-Gg: ATEYQzwfd/zF0GUnNEm+yjcVQYO7kWDteKi8kOnVe8GOZTY+DIxrjWZ1DJfKDrSVq9z Ij3aXfOf0HufuBFhbq70FgJR9tEzCFjI8JB9TXIC0pIb5dUAy/w0ty8UpeTWQ1oN+QKeoMFbRQr OkqoBQx3IYknhxjB1joS6LyCXUoilkNPGQc4QTmdEWPjkKrdm+g2r5xWzTr/IRpfUQThPcopDNY PmDpH5rwzoU9AzXlSyzI1BfiW4CAO4Axjs+g51XIfu6MBTmVjnhDpnbrKdYei1tMO9wGXxQBEDb KDMo8N2i86XZrycnO9qeP3JHoLJyarpUijWe2kAr/pHPQXnXCryOVjhUT/QJSuzTUInOX40v7JW bssfMCTMzQAEtJjN607vDn5GwnZASmvp4DAHWaktcjakPEtF40bZL9nxgmk0m0xrmnhHEPTIPcW au3Gkuj7GHgwgkvRCF8XhQ+xRrSbCK2n5YmwV4Hs64ftxID4glGNdiPD9ihHmV52EGOuDTAEdb X-Received: by 2002:a05:600c:8483:b0:483:71f7:2782 with SMTP id 5b1f17b1804b1-4854b0b1f71mr6570145e9.12.1773180655879; Tue, 10 Mar 2026 15:10:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 10/12] gdbstub: Remove 'gdb-xml/' directory prefix in TARGET_XML_FILES Date: Tue, 10 Mar 2026 22:59:13 +0100 Message-ID: <20260310215916.55815-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-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=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: 1773180689554158500 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 Tested-by: Pierrick Bouvier --- 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 04:42:28 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=1773180690; cv=none; d=zohomail.com; s=zohoarc; b=cAsioavda+uw+ZG1j31rYt8PZme2y3UDk1dXzfRoKxrOZoieCoNgAWudCE8yYSCeXAdygE++dXPU9CnTSFhB+ccSGFbvudY2S+6Fo9s4N/a5U0YxvWplR+EZBpKUsnhqpt3gyWix+71A0eZ0pWHQbeuUU+D4t31sLePfA8kk0oU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180690; 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=IXHEamA5rrrbfiNbTV8UsfEegQKH94HSGcyosZQCcfcOGF7rQxCCBh79OvNP+SKgXhXlunMHv151oNrxz1G5AVKpS3vmVQXT6LO1eK7yce+wZ0EWpEGEOVnI4pP2R8hJSJg/26aKs5b/B/MwpD0jWHS/wKbkm/eYrbgDDlXt28A= 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 1773180690297906.9571182137996; Tue, 10 Mar 2026 15:11:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05IU-0004f7-1V; Tue, 10 Mar 2026 18:11:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w05ID-0004K4-HR for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:11:11 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w05IA-0002Qo-1q for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:11:08 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-439b97a8a8cso9299951f8f.1 for ; Tue, 10 Mar 2026 15:11:04 -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-439f81a0480sm1340921f8f.12.2026.03.10.15.11.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180663; x=1773785463; 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=OtsFoTD+U/INRd40wtHDefbsSHmpJSvdvv9mnkqanBn332hMn1eBQZRYU1zIt/ZbdE B/QX13gqGs1n4gofupoF2KJrrqP0qiL+NHCChEH8bi1OEm2iWhAstgEk7JH7AiPaSNFd 2bVVqJlhAiP7uzW4qmUvNpi5mrxDCK9yN7nc4EiLtNogFqmDJmn+X1bGbpRKQ3yaGBFr pbW+2UCUElNTwVzEAGPB6tebB6gIgiVa+9GcGBFYpmySlfLxAak/hKQIxWZ2YY602AZm mLKnukSpkBywPUADwMG0UCZexDdhkt8F/UV6T0uzqPL33v4FPcpnZGSRfu0BvjJT4qWE 7MPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180663; x=1773785463; 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=LunL/+4t84oHRfROcSYjXrzjyB5dOAapNXcqF+C79LOof2dgltYsDCoSXZbtSiO/gS 86RLV7uYZ3Qohn4xZWXv0W24cEks+hLopzhRUfgOJxSWIpPWd3OeMNAPz+QeRWJb86qs poUa+Bw3OjMvhHWOMhZV9gA0D2HFTKqm/0Tw+Ae5qGHX8gRrGNeqnTmNYS17YT3YZOBE ATu5pHcafbkDBmWhyYStgUkMdchFSA7OWTVjWy3WehcTVAx2Duxb3Hof3UimAg9EKDV3 8zAfiq+SU5tTlXy5qVJx+TgWk9kxPxSZ5e2MKkL2gUcX6aw+hJwmk7u+9yeLtoCAIfKh 2ohQ== X-Gm-Message-State: AOJu0Yy8tmL2T1/8x/vd5PtG2fh+DbGzvqpcXnp006NzTar5RZq5f9DZ pBl0Vu5B7WzJwlu/iQVMQ9tDJOXNL1NlT9EJb0K+w4x5XGYid8CJ1ZvXyZOB43fblchRL210uxW nGwze62g= X-Gm-Gg: ATEYQzwFJTJPdwIlL/2BRqmKRlEGYmgZvYCMCNbKJJ8Yj6B+v7IFmL4i1X+31XiSvfq F8UnnwUqGknNb3DGkpc7JzGE3JmCjLFgFEKRFtAeMRScTzAsutJBMYjJTHgtPMyS2OnjjumZ2hD SIgStnlSpkk8E8GPjS1wqS8X7zRgKaiHucyOVU67pSkYQX0GWN8evdbwiKiEy7jhHzAQtpZ3rpT KzTZeNSCipV/irlkcLnlNbQdhZ0qNHUpoasU8FzQGPIKxkgaxHTH8F+IowxNluWSiScylwDp6P4 92IRIYN5kEurlHxMujoKmIf7FnXm85Tj5HlkTrzvjwAA0bdoS9Y4DbKN1Afr3BxKCr827ia0zE2 JGybJnKHjZE9rm82SjRTlLPjxtHTnuJATlXz7x0yV/kgODAcJf8S2W+AP8L5cgU74GM0BwH1F5B aVP754RXy1YEBGfqqzo3BjYTBGR6Ww745Qe1zt4HdTD7a6gs9aQBUsmuJVIuNwt1UQqZo1Vz31M DWlcDUkwgg= X-Received: by 2002:a5d:5850:0:b0:439:b671:1d8f with SMTP id ffacd0b85a97d-439f842409cmr854141f8f.45.1773180662560; Tue, 10 Mar 2026 15:11:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 11/12] gdbstub: Move gdb-xml/ within gdbstub/ Date: Tue, 10 Mar 2026 22:59:14 +0100 Message-ID: <20260310215916.55815-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-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::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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: 1773180691721154100 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 Tested-by: Pierrick Bouvier --- 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 04:42:28 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=1773180690; cv=none; d=zohomail.com; s=zohoarc; b=LqmVRamep88D0kD248gSUl0uW7KruyeNKpELGpiOWdG19Xn47ZGpUX3PoQB23e1A2YMUOJOlJL/EyjsdLfxjW2UYJk2mOB0bEHzTY6yMWqep3jLi3VD6A/6b3UmAV5WAkHp9F97W933vVXeCSDG5xEbqvxCtCnuaT/3tCsNP4Qo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773180690; 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=gCxtpBRl9AxVbNTcZO5lsHV/lfA8GAhg13D4w9yQb6Azf5W1CsEa+RRqISabMmY9gizPc2CGoAjQdX/3YcER9MEoHOQ+O+wsnmGd/iC/n+3E2oe1dW+Ur3MlhWNqnmpU9VxZmTs90AsTTwIpTzvfaGMH5x1Tzbers/vdCGbhKcc= 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 1773180690026849.3510813846681; Tue, 10 Mar 2026 15:11:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w05IV-0004o0-VB; Tue, 10 Mar 2026 18:11:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w05IG-0004QG-Qa for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:11:14 -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 1w05IF-0002Rj-7K for qemu-devel@nongnu.org; Tue, 10 Mar 2026 18:11:12 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4852a8482fcso39757015e9.3 for ; Tue, 10 Mar 2026 15:11:10 -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-4854b0fa41csm2507425e9.29.2026.03.10.15.11.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Mar 2026 15:11:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773180669; x=1773785469; 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=QikDnaXR/a7nn/XdlBgvm4qBCj7Me9gRYyugq4+YKpYxQSKCqLekeuokuaHP1JTzHs cq1QKWzrWEwBL6PhQLtbC8wI/ZeK3Af7r/EEDr4vmkCr7hubpHMf3dX+0xgo9yGlZcJh sHDmSDTsRXddO9mSXvs32vTEVh5e4DlNO1EOmSXEyeKNLdd0Mpbll8+Z2TIjDI0FOfHW 1ngMwMHrpx4IuBZsqgIstvCFTsL5476JN78TAufK9i5cqCsoC1nRl+4u5nYzJMd/Hs2M 3fd4B2oBRH+/Hlw4PKPgD+6VymA+eMcokyvXWpjW/hPtCeSErvu0YwlVKXqwqD4sKw9i 7iZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773180669; x=1773785469; 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=gNOV0IIRHiWVrouRe3fbQ0d+xgvJJNw2t/9RTgojR9V6a+APls4SeEiu+3AaLvlPHJ iPKoxpuRfUsvj9ulSIpX9koTwcmnm707441YmRnlcvJyg0hw73RsURjwXkP83m3LIHPw fYR+/9KV2lFoPc/Ela3olwuwSgMgC2vGYi+tO8JCzbY26QfiCg1yT0w5qhrMulC8OqJ/ VHEM3nhh6oUDCyjRVYoTEiFObUHV714ACKVN8oqadO8pr02OZUqlJ24aK8xMR+2ICXWy Nvx1SbnkMbAQH3swp3Z8HUnZSmkfy3GvA/S24mjSxdkxmBeLwaFGQZXBAcnNrMqg+1f0 cHOQ== X-Gm-Message-State: AOJu0YzHrZDTozXkWTFpaVmcF2Uw1IT2jRu0zVlR+BOWeXdz9CI9lgSE hXbUWKiOeLVtX8RG8jREi/ZjePmrZ/ius4P2pKg/AfmhCGyOMTFYgJg0x3jT33PqnOhTA3qFAmC 5sQpyTvQ= X-Gm-Gg: ATEYQzykfmhmh428m3xnRbmKGyzhtKz9Eis5DgsUsZp8nsd1B89jfWQr4hf+nZ5foAK r/pifVQpdy53Kz4NNEBvwYzdVSBJJ3bUArdP9oyKMKBZfFQBrjnAEngHgmHPz+19CPKXTtvjhB6 R2/DINzyc2OROHGvXrpO/98fGYShkvYkH09g6IXwLulH5bLK1l+ammgnyt2/dfvnEEOmR6lZLyP 4K8nyZcUBSXEZCa3jKSfrYxqh/OdypBa2aIpwKUlUY87A71VyHODwh1uQ2T/2J48V0GQ1lU6BZU W46gKAsYoFkoTyjbNaqe1jkPLIxDgJfymx1avyIXiv/fIhl8xM6YF/957faEzMd2HjX5ltf9jf1 zoU3V1taDmletseAMBcTnZ6lZwdVy+Sq5LFM8yX7KtkjscNaNO2pDfTrf0Iu4oXjqcJPbQfK/4W QyUDOPVm4NXjxqnwLp+E7iXCSlQ7dUXLsqXZ+1CCX3kE7efRQvOJMHb8ReizE5uHsh0muVaJgI X-Received: by 2002:a05:600c:1395:b0:480:6bef:63a0 with SMTP id 5b1f17b1804b1-4854b1080cfmr5808845e9.21.1773180669523; Tue, 10 Mar 2026 15:11:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Florian Hofhammer , Pierrick Bouvier , Akihiko Odaki Subject: [PATCH v3 12/12] gdbstub: Generate a single gdbstub-xml.c / gdb_static_features[] Date: Tue, 10 Mar 2026 22:59:15 +0100 Message-ID: <20260310215916.55815-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310215916.55815-1-philmd@linaro.org> References: <20260310215916.55815-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=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: 1773180691774154100 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 Tested-by: Pierrick Bouvier --- 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