From patchwork Sat Nov 30 08:45:58 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: 1202678 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Eeu8xabl"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Q4vC3g7kz9sP6 for ; Sat, 30 Nov 2019 19:54:47 +1100 (AEDT) Received: from localhost ([::1]:38680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iayWb-0003ww-4M for incoming@patchwork.ozlabs.org; Sat, 30 Nov 2019 03:54:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57791) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iayOV-000342-Fe for qemu-devel@nongnu.org; Sat, 30 Nov 2019 03:46:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iayOT-0003Pn-MZ for qemu-devel@nongnu.org; Sat, 30 Nov 2019 03:46:23 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53999) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iayOT-0003NF-AN for qemu-devel@nongnu.org; Sat, 30 Nov 2019 03:46:21 -0500 Received: by mail-wm1-x341.google.com with SMTP id u18so16290941wmc.3 for ; Sat, 30 Nov 2019 00:46:19 -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=cTqY+VVrIEiDrOiDCyCP2RljFepIcDuXrggPXm+fTw0=; b=Eeu8xablyvQPKgKnAxUeQpLvcnfK6LRVEryadBnEFuhl3OHA7rVHLYfzHXq4xHH7wE 7je6/eFbsynjZXn1LbW8gbiyXbVNq40Be2eRXRz5xLHqbLMI+hLwot/NObmEBDbQOqPk uuwJl2BwIHT1zK3/E1eOdZ6Krro9saYLgu18XB3+Clg2Ss0a9K7KHMg5tcs7V2iE0Lrh qmMzmdk9hMqUMw5tBaZLQBe4HmXtCVKx5XpF5d28qi1KLMWjqFvnebZSVteog50knAUF 2HRbF5wvXZm9706rcRHllt9BMTKWzDUVsDVtMS1hvmqQGHoxbEfFbvogk87zqCSmdLTV /BLg== 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=cTqY+VVrIEiDrOiDCyCP2RljFepIcDuXrggPXm+fTw0=; b=RYG4T6xWVvNMiWDlWCW/yK7sU/IkfQ3FzSEo4k6qnjTB+L2+GS0Wv/HayjQB0Hr0qP ZkiJIEEiFALxtLEkmCbJ3ZznfvX4ToPVMJHK5tM79ynRCAxZO9l9sXN+GAAqdlDSnOnU KfoKRE0j+ktytJl+yNIekIBWm48BUpiAl74K8cfCamCCuskeQRmu2HtckTLH1ST2HgWr AFEFc9JCVtQ8mKN2hdkITQiW4t1olbI2au10KmZfc03eRTFG0zDoJTJYzA6laB3y/3hd T5flBT9QnCOLsoe8rvcnCMc2Q5qdWB469bH31veqljtU3250dt6wliJJSJ7oLU26pkTW YlKg== X-Gm-Message-State: APjAAAXY0hXxEajsrIFDIBjJ+9KdstSpn9SC0xxuvDXseFK6ZQMTAr51 4PZvNcr7Uu7Nh6q81t5Iq7PvYg== X-Google-Smtp-Source: APXvYqxsAOon4fLSMCUN14UHR9rpLGEWwEnwRupMIglrYTylO40wKElnQneEjkah/M+tAzI8G/ZoqQ== X-Received: by 2002:a7b:c764:: with SMTP id x4mr3323755wmk.113.1575103578673; Sat, 30 Nov 2019 00:46:18 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h15sm31711328wrb.44.2019.11.30.00.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Nov 2019 00:46:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 77CF91FF99; Sat, 30 Nov 2019 08:46:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/14] target/arm: explicitly encode regnum in our XML Date: Sat, 30 Nov 2019 08:45:58 +0000 Message-Id: <20191130084602.10818-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191130084602.10818-1-alex.bennee@linaro.org> References: <20191130084602.10818-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::341 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@linaro.org, "open list:ARM TCG CPUs" , alan.hayward@arm.com, =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index a31c7a36d6b..cc7258d5f1d 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 4bf133e2f42..d00e4fcca86 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6995,7 +6995,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); }