From patchwork Fri Dec 20 12:04:27 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: 182250 Delivered-To: patch@linaro.org Received: by 2002:a92:1f98:0:0:0:0:0 with SMTP id f24csp444910ilf; Fri, 20 Dec 2019 04:14:11 -0800 (PST) X-Google-Smtp-Source: APXvYqzJrPpw1/5vuZBcP/vUD9IwTSx6MnyfKMzYV3f2J0hstTyfC85N1fFTwZyvwyl/A4YIH5CG X-Received: by 2002:a9d:402:: with SMTP id 2mr4515933otc.357.1576844051402; Fri, 20 Dec 2019 04:14:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576844051; cv=none; d=google.com; s=arc-20160816; b=yKIpq/HeU15xgMRbmkD/GazC4nPoxwGeha181rYnEDZoC29HQUca3558HjUpde3EZR ekTXFhAXPtrAHf77qjBtIEdeOCx8U4SAESGwQDFXTFASuti/stMBcSinMgeppgAPj0Xk 7XLRRYM/hbddmwLLA45OR55cVVaKC2lA/COHEtvXKNUI49dODrjctGbd3QeXPKuE3Vir S1IsUiuXmG8q19OyLdn6PpZWgX2Xq98VllXKuDOJi+4/na3pC4yZzmwHMXEGLuPRewcp HfdCSrHWsnX1sdbSYML+X56W/PY/k50ioPhSefnvYjL3mQHLIiwnoxlsq48akBdoN4yT k8lA== 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=frx1aURZvMjiv5Ib6mAusHFiIu8eDIVWmRgHjBz837s=; b=zbull54MV1trkO85rOVerDi2GrrFViTuy2VNhA0gFzUmPnB2Sk0GvG7sPTJbGqNeeH CDJSflPDtTXRLaWrzcNE8Z9jtn8VDy+/UeEVG6KjOVw5+SWkRFmOM0RGkUlqwzQBnfJs fu70Z/gc0EPWWkhDbmsHmlQXF5O3xN8rV/L/D4yrtHm8xC7ZNk0CQrZMLBx/clQroH1x ElZBwNtWH5Bexmi0oZNFMu94MVw3Ow2Rs2urj8zxnKkVpECLLOn0aO1+bq0FMNke+cCM gN1f01RuGNqIcXtfjZCeA9KCgeK2eQkDqbiwbctyOngqH2TmNfTcp5IClRsEmRXU/513 YvxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zEOXQ3yp; 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 n85si4638960oig.191.2019.12.20.04.14.11 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Dec 2019 04:14:11 -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=zEOXQ3yp; 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]:54124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiHAY-00085f-NI for patch@linaro.org; Fri, 20 Dec 2019 07:14:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53713) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiH1k-0004rq-0x 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 1iiH1f-0008E2-JN for qemu-devel@nongnu.org; Fri, 20 Dec 2019 07:05:03 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38697) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iiH1f-00089i-6k for qemu-devel@nongnu.org; Fri, 20 Dec 2019 07:04:59 -0500 Received: by mail-wr1-x442.google.com with SMTP id y17so9206945wrh.5 for ; Fri, 20 Dec 2019 04:04:59 -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=frx1aURZvMjiv5Ib6mAusHFiIu8eDIVWmRgHjBz837s=; b=zEOXQ3ypHQuLtrfxR0Q4lqmX6p8ZLE7D8i/NgyItrA85Sd5CnbuDRtnX/v6nyC1FNl 1ohtO6OhK3Q0MR40wRBO8MKy3joQ8oEDDPikRjMUnL98n8OQ6/2zHHUXJ4fmJdnglmm4 BozmDTsyik1HEiw8HwQCWTN686TTKefXkG0Y0aPHRRooslhCiygnDqpuoQQj9yXWxkaY BOZCO2XmC3KFLaeUh87M1qduz0TQozDEFGLJl6cmfSLmf77fZHq4q8K22pTbxr2T2ji5 tUEqqNaf6vRkiM/KJXPe/JbzcPmt6Hw3bTjdOaq/F0zcBMgopWD3+n3Jn8kHw1x3Q8W9 as3w== 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=frx1aURZvMjiv5Ib6mAusHFiIu8eDIVWmRgHjBz837s=; b=TVa5PeiCMmrrr5c6gmZihSalVN97zrTgfdVzvA5liVlQLAOdV/Z0fa9QyMo31DHveR TWyuZNEB1aJwO8o6aVNfnQlQbyKFdwdaC8zf9yzDF2cOtbmlNHeQAtzhzO/bEbLkmIeQ SDXKrfUEkyRiYkglROK55GnTFm1DWyiv+LE/vp2aqH/sSe4obLjHbKaDLKm1AvskyG21 /Ckygw4GqkvNQX0P90vGuIiNvd4PufFLbTtiw2J5XEi/txqX7l9+ggrJuY2Bp85AkFtR 1kA4r6S0KO3JZFu6A7SpJ4HQqmOiiVbdsvKjiU3MVF3dwC9R4YRmuEYogf8Pi0YM/xO0 ZbPg== X-Gm-Message-State: APjAAAWgSD/peroCD8iqrq8Jg1MiNlxqaZXhd9h/VBbr9NnOsJCMFI6d NyMlJaJ3hEMUMWQXYHCgal1E+g== X-Received: by 2002:a5d:4847:: with SMTP id n7mr14991390wrs.30.1576843498083; Fri, 20 Dec 2019 04:04:58 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u14sm9777423wrm.51.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 1760C1FF9A; 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 10/21] target/arm: explicitly encode regnum in our XML Date: Fri, 20 Dec 2019 12:04:27 +0000 Message-Id: <20191220120438.16114-11-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::442 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, Richard Henderson , "open list:ARM TCG CPUs" , alan.hayward@arm.com, =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is described as optional but I'm not convinced of the numbering when multiple target fragments are sent. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v2 - post inc param->n in place so we don't get out count wrong --- target/arm/cpu.h | 2 +- target/arm/gdbstub.c | 17 +++++++++++------ target/arm/helper.c | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 59d5dbae31f..40591b5dc70 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -961,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_sysreg_xml(CPUState *cpu); +int arm_gen_dynamic_sysreg_xml(CPUState *cpu, int base_reg); /* 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 1f68ab98c3b..69c35462a63 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -24,6 +24,7 @@ typedef struct RegisterSysregXmlParam { CPUState *cs; GString *s; + int n; } RegisterSysregXmlParam; /* Old gdb always expect FPA registers. Newer (xml-aware) gdb only expect @@ -108,10 +109,11 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) static void arm_gen_one_xml_sysreg_tag(GString *s, DynamicGDBXMLInfo *dyn_xml, ARMCPRegInfo *ri, uint32_t ri_key, - int bitsize) + int bitsize, int regnum) { g_string_append_printf(s, "name); g_string_append_printf(s, " bitsize=\"%d\"", bitsize); + g_string_append_printf(s, " regnum=\"%d\"", regnum); g_string_append_printf(s, " group=\"cp_regs\"/>"); dyn_xml->data.cpregs.keys[dyn_xml->num] = ri_key; dyn_xml->num++; @@ -131,7 +133,8 @@ static void arm_register_sysreg_for_xml(gpointer key, gpointer value, 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_sysreg_tag(s , dyn_xml, ri, ri_key, 64); + arm_gen_one_xml_sysreg_tag(s , dyn_xml, ri, ri_key, 64, + param->n++); } } else { if (ri->state == ARM_CP_STATE_AA32) { @@ -140,20 +143,22 @@ static void arm_register_sysreg_for_xml(gpointer key, gpointer value, return; } if (ri->type & ARM_CP_64BIT) { - arm_gen_one_xml_sysreg_tag(s , dyn_xml, ri, ri_key, 64); + arm_gen_one_xml_sysreg_tag(s , dyn_xml, ri, ri_key, 64, + param->n++); } else { - arm_gen_one_xml_sysreg_tag(s , dyn_xml, ri, ri_key, 32); + arm_gen_one_xml_sysreg_tag(s , dyn_xml, ri, ri_key, 32, + param->n++); } } } } } -int arm_gen_dynamic_sysreg_xml(CPUState *cs) +int arm_gen_dynamic_sysreg_xml(CPUState *cs, int base_reg) { ARMCPU *cpu = ARM_CPU(cs); GString *s = g_string_new(NULL); - RegisterSysregXmlParam param = {cs, s}; + RegisterSysregXmlParam param = {cs, s, base_reg}; cpu->dyn_sysreg_xml.num = 0; cpu->dyn_sysreg_xml.data.cpregs.keys = g_new(uint32_t, g_hash_table_size(cpu->cp_regs)); diff --git a/target/arm/helper.c b/target/arm/helper.c index 0a3bc53124e..488fdbf61a9 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -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_sysreg_xml(cs), + arm_gen_dynamic_sysreg_xml(cs, cs->gdb_num_regs), "system-registers.xml", 0); }