gdbstub: Introduce GDBFeature structure

Before this change, the information from a XML file was stored in an
array that is not descriptive. Introduce a dedicated structure type to
make it easier to understand and to extend with more fields.

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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230912224107.29669-6-akihiko.odaki@daynix.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231009164104.369749-13-alex.bennee@linaro.org>
This commit is contained in:
Akihiko Odaki 2023-10-09 17:40:51 +01:00 committed by Alex Bennée
parent 1063693e1c
commit 956af7daad
7 changed files with 63 additions and 79 deletions

View File

@ -2842,7 +2842,7 @@ F: include/exec/gdbstub.h
F: include/gdbstub/* F: include/gdbstub/*
F: gdb-xml/ F: gdb-xml/
F: tests/tcg/multiarch/gdbstub/ F: tests/tcg/multiarch/gdbstub/
F: scripts/feature_to_c.sh F: scripts/feature_to_c.py
F: scripts/probe-gdb-support.py F: scripts/probe-gdb-support.py
Memory API Memory API

View File

@ -408,11 +408,11 @@ static const char *get_feature_xml(const char *p, const char **newp,
} }
} }
/* Is it one of the encoded gdb-xml/ files? */ /* Is it one of the encoded gdb-xml/ files? */
for (int i = 0; xml_builtin[i][0]; i++) { for (int i = 0; gdb_static_features[i].xmlname; i++) {
const char *name = xml_builtin[i][0]; const char *name = gdb_static_features[i].xmlname;
if ((strncmp(name, p, len) == 0) && if ((strncmp(name, p, len) == 0) &&
strlen(name) == len) { strlen(name) == len) {
return xml_builtin[i][1]; return gdb_static_features[i].xml;
} }
} }

View File

@ -10,6 +10,11 @@
#define GDB_WATCHPOINT_READ 3 #define GDB_WATCHPOINT_READ 3
#define GDB_WATCHPOINT_ACCESS 4 #define GDB_WATCHPOINT_ACCESS 4
typedef struct GDBFeature {
const char *xmlname;
const char *xml;
} GDBFeature;
/* Get or set a register. Returns the size of the register. */ /* Get or set a register. Returns the size of the register. */
typedef int (*gdb_get_reg_cb)(CPUArchState *env, GByteArray *buf, int reg); typedef int (*gdb_get_reg_cb)(CPUArchState *env, GByteArray *buf, int reg);
@ -48,7 +53,7 @@ void gdb_set_stop_cpu(CPUState *cpu);
*/ */
bool gdb_has_xml(void); bool gdb_has_xml(void);
/* in gdbstub-xml.c, generated by scripts/feature_to_c.sh */ /* in gdbstub-xml.c, generated by scripts/feature_to_c.py */
extern const char *const xml_builtin[][2]; extern const GDBFeature gdb_static_features[];
#endif #endif

View File

@ -3693,7 +3693,7 @@ common_all = static_library('common',
dependencies: common_all.dependencies(), dependencies: common_all.dependencies(),
name_suffix: 'fa') name_suffix: 'fa')
feature_to_c = find_program('scripts/feature_to_c.sh') feature_to_c = find_program('scripts/feature_to_c.py')
if targetos == 'darwin' if targetos == 'darwin'
entitlement = find_program('scripts/entitlement.sh') entitlement = find_program('scripts/entitlement.sh')

48
scripts/feature_to_c.py Executable file
View File

@ -0,0 +1,48 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: GPL-2.0-or-later
import os, sys
def writeliteral(indent, bytes):
sys.stdout.write(' ' * indent)
sys.stdout.write('"')
quoted = True
for c in bytes:
if not quoted:
sys.stdout.write('\n')
sys.stdout.write(' ' * indent)
sys.stdout.write('"')
quoted = True
if c == b'"'[0]:
sys.stdout.write('\\"')
elif c == b'\\'[0]:
sys.stdout.write('\\\\')
elif c == b'\n'[0]:
sys.stdout.write('\\n"')
quoted = False
elif c >= 32 and c < 127:
sys.stdout.write(c.to_bytes(1, 'big').decode())
else:
sys.stdout.write(f'\{c:03o}')
if quoted:
sys.stdout.write('"')
sys.stdout.write('#include "qemu/osdep.h"\n' \
'#include "exec/gdbstub.h"\n' \
'\n'
'const GDBFeature gdb_static_features[] = {\n')
for input in sys.argv[1:]:
with open(input, 'rb') as file:
read = file.read()
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(' { NULL }\n};\n')

View File

@ -1,69 +0,0 @@
#!/bin/sh
# Convert text files to compilable C arrays.
#
# Copyright (C) 2007 Free Software Foundation, Inc.
#
# This file is part of GDB.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
if test -z "$1"; then
echo "Usage: $0 INPUTFILE..."
exit 1
fi
for input; do
arrayname=xml_feature_$(echo $input | sed 's,.*/,,; s/[-.]/_/g')
${AWK:-awk} 'BEGIN { n = 0
printf "#include \"qemu/osdep.h\"\n"
print "static const char '$arrayname'[] = {"
for (i = 0; i < 255; i++)
_ord_[sprintf("%c", i)] = i
} {
split($0, line, "");
printf " "
for (i = 1; i <= length($0); i++) {
c = line[i]
if (c == "'\''") {
printf "'\''\\'\'''\'', "
} else if (c == "\\") {
printf "'\''\\\\'\'', "
} else if (_ord_[c] >= 32 && _ord_[c] < 127) {
printf "'\''%s'\'', ", c
} else {
printf "'\''\\%03o'\'', ", _ord_[c]
}
if (i % 10 == 0)
printf "\n "
}
printf "'\''\\n'\'', \n"
} END {
print " 0 };"
}' < $input
done
echo
echo '#include "exec/gdbstub.h"'
echo "const char *const xml_builtin[][2] = {"
for input; do
basename=$(echo $input | sed 's,.*/,,')
arrayname=xml_feature_$(echo $input | sed 's,.*/,,; s/[-.]/_/g')
echo " { \"$basename\", $arrayname },"
done
echo " { (char *)0, (char *)0 }"
echo "};"

View File

@ -1,6 +1,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "exec/gdbstub.h" /* xml_builtin */ #include "exec/gdbstub.h" /* gdb_static_features */
const char *const xml_builtin[][2] = { const GDBFeature gdb_static_features[] = {
{ NULL, NULL } { NULL }
}; };