aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorAlexey Brodkin <abrodkin@synopsys.com>2019-05-17 22:18:45 +0300
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>2019-10-18 09:21:45 +0100
commitc983f8ee00527504cedad932858f00458d7b9b43 (patch)
tree84b3c19bd8e8a3351a8dcd7ec946f715f3568d25 /src/server
parent5dc5ed571435c63f274f94ef89e20face012df08 (diff)
gdb-server: Create arch-specific structure type for every feature
As it is mentioned here [1] type's ID is unique name within containing feature. That said if regs of the same type located in different features it's required to insert type definition at least in each feature. See more details in discussion here [2]. [1] https://sourceware.org/gdb/onlinedocs/gdb/Target-Description-Format.html#Types [2] https://github.com/foss-for-synopsys-dwc-arc-processors/openocd/commit/2a5f5125ac8fa0e1359b6be03b209f9f5d1ade82#r33460077 Change-Id: Id92b061cfbf47d5c032a02c2c406b28affd0b02a Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Reviewed-on: http://openocd.zylin.com/5179 Tested-by: jenkins Reviewed-by: Muhammad Omair Javaid <omair.javaid@linaro.org> Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
Diffstat (limited to 'src/server')
-rw-r--r--src/server/gdb_server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 02020425..0370fcd5 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -2205,14 +2205,11 @@ static int gdb_generate_target_description(struct target *target, char **tdesc_o
int reg_list_size;
char const *architecture;
char const **features = NULL;
- char const **arch_defined_types = NULL;
int feature_list_size = 0;
- int num_arch_defined_types = 0;
char *tdesc = NULL;
int pos = 0;
int size = 0;
- arch_defined_types = calloc(1, sizeof(char *));
retval = target_get_gdb_reg_list_noread(target, &reg_list,
&reg_list_size, REG_CLASS_ALL);
@@ -2254,7 +2251,10 @@ static int gdb_generate_target_description(struct target *target, char **tdesc_o
/* generate target description according to register list */
if (features != NULL) {
while (features[current_feature]) {
+ char const **arch_defined_types = NULL;
+ int num_arch_defined_types = 0;
+ arch_defined_types = calloc(1, sizeof(char *));
xml_printf(&retval, &tdesc, &pos, &size,
"<feature name=\"%s\">\n",
features[current_feature]);
@@ -2319,6 +2319,7 @@ static int gdb_generate_target_description(struct target *target, char **tdesc_o
"</feature>\n");
current_feature++;
+ free(arch_defined_types);
}
}
@@ -2328,7 +2329,6 @@ static int gdb_generate_target_description(struct target *target, char **tdesc_o
error:
free(features);
free(reg_list);
- free(arch_defined_types);
if (retval == ERROR_OK)
*tdesc_out = tdesc;