From 73fa9c98e14d6edc57a1cc0a9b428cb6c090c2e9 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Mon, 22 May 2017 22:42:51 +0100 Subject: Use target_desc fields expedite_regs and xmltarget ifndef IN_PROCESS_AGENT struct target_desc is used by both GDBserver and IPA, but fields expedite_regs and xmltarget are only used in GDBserver, so this patch wraps these two fields by ifndef IN_PROCESS_AGENT. This patch also changes regformats/regdat.sh to generate .c files in this way too. gdb/gdbserver: 2017-06-06 Yao Qi * tdesc.h (struct target_desc) [IN_PROCESS_AGENT] : Remove. [IN_PROCESS_AGENT] : Likewise. gdb: 2017-06-06 Yao Qi * regformats/regdat.sh: Generate code with "ifndef IN_PROCESS_AGENT". --- gdb/gdbserver/tdesc.h | 2 ++ gdb/regformats/regdat.sh | 3 +++ 2 files changed, 5 insertions(+) diff --git a/gdb/gdbserver/tdesc.h b/gdb/gdbserver/tdesc.h index ada879d..0341278 100644 --- a/gdb/gdbserver/tdesc.h +++ b/gdb/gdbserver/tdesc.h @@ -36,6 +36,7 @@ struct target_desc /* The register cache size, in bytes. */ int registers_size; +#ifndef IN_PROCESS_AGENT /* An array of register names. These are the "expedite" registers: registers whose values are sent along with stop replies. */ const char **expedite_regs; @@ -45,6 +46,7 @@ struct target_desc verbatim XML code (prefixed with a '@') or else the name of the actual XML file to be used in place of "target.xml". */ const char *xmltarget; +#endif }; /* Copy target description SRC to DEST. */ diff --git a/gdb/regformats/regdat.sh b/gdb/regformats/regdat.sh index 4c73352..651f703 100755 --- a/gdb/regformats/regdat.sh +++ b/gdb/regformats/regdat.sh @@ -179,8 +179,11 @@ init_registers_${name} (void) result->reg_defs = regs_${name}; result->num_registers = sizeof (regs_${name}) / sizeof (regs_${name}[0]); + +#ifndef IN_PROCESS_AGENT result->expedite_regs = expedite_regs_${name}; result->xmltarget = xmltarget_${name}; +#endif init_target_desc (result); -- cgit v1.1