e2de1eec22
When compiling gdbserver for an architecture that uses the regdat.sh script (such as m68k) and the -Wmissing-declarations compiler flag, I get: REGDAT reg-m68k-generated.c CXX reg-m68k.o reg-m68k-generated.c:30:1: error: no previous declaration for 'void init_registers_m68k()' [-Werror=missing-declarations] 30 | init_registers_m68k (void) | ^~~~~~~~~~~~~~~~~~~ The same happens with other architectures, such as s390, but I'll be using 68k as an example. The init_registers_m68k function is defined in reg-m68k-generated.c, which is produced by the regformats/regdat.sh script. This script reads the regformats/reg-m68k.dat file, containing a register description, and produces C code that creates a corresponding target description at runtime. The init_registers_m68k function is invoked at initialization time in linux-m68k-low.c. The function must therefore be non-static, but does not have a declaration at the moment. The real clean way of fixing this would be to make regdat.sh generate a .h file (in addition to the .c file) with declarations for whatever is in the .c file. The generated .c file would include the .h file, and therefore the definition would have a corresponding declaration. The linux-m68k-low.c file would also include this .h file, instead of having its own declaration of init_registers_m68k, like it does now. However, this would be a quite big change for not much gain. As far as I understand, some common architectures (i386, x86-64, ARM, AArch64) have been moved to dynamically building target descriptions based on features (the linux-*-tdesc.c files in gdbserver) and don't use regdat.sh anymore. Logically (and given infinite development resources), the other architectures would be migrated to this system too and the regdat.sh script would be dropped. A new architecture would probably not use regdat.sh either. So I therefore propose this simpler patch instead, which just adds a local declaration in the generated file. gdb/ChangeLog: * regformats/regdat.sh: Generate declaration for init function.
205 lines
5.0 KiB
Bash
Executable File
205 lines
5.0 KiB
Bash
Executable File
#!/bin/sh -u
|
|
|
|
# Register protocol definitions for GDB, the GNU debugger.
|
|
# Copyright (C) 2001-2020 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 3 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/>.
|
|
|
|
# Format of the input files
|
|
read="type entry"
|
|
|
|
do_read ()
|
|
{
|
|
type=""
|
|
entry=""
|
|
while read line
|
|
do
|
|
if test "${line}" = ""
|
|
then
|
|
continue
|
|
elif test "${line}" = "#" -a "${comment}" = ""
|
|
then
|
|
continue
|
|
elif expr "${line}" : "#" > /dev/null
|
|
then
|
|
comment="${comment}
|
|
${line}"
|
|
else
|
|
|
|
# The semantics of IFS varies between different SH's. Some
|
|
# treat ``::' as three fields while some treat it as just too.
|
|
# Work around this by eliminating ``::'' ....
|
|
line="`echo "${line}" | sed -e 's/::/: :/g' -e 's/::/: :/g'`"
|
|
|
|
OFS="${IFS}" ; IFS="[:]"
|
|
eval read ${read} <<EOF
|
|
${line}
|
|
EOF
|
|
IFS="${OFS}"
|
|
|
|
# .... and then going back through each field and strip out those
|
|
# that ended up with just that space character.
|
|
for r in ${read}
|
|
do
|
|
if eval test \"\${${r}}\" = \"\ \"
|
|
then
|
|
eval ${r}=""
|
|
fi
|
|
done
|
|
|
|
break
|
|
fi
|
|
done
|
|
if [ -n "${type}" ]
|
|
then
|
|
true
|
|
else
|
|
false
|
|
fi
|
|
}
|
|
|
|
if test ! -r $1; then
|
|
echo "$0: Could not open $1." 1>&2
|
|
exit 1
|
|
fi
|
|
|
|
copyright ()
|
|
{
|
|
cat <<EOF
|
|
/* *INDENT-OFF* */ /* THIS FILE IS GENERATED */
|
|
|
|
/* A register protocol for GDB, the GNU debugger.
|
|
Copyright (C) 2001-2013 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 3 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/>. */
|
|
|
|
/* This file was created with the aid of \`\`regdat.sh'' and \`\`$1''. */
|
|
|
|
EOF
|
|
}
|
|
|
|
|
|
exec > new-$2
|
|
copyright $1
|
|
echo '#include "server.h"'
|
|
echo '#include "regdef.h"'
|
|
echo '#include "tdesc.h"'
|
|
echo
|
|
offset=0
|
|
i=0
|
|
name=x
|
|
xmltarget=x
|
|
xmlarch=x
|
|
xmlosabi=x
|
|
expedite=x
|
|
feature=x
|
|
exec < $1
|
|
while do_read
|
|
do
|
|
if test "${type}" = "name"; then
|
|
name="${entry}"
|
|
|
|
echo "const struct target_desc *tdesc_${name};"
|
|
echo ""
|
|
|
|
# This is necessary for -Wmissing-declarations.
|
|
echo "void init_registers_${name} (void);"
|
|
|
|
echo "void"
|
|
echo "init_registers_${name} (void)"
|
|
echo "{"
|
|
echo " static struct target_desc tdesc_${name}_s;"
|
|
echo " struct target_desc *result = &tdesc_${name}_s;"
|
|
echo " struct tdesc_feature *feature = tdesc_create_feature (result, \"${name}\");"
|
|
continue
|
|
elif test "${type}" = "xmltarget"; then
|
|
xmltarget="${entry}"
|
|
continue
|
|
elif test "${type}" = "xmlarch"; then
|
|
xmlarch="${entry}"
|
|
continue
|
|
elif test "${type}" = "osabi"; then
|
|
xmlosabi="${entry}"
|
|
continue
|
|
elif test "${type}" = "expedite"; then
|
|
expedite="${entry}"
|
|
continue
|
|
elif test "${type}" = "feature"; then
|
|
feature="${entry}"
|
|
continue
|
|
elif test "${name}" = x; then
|
|
echo "$0: $1 does not specify \`\`name''." 1>&2
|
|
exit 1
|
|
else
|
|
echo " tdesc_create_reg (feature, \"${entry}\","
|
|
echo " 0, 0, NULL, ${type}, NULL);"
|
|
|
|
offset=`expr ${offset} + ${type}`
|
|
i=`expr $i + 1`
|
|
fi
|
|
done
|
|
|
|
echo
|
|
echo "static const char *expedite_regs_${name}[] = { \"`echo ${expedite} | sed 's/,/", "/g'`\", 0 };"
|
|
|
|
echo "#ifndef IN_PROCESS_AGENT"
|
|
if test "${feature}" != x; then
|
|
echo "static const char *xmltarget_${name} = 0;"
|
|
elif test "${xmltarget}" = x; then
|
|
if test "${xmlarch}" = x && test "${xmlosabi}" = x; then
|
|
echo "static const char *xmltarget_${name} = 0;"
|
|
else
|
|
echo "static const char *xmltarget_${name} = \"@<target>\\"
|
|
if test "${xmlarch}" != x; then
|
|
echo "<architecture>${xmlarch}</architecture>\\"
|
|
fi
|
|
if test "${xmlosabi}" != x; then
|
|
echo "<osabi>${xmlosabi}</osabi>\\"
|
|
fi
|
|
echo "</target>\";"
|
|
fi
|
|
else
|
|
echo "static const char *xmltarget_${name} = \"${xmltarget}\";"
|
|
fi
|
|
echo
|
|
|
|
cat <<EOF
|
|
result->xmltarget = xmltarget_${name};
|
|
#endif
|
|
|
|
init_target_desc (result, expedite_regs_${name});
|
|
|
|
tdesc_${name} = result;
|
|
}
|
|
EOF
|
|
|
|
# close things off
|
|
exec 1>&2
|
|
mv -- "new-$2" "$2"
|