From patchwork Fri Dec 20 12:04:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 182262 Delivered-To: patch@linaro.org Received: by 2002:a92:1f98:0:0:0:0:0 with SMTP id f24csp460925ilf; Fri, 20 Dec 2019 04:28:00 -0800 (PST) X-Google-Smtp-Source: APXvYqxsA4TQVWrgwfARJrQMdp2QbIx6UmFZkT7d/P7OS3CDa7ccOCL1z31duWQ/bU/gN976ZqoZ X-Received: by 2002:ac8:704e:: with SMTP id y14mr11291561qtm.279.1576844880717; Fri, 20 Dec 2019 04:28:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576844880; cv=none; d=google.com; s=arc-20160816; b=BUnkenSK+1Ed7fcmiZ0O/T+c4hDjp8xx3K892tcqRodXQNcOUxCCnHoIvS9Ci1zOtr E7/k61mnmIllGpS9fHDWmibZIuC6aP2niKoa6n52yfeuxWhmwVs5wM61jkwHGAvsqdog evNTACfOnZSYXxWUdrbHpFF83BnR/aHvLHsQkZuZ20KE44I3xAPJbjAVAeXKp7jqADcC v+150XM9mpOi9fl+CKYtwOZcuQKL7+to5mc3fr825ZnBI6gBHyYMMCpgkggYNZ2ZQeaY p1UqL9Fjj1v3n4MnPTKCVmkE4gzslOGr+AZ6Ggu7HKNWQsWHE4+8PZQbMhajFs94LZvj vwHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=czanuspGcHlKRukvMkLTGjn1x611kvgV7PuFbsiK1Pk=; b=uSoN3UMb6AaLnAvCuGLKr2zDRfmMIGX2Xip44JgQq3FiZK+GURJcvCJYFaYiFWp1AK 6G4NVoXeNzVyykPxvinfZhd86SUMlkPTnqzIFwYyWHgeKW8lqFwK4bIFx+l7xcD9GQUt utI1PKXqGV14dFW3BWtHa1EtHmFZIi5rJ3q06f6KM54JOIIqCmbnFUZejwO2b1dDKBCB irgjZdP9XRtQ3uZEprEowkdKJf+Iipd3p2bI6GnLYeaZ3Ak1dzNWrKRa3byj5rPIjUPv G48xur33XW36KcFEvLTvTrH0Qi/F19aaPxhFDIRfgvvpvQs/dsYxwzKqFluOUjbtZjO4 l2Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zf7pxHfw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q126si5266024qka.361.2019.12.20.04.28.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Dec 2019 04:28:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zf7pxHfw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiHNw-00028E-78 for patch@linaro.org; Fri, 20 Dec 2019 07:28:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53709) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiH1k-0004rp-0y for qemu-devel@nongnu.org; Fri, 20 Dec 2019 07:05:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iiH1e-000881-3N for qemu-devel@nongnu.org; Fri, 20 Dec 2019 07:05:03 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34372) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iiH1d-00084q-OA for qemu-devel@nongnu.org; Fri, 20 Dec 2019 07:04:57 -0500 Received: by mail-wr1-x443.google.com with SMTP id t2so9205406wrr.1 for ; Fri, 20 Dec 2019 04:04:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=czanuspGcHlKRukvMkLTGjn1x611kvgV7PuFbsiK1Pk=; b=zf7pxHfwzEDlsgRvDI3Gpj1CcG5uUIUIUl+xMsUxnlOyJB36nmqqsRU13tXmumM6wE ermA5ztZ5EUFjEwiltk/zFWK3SlxhyX9NJsWvpHaE8oHnMt5cXPwt5jie6ltUhWb7nIN NE8ASZTwlhjYp94hG0KAiDQ5YFbGwqN8KzMUmh9z1U/0rkyZVVunc4wcXd+DMOxg97F1 u/Vi0PHP0FMuyTN7kpVMfztgcnollB369IYvxO+giX790Q/vYNln4EyPNbdnDXLnc7FR xsyHzvmM3OV5qSpFFTJQ0yzREZTUR5eTaOk2YiJecv5szmGQf3N3yJ+QyDRQNsFKwIgW KSCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=czanuspGcHlKRukvMkLTGjn1x611kvgV7PuFbsiK1Pk=; b=MkpkYyMS+kbaXYbOpRhGd6GsxNDOzdVPtwNilADR4D5taaEZWS5371pFIAY+bWlYTs BZpsfvZ98CpJUjz+wYlDiPPTFgAhgho3vIwtK/uFCzUuUxx35M8v2SzvclIk0JaIjODb j24u0W+6w3soeGY9wG5rXbnL9eX6kGpkrAXPsy89EdFzOlyc0y2OxnlxCnaY48lfL998 8PK7N7KeO/28kep5BU0LYOPiiBrHVGBQBPwifSHJpKJVJx61s3SztSAZS049g/47E3mm cQKC5czAzBeUModM1o1MyeAPu6hvtEyjwpRbwnBFnVMP4asJ+lfJTnALGE/eNQapaJSJ tPnA== X-Gm-Message-State: APjAAAVyAxbWtaxjGUQVwsuHEmSeHP7RFSNBqRdqs2DqCuGSri6LpxSu 9HSXRmenn4dyAlrNHdWshs7XEQ== X-Received: by 2002:a5d:690e:: with SMTP id t14mr14764377wru.65.1576843496579; Fri, 20 Dec 2019 04:04:56 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v22sm8994211wml.11.2019.12.20.04.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 04:04:48 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 00A051FF99; Fri, 20 Dec 2019 12:04:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 09/21] target/arm: prepare for multiple dynamic XMLs Date: Fri, 20 Dec 2019 12:04:26 +0000 Message-Id: <20191220120438.16114-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191220120438.16114-1-alex.bennee@linaro.org> References: <20191220120438.16114-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: damien.hedde@greensocs.com, Peter Maydell , luis.machado@linaro.org, "open list:ARM TCG CPUs" , alan.hayward@arm.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- target/arm/cpu.h | 20 +++++++++++++------- target/arm/gdbstub.c | 30 +++++++++++++++--------------- target/arm/helper.c | 4 ++-- 3 files changed, 30 insertions(+), 24 deletions(-) -- 2.20.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 19b3ac32113..59d5dbae31f 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -128,14 +128,20 @@ enum { /** * DynamicGDBXMLInfo: * @desc: Contains the XML descriptions. - * @num_cpregs: Number of the Coprocessor registers seen by GDB. - * @cpregs_keys: Array that contains the corresponding Key of - * a given cpreg with the same order of the cpreg in the XML description. + * @num: Number of the registers in this XML seen by GDB. + * @data: A union with data specific to the set of registers + * @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 { char *desc; - int num_cpregs; - uint32_t *cpregs_keys; + int num; + union { + struct { + uint32_t *keys; + } cpregs; + } data; } DynamicGDBXMLInfo; /* CPU state for each instance of a generic timer (in cp15 c14) */ @@ -748,7 +754,7 @@ struct ARMCPU { uint64_t *cpreg_vmstate_values; int32_t cpreg_vmstate_array_len; - DynamicGDBXMLInfo dyn_xml; + DynamicGDBXMLInfo dyn_sysreg_xml; /* Timers used by the generic (architected) timer */ QEMUTimer *gt_timer[NUM_GTIMERS]; @@ -955,7 +961,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 * 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 a pointer to the XML contents for the specified XML file or NULL diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index 4557775d245..1f68ab98c3b 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -106,15 +106,15 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) return 0; } -static void arm_gen_one_xml_reg_tag(GString *s, DynamicGDBXMLInfo *dyn_xml, - ARMCPRegInfo *ri, uint32_t ri_key, - int bitsize) +static void arm_gen_one_xml_sysreg_tag(GString *s, DynamicGDBXMLInfo *dyn_xml, + ARMCPRegInfo *ri, uint32_t ri_key, + int bitsize) { g_string_append_printf(s, "name); g_string_append_printf(s, " bitsize=\"%d\"", bitsize); g_string_append_printf(s, " group=\"cp_regs\"/>"); - dyn_xml->num_cpregs++; - dyn_xml->cpregs_keys[dyn_xml->num_cpregs - 1] = ri_key; + dyn_xml->data.cpregs.keys[dyn_xml->num] = ri_key; + dyn_xml->num++; } 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; ARMCPU *cpu = ARM_CPU(param->cs); 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 (arm_feature(env, ARM_FEATURE_AARCH64)) { 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 { if (ri->state == ARM_CP_STATE_AA32) { @@ -140,30 +140,30 @@ static void arm_register_sysreg_for_xml(gpointer key, gpointer value, return; } 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 { - 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); GString *s = g_string_new(NULL); RegisterSysregXmlParam param = {cs, s}; - cpu->dyn_xml.num_cpregs = 0; - cpu->dyn_xml.cpregs_keys = g_new(uint32_t, g_hash_table_size(cpu->cp_regs)); + cpu->dyn_sysreg_xml.num = 0; + cpu->dyn_sysreg_xml.data.cpregs.keys = g_new(uint32_t, g_hash_table_size(cpu->cp_regs)); g_string_printf(s, ""); g_string_append_printf(s, ""); g_string_append_printf(s, ""); g_hash_table_foreach(cpu->cp_regs, arm_register_sysreg_for_xml, ¶m); g_string_append_printf(s, ""); - cpu->dyn_xml.desc = g_string_free(s, false); - return cpu->dyn_xml.num_cpregs; + cpu->dyn_sysreg_xml.desc = g_string_free(s, false); + return cpu->dyn_sysreg_xml.num; } 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); if (strcmp(xmlname, "system-registers.xml") == 0) { - return cpu->dyn_xml.desc; + return cpu->dyn_sysreg_xml.desc; } return NULL; } diff --git a/target/arm/helper.c b/target/arm/helper.c index 36872627a5d..0a3bc53124e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -207,7 +207,7 @@ static int arm_gdb_get_sysreg(CPUARMState *env, GByteArray *buf, int reg) const ARMCPRegInfo *ri; 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); if (ri) { if (cpreg_field_is_64bit(ri)) { @@ -7129,7 +7129,7 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) 19, "arm-vfp.xml", 0); } 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); }