OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/arm: prepare for multiple dynamic XMLs

Browse Source 
We will want to generate similar dynamic XML for gdbstub support of
SVE registers (the upstream doesn't use XML). To that end lightly
rename a few things to make the distinction.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200316172155.971-16-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2020-03-16 17:21:42 +00:00
parent a010bdbe71
commit 448d4d146b
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target/arm/cpu.h
View File

@ -128,14 +128,20 @@ enum {
/** /**
* DynamicGDBXMLInfo: * DynamicGDBXMLInfo:
* @desc: Contains the XML descriptions. * @desc: Contains the XML descriptions.
* @num_cpregs: Number of the Coprocessor registers seen by GDB. * @num: Number of the registers in this XML seen by GDB.
* @cpregs_keys: Array that contains the corresponding Key of * @data: A union with data specific to the set of registers
* a given cpreg with the same order of the cpreg in the XML description. * @cpregs_keys: Array that contains the corresponding Key of
* a given cpreg with the same order of the cpreg
* in the XML description.
*/ */
typedef struct DynamicGDBXMLInfo { typedef struct DynamicGDBXMLInfo {
char *desc; char *desc;
int num_cpregs; int num;
uint32_t *cpregs_keys; union {
struct {
uint32_t *keys;
} cpregs;
} data;
} DynamicGDBXMLInfo; } DynamicGDBXMLInfo;
/* CPU state for each instance of a generic timer (in cp15 c14) */ /* CPU state for each instance of a generic timer (in cp15 c14) */
@ -749,7 +755,7 @@ struct ARMCPU {
uint64_t *cpreg_vmstate_values; uint64_t *cpreg_vmstate_values;
int32_t cpreg_vmstate_array_len; int32_t cpreg_vmstate_array_len;
DynamicGDBXMLInfo dyn_xml; DynamicGDBXMLInfo dyn_sysreg_xml;
/* Timers used by the generic (architected) timer */ /* Timers used by the generic (architected) timer */
QEMUTimer *gt_timer[NUM_GTIMERS]; QEMUTimer *gt_timer[NUM_GTIMERS];
@ -974,7 +980,7 @@ int arm_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
/* Dynamically generates for gdb stub an XML description of the sysregs from /* Dynamically generates for gdb stub an XML description of the sysregs from
* the cp_regs hashtable. Returns the registered sysregs number. * the cp_regs hashtable. Returns the registered sysregs number.
*/ */
int arm_gen_dynamic_xml(CPUState *cpu); int arm_gen_dynamic_sysreg_xml(CPUState *cpu);
/* Returns the dynamically generated XML for the gdb stub. /* Returns the dynamically generated XML for the gdb stub.
* Returns a pointer to the XML contents for the specified XML file or NULL * Returns a pointer to the XML contents for the specified XML file or NULL

30
target/arm/gdbstub.c
View File

@ -106,15 +106,15 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
return 0; return 0;
} }
static void arm_gen_one_xml_reg_tag(GString *s, DynamicGDBXMLInfo *dyn_xml, static void arm_gen_one_xml_sysreg_tag(GString *s, DynamicGDBXMLInfo *dyn_xml,
ARMCPRegInfo *ri, uint32_t ri_key, ARMCPRegInfo *ri, uint32_t ri_key,
int bitsize) int bitsize)
{ {
g_string_append_printf(s, "<reg name=\"%s\"", ri->name); g_string_append_printf(s, "<reg name=\"%s\"", ri->name);
g_string_append_printf(s, " bitsize=\"%d\"", bitsize); g_string_append_printf(s, " bitsize=\"%d\"", bitsize);
g_string_append_printf(s, " group=\"cp_regs\"/>"); g_string_append_printf(s, " group=\"cp_regs\"/>");
dyn_xml->num_cpregs++; dyn_xml->data.cpregs.keys[dyn_xml->num] = ri_key;
dyn_xml->cpregs_keys[dyn_xml->num_cpregs - 1] = ri_key; dyn_xml->num++;
} }
static void arm_register_sysreg_for_xml(gpointer key, gpointer value, static void arm_register_sysreg_for_xml(gpointer key, gpointer value,
@ -126,12 +126,12 @@ static void arm_register_sysreg_for_xml(gpointer key, gpointer value,
GString *s = param->s; GString *s = param->s;
ARMCPU *cpu = ARM_CPU(param->cs); ARMCPU *cpu = ARM_CPU(param->cs);
CPUARMState *env = &cpu->env; CPUARMState *env = &cpu->env;
DynamicGDBXMLInfo *dyn_xml = &cpu->dyn_xml; DynamicGDBXMLInfo *dyn_xml = &cpu->dyn_sysreg_xml;
if (!(ri->type & (ARM_CP_NO_RAW | ARM_CP_NO_GDB))) { if (!(ri->type & (ARM_CP_NO_RAW | ARM_CP_NO_GDB))) {
if (arm_feature(env, ARM_FEATURE_AARCH64)) { if (arm_feature(env, ARM_FEATURE_AARCH64)) {
if (ri->state == ARM_CP_STATE_AA64) { if (ri->state == ARM_CP_STATE_AA64) {
arm_gen_one_xml_reg_tag(s , dyn_xml, ri, ri_key, 64); arm_gen_one_xml_sysreg_tag(s , dyn_xml, ri, ri_key, 64);
} }
} else { } else {
if (ri->state == ARM_CP_STATE_AA32) { if (ri->state == ARM_CP_STATE_AA32) {
@ -140,30 +140,30 @@ static void arm_register_sysreg_for_xml(gpointer key, gpointer value,
return; return;
} }
if (ri->type & ARM_CP_64BIT) { if (ri->type & ARM_CP_64BIT) {
arm_gen_one_xml_reg_tag(s , dyn_xml, ri, ri_key, 64); arm_gen_one_xml_sysreg_tag(s , dyn_xml, ri, ri_key, 64);
} else { } else {
arm_gen_one_xml_reg_tag(s , dyn_xml, ri, ri_key, 32); arm_gen_one_xml_sysreg_tag(s , dyn_xml, ri, ri_key, 32);
} }
} }
} }
} }
} }
int arm_gen_dynamic_xml(CPUState *cs) int arm_gen_dynamic_sysreg_xml(CPUState *cs)
{ {
ARMCPU *cpu = ARM_CPU(cs); ARMCPU *cpu = ARM_CPU(cs);
GString *s = g_string_new(NULL); GString *s = g_string_new(NULL);
RegisterSysregXmlParam param = {cs, s}; RegisterSysregXmlParam param = {cs, s};
cpu->dyn_xml.num_cpregs = 0; cpu->dyn_sysreg_xml.num = 0;
cpu->dyn_xml.cpregs_keys = g_new(uint32_t, g_hash_table_size(cpu->cp_regs)); cpu->dyn_sysreg_xml.data.cpregs.keys = g_new(uint32_t, g_hash_table_size(cpu->cp_regs));
g_string_printf(s, "<?xml version=\"1.0\"?>"); g_string_printf(s, "<?xml version=\"1.0\"?>");
g_string_append_printf(s, "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">"); g_string_append_printf(s, "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">");
g_string_append_printf(s, "<feature name=\"org.qemu.gdb.arm.sys.regs\">"); g_string_append_printf(s, "<feature name=\"org.qemu.gdb.arm.sys.regs\">");
g_hash_table_foreach(cpu->cp_regs, arm_register_sysreg_for_xml, &param); g_hash_table_foreach(cpu->cp_regs, arm_register_sysreg_for_xml, &param);
g_string_append_printf(s, "</feature>"); g_string_append_printf(s, "</feature>");
cpu->dyn_xml.desc = g_string_free(s, false); cpu->dyn_sysreg_xml.desc = g_string_free(s, false);
return cpu->dyn_xml.num_cpregs; return cpu->dyn_sysreg_xml.num;
} }
const char *arm_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname) const char *arm_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname)
@ -171,7 +171,7 @@ const char *arm_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname)
ARMCPU *cpu = ARM_CPU(cs); ARMCPU *cpu = ARM_CPU(cs);
if (strcmp(xmlname, "system-registers.xml") == 0) { if (strcmp(xmlname, "system-registers.xml") == 0) {
return cpu->dyn_xml.desc; return cpu->dyn_sysreg_xml.desc;
} }
return NULL; return NULL;
} }

4
target/arm/helper.c
View File

@ -208,7 +208,7 @@ static int arm_gdb_get_sysreg(CPUARMState *env, GByteArray *buf, int reg)
const ARMCPRegInfo *ri; const ARMCPRegInfo *ri;
uint32_t key; uint32_t key;
key = cpu->dyn_xml.cpregs_keys[reg]; key = cpu->dyn_sysreg_xml.data.cpregs.keys[reg];
ri = get_arm_cp_reginfo(cpu->cp_regs, key); ri = get_arm_cp_reginfo(cpu->cp_regs, key);
if (ri) { if (ri) {
if (cpreg_field_is_64bit(ri)) { if (cpreg_field_is_64bit(ri)) {
@ -7973,7 +7973,7 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
19, "arm-vfp.xml", 0); 19, "arm-vfp.xml", 0);
} }
gdb_register_coprocessor(cs, arm_gdb_get_sysreg, arm_gdb_set_sysreg, gdb_register_coprocessor(cs, arm_gdb_get_sysreg, arm_gdb_set_sysreg,
arm_gen_dynamic_xml(cs), arm_gen_dynamic_sysreg_xml(cs),
"system-registers.xml", 0); "system-registers.xml", 0);
} }