qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Mahmoud Mandour" <ma.mandourr@gmail.com>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Alexandre Iooss" <erdnaxe@crans.org>,
	"John Snow" <jsnow@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Chris Wulff" <crwulff@gmail.com>, "Marek Vasut" <marex@denx.de>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Akihiko Odaki" <akihiko.odaki@daynix.com>
Subject: [PATCH 08/22] gdbstub: Add num_regs member to GDBFeature
Date: Mon,  6 Nov 2023 18:50:58 +0000	[thread overview]
Message-ID: <20231106185112.2755262-9-alex.bennee@linaro.org> (raw)
In-Reply-To: <20231106185112.2755262-1-alex.bennee@linaro.org>

From: Akihiko Odaki <akihiko.odaki@daynix.com>

Currently the number of registers exposed to GDB is written as magic
numbers in code. Derive the number of registers GDB actually see from
XML files to replace the magic numbers in code later.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231025093128.33116-2-akihiko.odaki@daynix.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231103195956.1998255-9-alex.bennee@linaro.org>
---
 include/exec/gdbstub.h  |  1 +
 scripts/feature_to_c.py | 46 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 1a01c35f8e..a43aa34dad 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -13,6 +13,7 @@
 typedef struct GDBFeature {
     const char *xmlname;
     const char *xml;
+    int num_regs;
 } GDBFeature;
 
 
diff --git a/scripts/feature_to_c.py b/scripts/feature_to_c.py
index bcbcb83beb..e04d6b2df7 100644
--- a/scripts/feature_to_c.py
+++ b/scripts/feature_to_c.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-import os, sys
+import os, sys, xml.etree.ElementTree
 
 def writeliteral(indent, bytes):
     sys.stdout.write(' ' * indent)
@@ -39,10 +39,52 @@ def writeliteral(indent, bytes):
     with open(input, 'rb') as file:
         read = file.read()
 
+    parser = xml.etree.ElementTree.XMLPullParser(['start', 'end'])
+    parser.feed(read)
+    events = parser.read_events()
+    event, element = next(events)
+    if event != 'start':
+        sys.stderr.write(f'unexpected event: {event}\n')
+        exit(1)
+    if element.tag != 'feature':
+        sys.stderr.write(f'unexpected start tag: {element.tag}\n')
+        exit(1)
+
+    regnum = 0
+    regnums = []
+    tags = ['feature']
+    for event, element in events:
+        if event == 'end':
+            if element.tag != tags[len(tags) - 1]:
+                sys.stderr.write(f'unexpected end tag: {element.tag}\n')
+                exit(1)
+
+            tags.pop()
+            if element.tag == 'feature':
+                break
+        elif event == 'start':
+            if len(tags) < 2 and element.tag == 'reg':
+                if 'regnum' in element.attrib:
+                    regnum = int(element.attrib['regnum'])
+
+                regnums.append(regnum)
+                regnum += 1
+
+            tags.append(element.tag)
+        else:
+            raise Exception(f'unexpected event: {event}\n')
+
+    if len(tags):
+        sys.stderr.write('unterminated feature tag\n')
+        exit(1)
+
+    base_reg = min(regnums)
+    num_regs = max(regnums) - base_reg + 1 if len(regnums) else 0
+
     sys.stdout.write('    {\n')
     writeliteral(8, bytes(os.path.basename(input), 'utf-8'))
     sys.stdout.write(',\n')
     writeliteral(8, read)
-    sys.stdout.write('\n    },\n')
+    sys.stdout.write(f',\n        {num_regs},\n    }},\n')
 
 sys.stdout.write('    { NULL }\n};\n')
-- 
2.39.2



  parent reply	other threads:[~2023-11-06 18:52 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-06 18:50 [PATCH 00/22] Maintainer updates for 8.2 (gdbstub, tests, plugins) pre-PR Alex Bennée
2023-11-06 18:50 ` [PATCH 01/22] default-configs: Add TARGET_XML_FILES definition Alex Bennée
2023-11-07  3:28   ` Richard Henderson
2023-11-06 18:50 ` [PATCH 02/22] gdb-xml: fix duplicate register in arm-neon.xml Alex Bennée
2023-11-07 10:04   ` Philippe Mathieu-Daudé
2023-11-06 18:50 ` [PATCH 03/22] target/arm: hide the 32bit version of PAR from gdbstub Alex Bennée
2023-11-07  3:52   ` Richard Henderson
2023-11-07 10:21     ` Alex Bennée
2023-11-06 18:50 ` [PATCH 04/22] target/arm: hide all versions of DBGD[RS]AR " Alex Bennée
2023-11-07  3:30   ` Richard Henderson
2023-11-06 18:50 ` [PATCH 05/22] target/arm: hide aliased MIDR " Alex Bennée
2023-11-07 13:08   ` Peter Maydell
2023-11-06 18:50 ` [PATCH 06/22] tests/tcg: add an explicit gdbstub register tester Alex Bennée
2023-11-06 18:50 ` [PATCH 07/22] tests/avocado: update the tcg_plugins test Alex Bennée
2023-11-07  3:56   ` Richard Henderson
2023-11-06 18:50 ` Alex Bennée [this message]
2023-11-07 10:07   ` [PATCH 08/22] gdbstub: Add num_regs member to GDBFeature Philippe Mathieu-Daudé
2023-11-07 10:24     ` Alex Bennée
2023-11-07 12:41       ` Philippe Mathieu-Daudé
2023-11-06 18:50 ` [PATCH 09/22] gdbstub: Introduce gdb_find_static_feature() Alex Bennée
2023-11-06 18:51 ` [PATCH 10/22] gdbstub: Introduce GDBFeatureBuilder Alex Bennée
2023-11-06 18:51 ` [PATCH 11/22] cpu: Call plugin hooks only when ready Alex Bennée
2023-11-06 18:51 ` [PATCH 12/22] configure: tell meson and contrib_plugins about DLLTOOL Alex Bennée
2023-11-07  9:32   ` Paolo Bonzini
2023-11-07 10:09   ` Philippe Mathieu-Daudé
2023-11-06 18:51 ` [PATCH 13/22] plugins: add dllexport and dllimport to api funcs Alex Bennée
2023-11-07  9:33   ` Paolo Bonzini
2023-11-07 10:08   ` Philippe Mathieu-Daudé
2023-11-06 18:51 ` [PATCH 14/22] plugins: make test/example plugins work on windows Alex Bennée
2023-11-07  9:44   ` Paolo Bonzini
2023-11-07  9:55     ` Greg Manning
2023-11-07 12:43       ` Greg Manning
2023-11-08 11:58         ` Paolo Bonzini
2023-11-06 18:51 ` [PATCH 15/22] plugins: disable lockstep plugin " Alex Bennée
2023-11-07 10:10   ` Philippe Mathieu-Daudé
2023-11-06 18:51 ` [PATCH 16/22] plugins: allow plugins to be enabled " Alex Bennée
2023-11-07 10:11   ` Philippe Mathieu-Daudé
2023-11-06 18:51 ` [PATCH 17/22] contrib/gitdm: Add Rivos Inc to the domain map Alex Bennée
2023-11-06 18:51 ` [PATCH 18/22] contrib/gitdm: add domain-map for Cestc Alex Bennée
2023-11-06 18:51 ` [PATCH 19/22] contrib/gitdm: map HiSilicon to Huawei Alex Bennée
2023-11-06 18:51 ` [PATCH 20/22] contrib/gitdm: add Daynix to domain-map Alex Bennée
2023-11-06 18:51 ` [PATCH 21/22] mailmap: fixup some more corrupted author fields Alex Bennée
2023-11-06 18:51 ` [PATCH 22/22] Revert "tests/tcg/nios2: Re-enable linux-user tests" Alex Bennée
2023-11-06 21:58   ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231106185112.2755262-9-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=akihiko.odaki@daynix.com \
    --cc=berrange@redhat.com \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=crwulff@gmail.com \
    --cc=erdnaxe@crans.org \
    --cc=jsnow@redhat.com \
    --cc=laurent@vivier.eu \
    --cc=ma.mandourr@gmail.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=marex@denx.de \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).