From patchwork Tue Mar 17 17:50:40 2020 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: 184653 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4439883ile; Tue, 17 Mar 2020 11:00:41 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt0N4Xh2SuSVDo+j1+FJ67JDjSph9eYHK2HoSFu/jFipN5L4ODnfNalMlWPS4rfbq5L8CHx X-Received: by 2002:a05:620a:200d:: with SMTP id c13mr90743qka.240.1584468040961; Tue, 17 Mar 2020 11:00:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584468040; cv=none; d=google.com; s=arc-20160816; b=oIm2Is23o27F6VAao2ht7Q/R08i0+Kz7uJ1DfKDbFLTRZSUXRwNFpG9t765zbHwwNi 52laDaBUprLxoE+hUKxl0hS3jwc8g6mdsOmsD4kdxsPFxXPqCXoh7qviDPYFbZsnsKyE uPl5wWn29PYEozEMWlzFKZdQib2TZUmmPbpDE3iI4644At3zF+QX/9A1QPRfsXx5ZQum 2sHUqko4fXnYHvcbENXWdQvSH2yjr6KOEIJ6WBdGkKQiIzN9XA4XvcoS6cGnp51AV7M8 X48WF9KoCjbgffU0WK3DXUWH+jPU+x744/RW76PRqDjYdj3b8vfHLbdBsFkzO0yxYh35 It2Q== 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=KRu/hQdw0xxxfyyGNoQ9AeZ+IGpH7Hzuo3e1uXmI2BY=; b=r7/fFvCTQov1KTGNyB90gYPDtFac4paEGj5+VWgpdQqVYj1qTL6Vdb43bicSXqcom7 YF0AW1u1qEntI2lIiTMvVM/yUFi2FUNjrlUXnHd7i5jnY8aMtNcYJ5/lIb8/VCvRbV4J aE33l/u1XvEdNxRUKJyk2VisKxsrAXf3RYdZesON9Vt3CJb1RrzFW4SwUi3Sl9Tn+ygS CrHb3rIXnt02nOLzl4D8WtxcrcJRwwVBk5l1QI2Xk1AY3oKa/5HmCLTZejcuINl55ot7 +DLlPK8ei1KvwkMuwlKk9OLkI3lPuE0Eix5ZEkBGkXTp5oEWm97gKE+VANRc+0E4M64x txLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EAyFhBBO; 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 y130si2593386qkb.133.2020.03.17.11.00.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Mar 2020 11:00:40 -0700 (PDT) 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=EAyFhBBO; 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]:38392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGW8-0007Ai-C9 for patch@linaro.org; Tue, 17 Mar 2020 14:00:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57208) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGN3-0000gR-Mw for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:51:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEGN2-0003Ii-2R for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:51:17 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:39901) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEGN1-0003DD-R1 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:51:16 -0400 Received: by mail-wr1-x434.google.com with SMTP id h6so6538809wrs.6 for ; Tue, 17 Mar 2020 10:51:15 -0700 (PDT) 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=KRu/hQdw0xxxfyyGNoQ9AeZ+IGpH7Hzuo3e1uXmI2BY=; b=EAyFhBBOR3t01CO9uElCTQsXLQg5qlfH7wzR75bJc69xi4GSSNHC/pjrR+MLxGsu1t d2aKPpSF65r21cYgW3rwPjkurB1lEQ8tob8DmgL3F6PJrQ+76vAzESDvwOlMtFZBPMpi EZF/xbWcxIP9+PT7H45V2fgi1s83H1hwLEvdPB4pebExbKizskrQow9WrtPkwyLn4MKL +kJKdI9+TTRSY43+ygd7nrhzUwaWbuWDnWPm4wXptjFPjA+fBujuLEpYKkQOnuOY1Yg5 8mGYzigC+KYjx1yzqxFtHaG+8NaLPrvVjOtDdPtM71R75UEy6YpEPatVSAJ/vHVn/Dv4 4siQ== 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=KRu/hQdw0xxxfyyGNoQ9AeZ+IGpH7Hzuo3e1uXmI2BY=; b=eQxitGQPz6mu1gyB5G7M9DtV4EX4EuWcn4FZ9IEN4/ckWMpNVeTvS+LFFDoSlOZ8ri I3ndsvT4QKWIlBI22faoeYiUtgWWd6K5fwgsLu2foO36NIFL4rm+6HirRCpjDEYQO3sD J4V7aoRuAcZ+c5v4rSXBQbbDfvZCP3p3MiGsUlxC2Lhrhq2Clg1i2JWEUxXXEsx/zKt5 ReD4wvIqqmk3RddBjKXjKHERrVob0Bh8krJ9K+Xj1UhqWkuP/iE68OETpc9TOMaI872D RIx7NFRM+5gxJW8hiGWKVFAmLWSJapXiTm0tNdOGdsfN5aBd8q7ccIEQTWhXXVM8OdAn 4gmA== X-Gm-Message-State: ANhLgQ2ISi4rwI3Y/j7ZCYjyho5rfJQGF4yfMwsCM4p5P+GKRopWS0br 2GIUccdwbKu1ou6fTEDaPXZXo8uIgoQ= X-Received: by 2002:adf:ab54:: with SMTP id r20mr139232wrc.197.1584467474758; Tue, 17 Mar 2020 10:51:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n2sm5729685wrr.62.2020.03.17.10.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 10:51:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E66BD1FF9E; Tue, 17 Mar 2020 17:50:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 15/28] target/arm: prepare for multiple dynamic XMLs Date: Tue, 17 Mar 2020 17:50:40 +0000 Message-Id: <20200317175053.5278-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317175053.5278-1-alex.bennee@linaro.org> References: <20200317175053.5278-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::434 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: Richard Henderson , "open list:ARM TCG CPUs" , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Acked-by: Richard Henderson Message-Id: <20200316172155.971-16-alex.bennee@linaro.org> -- 2.20.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 4ab2cbfd417..0ab82c987c3 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) */ @@ -749,7 +755,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]; @@ -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 * 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 c0e1ba17272..b0e2a85b005 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -208,7 +208,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)) { @@ -7973,7 +7973,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); }