From nobody Fri Nov 14 16:55:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) ARC-Seal: i=2; a=rsa-sha256; t=1589217856; cv=pass; d=zohomail.com; s=zohoarc; b=k2bbSZP9Eb0KF4Qxjnp5CopZoPPJ6Y/yc/pNHkvk8FqlT521CMemZKyvVoSYTF7q2dmgAa80/5REw5nCJL01ZwRxgWf8+tlKbzsriRe0qz7JroVwjbu8lddD79iLqsp6ibDaNYgU/rT8JTqU9ar8jddRMqKhS9L4gfH9KkhVxsw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589217856; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hUeNmFjAPFyqGor4e03Zece3+ySpxSOYPpwOHZIGd5c=; b=JiVRVDD4NXUQf7QR6Md0kHJnYJQENIW/VQcOOyHGGBxgBl/V2jFBeyb7LMwLWA0FfCsADDvZPHKdlBOyI2z78SdyvGA8I6Zz3E0zyWWyV6SXKrwcdA7/FJVyNdycGyOENCpU+KtoW4x0ODLxaKoIGpGqJPsNFCFpyLTx1JCunYs= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589217856913380.8833642001614; Mon, 11 May 2020 10:24:16 -0700 (PDT) Received: from localhost ([::1]:55662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYCA3-000277-Kw for importer@patchew.org; Mon, 11 May 2020 13:24:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYC6z-00059P-Jz for qemu-devel@nongnu.org; Mon, 11 May 2020 13:21:05 -0400 Received: from mail-mw2nam10on2073.outbound.protection.outlook.com ([40.107.94.73]:37344 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYC6w-0003uV-2I for qemu-devel@nongnu.org; Mon, 11 May 2020 13:21:05 -0400 Received: from SN4PR0401CA0034.namprd04.prod.outlook.com (2603:10b6:803:2a::20) by CH2PR02MB7047.namprd02.prod.outlook.com (2603:10b6:610:85::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.30; Mon, 11 May 2020 17:05:56 +0000 Received: from SN1NAM02FT060.eop-nam02.prod.protection.outlook.com (2603:10b6:803:2a:cafe::57) by SN4PR0401CA0034.outlook.office365.com (2603:10b6:803:2a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.30 via Frontend Transport; Mon, 11 May 2020 17:05:56 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT060.mail.protection.outlook.com (10.152.72.192) with Microsoft SMTP Server id 15.20.2979.29 via Frontend Transport; Mon, 11 May 2020 17:05:56 +0000 Received: from [149.199.38.66] (port=35077 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1jYBs4-0007nB-TO for qemu-devel@nongnu.org; Mon, 11 May 2020 10:05:40 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1jYBsK-0004Py-1j for qemu-devel@nongnu.org; Mon, 11 May 2020 10:05:56 -0700 Received: from xsj-pvapsmtp01 (xsj-pvapsmtp01.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 04BH5psI000793; Mon, 11 May 2020 10:05:52 -0700 Received: from [172.19.2.32] (helo=xsjkomlodi50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1jYBsF-0004PW-P7; Mon, 11 May 2020 10:05:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OrkbXmEL4JkUe0KsYMnkTfgjuWZsIZS5oBR01Y3crM2y8MjEziKPC3k2+bvMA3uAE6SpIG88g5Saxjw/HZqWFBQXGSndsTo7QDMD0fSdbJ41/lOVeUTezwYi6fygn57C9rTbmgFvtGHxpxMoBSjoDBqljCuqDrIy+9IfSo+Oq2t4SBIdv3L/VOsRvrz32hzqP+5TqWIrpHaWrr6QwW0s1SzKDkptWbCammtQHJIjFpFsLe3Jh8nqxeBCjwNGeSmai6OSesH57ZybVAAfRUcs/KvgAL+C+2AMzz8fM6EKWQ0IkBaBpSUun+6hyvX/2GNIysFblR0jzZlSonwEtip6Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hUeNmFjAPFyqGor4e03Zece3+ySpxSOYPpwOHZIGd5c=; b=aVKZNONn4dMnRfOc/UlHAJh6m2Im94roRMVX8F/xoMOZPBVpl2dp7OtGEk0xZ+joIDBfXFqWuILJcnj06xwr1vBV3rRTsChdbiqQN+nLAx0mRRhBK5HU7KPwbSzonK0tbueZ2RcWOzFcjTrsZBM9MQ3cLIg2Vwq8VaYgzIB66fb+6/irgKz/qpcaMuuhQ1tTLaZBEdYDBrUjdKdlOo7V1i+wmEUhPfXJClRb4m3OVjQVlSNe4BkEpLfH3Qo9bRcRODRCYKnYBVZM7d5kYsAKMWhGtO2UMxl1geCjMgtx2+pDBXhXIXwRvPSdBugX1RqRBAGhvQzFxDuY2wuDP8LL2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hUeNmFjAPFyqGor4e03Zece3+ySpxSOYPpwOHZIGd5c=; b=Bs6a3C6h51vrqWjVt3u75H3BiqeHBUrBX6L0uqNhRHslWJe0VNraruebiVtF1y/vjZ21/nDDblIjKdmzQSovdSkU9u3bSpvjkx6pOstNg59Kqqm2w5Pf9g9vBbfppur9ftvH9VdTHXS9aWFN6vhO7XIFk6hIOG6sDd7EQQYN8wg= Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; From: Joe Komlodi To: qemu-devel@nongnu.org Subject: [PATCH v1 1/4] target/microblaze: gdb: Add dynamic GDB XML register support Date: Mon, 11 May 2020 10:05:48 -0700 Message-Id: <1589216751-106038-2-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1589216751-106038-1-git-send-email-komlodi@xilinx.com> References: <1589216751-106038-1-git-send-email-komlodi@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFTY:; SFS:(376002)(136003)(396003)(346002)(39860400002)(46966005)(33430700001)(6666004)(336012)(44832011)(316002)(36756003)(33440700001)(82310400002)(2906002)(2616005)(426003)(86362001)(356005)(107886003)(478600001)(70206006)(81166007)(70586007)(6916009)(7696005)(82740400003)(8676002)(8936002)(186003)(9786002)(47076004)(26005)(5660300002)(4326008); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: da4eb191-8113-421e-beef-08d7f5cd9212 X-MS-TrafficTypeDiagnostic: CH2PR02MB7047: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:1751; X-Forefront-PRVS: 04004D94E2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9rlePO0zG5nYjIx8Y3CPiDETq+G6OONthpvB7S6Pd9SGg5SVjgTcvPZ6Wxcjbws1qQ6EsMNjDIKZmeDPOaDvbFfJzF7+3+RIZRTBKf7E3eIWPpdOV4gKOZwAytCh80Rr1gxBVMMLETbPNReHUY7GC9UUjsHvu5SmH0occojLgCtpagImRU7jRkwZp4kpOR6cv/NUJleCV0wOkcC0KUePJq4QhXgturVHpxKm3r+X6rtAwtGivl/wWVX81H5Ypv6t0Cjgg0dBKp/lhVOCMQe5YJlJnbF/UAYani1lwA0gatbYhmNiKWkqYISrbwGilOzessWwaRIxbSQTc597fuGuKHVCtQ3yYFJYJXVq0WW3SJ83cmMbKPV58HftQiynhNAh2xi7cZV4EsggsXHz3QbKalsJepjW2e0HRdWE1n9P4vdnEJ0VXeuema8WxTpBPyAM13rLp/Nl4st3NqYVRRpmR6PTL78B4vrzxSaBgs+cR0Km+EUxaNcjRdJYCcMToXw/BvVVSiiaMmbVCv82oALgAjMbh0OS8H1p2opZtlfBdKnzgPdI+z7kdAyAhE3iEYov1zg01ZvEceop0nNeKXJHtQ== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 17:05:56.3987 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: da4eb191-8113-421e-beef-08d7f5cd9212 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB7047 Received-SPF: pass client-ip=40.107.94.73; envelope-from=komlodi@xilinx.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 13:20:59 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: edgar.iglesias@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add dynamic GDB register XML for Microblaze, and modify the config file to use XML when building for Microblaze. For the dynamic XML to be read, there still needs to be a core XML file. Signed-off-by: Joe Komlodi Reviewed-by: Edgar E. Iglesias --- configure | 1 + target/microblaze/cpu.c | 4 ++ target/microblaze/cpu.h | 9 ++++ target/microblaze/gdbstub.c | 123 ++++++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 137 insertions(+) diff --git a/configure b/configure index 0d69c36..5a099b6 100755 --- a/configure +++ b/configure @@ -7832,6 +7832,7 @@ case "$target_name" in TARGET_ARCH=3Dmicroblaze TARGET_SYSTBL_ABI=3Dcommon bflt=3D"yes" + gdb_xml_files=3D"microblaze-core.xml" echo "TARGET_ABI32=3Dy" >> $config_target_mak ;; mips|mipsel) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index aa99830..41cac1b 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -226,6 +226,8 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **= errp) env->pvr.regs[11] =3D (cpu->cfg.use_mmu ? PVR11_USE_MMU : 0) | 16 << 17; =20 + mb_gen_dynamic_xml(cpu); + mcc->parent_realize(dev, errp); } =20 @@ -330,6 +332,8 @@ static void mb_cpu_class_init(ObjectClass *oc, void *da= ta) dc->vmsd =3D &vmstate_mb_cpu; device_class_set_props(dc, mb_properties); cc->gdb_num_core_regs =3D 32 + 5; + cc->gdb_get_dynamic_xml =3D mb_gdb_get_dynamic_xml; + cc->gdb_core_xml_file =3D "microblaze-core.xml"; =20 cc->disas_set_info =3D mb_disas_set_info; cc->tcg_initialize =3D mb_tcg_init; diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index a31134b..074a18e 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -25,6 +25,8 @@ #include "fpu/softfloat-types.h" =20 typedef struct CPUMBState CPUMBState; +typedef struct DynamicMBGDBXMLInfo DynamicMBGDBXMLInfo; + #if !defined(CONFIG_USER_ONLY) #include "mmu.h" #endif @@ -272,6 +274,10 @@ struct CPUMBState { } pvr; }; =20 +struct DynamicMBGDBXMLInfo { + char *xml; +}; + /** * MicroBlazeCPU: * @env: #CPUMBState @@ -286,6 +292,7 @@ struct MicroBlazeCPU { =20 CPUNegativeOffsetState neg; CPUMBState env; + DynamicMBGDBXMLInfo dyn_xml; =20 /* Microblaze Configuration Settings */ struct { @@ -321,6 +328,8 @@ void mb_cpu_dump_state(CPUState *cpu, FILE *f, int flag= s); hwaddr mb_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); int mb_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int mb_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); +void mb_gen_dynamic_xml(MicroBlazeCPU *cpu); +const char *mb_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname); =20 void mb_tcg_init(void); /* you can call this signal handler from your SIGBUS and SIGSEGV diff --git a/target/microblaze/gdbstub.c b/target/microblaze/gdbstub.c index f41ebf1..cdca434 100644 --- a/target/microblaze/gdbstub.c +++ b/target/microblaze/gdbstub.c @@ -54,3 +54,126 @@ int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *me= m_buf, int n) } return 4; } + +static void mb_gen_xml_reg_tag(const MicroBlazeCPU *cpu, GString *s, + const char *name, uint8_t bitsize, + const char *type) +{ + g_string_append_printf(s, "\n"); +} + +static uint8_t mb_cpu_sreg_size(const MicroBlazeCPU *cpu, uint8_t index) +{ + /* + * NOTE: mb-gdb will refuse to connect if we say registers are + * larger then 32-bits. + * For now, say none of our registers are dynamically sized, and are + * therefore only 32-bits. + */ + + return 32; +} + +static void mb_gen_xml_reg_tags(const MicroBlazeCPU *cpu, GString *s) +{ + uint8_t i; + const char *type; + char reg_name[4]; + bool has_hw_exception =3D cpu->cfg.dopb_bus_exception || + cpu->cfg.iopb_bus_exception || + cpu->cfg.illegal_opcode_exception || + cpu->cfg.opcode_0_illegal || + cpu->cfg.div_zero_exception || + cpu->cfg.unaligned_exceptions; + + static const char *reg_types[32] =3D { + [1] =3D "data_ptr", + [14] =3D "code_ptr", + [15] =3D "code_ptr", + [16] =3D "code_ptr", + [17] =3D "code_ptr" + }; + + for (i =3D 0; i < 32; ++i) { + type =3D reg_types[i]; + /* r17 only has a code_ptr tag if we have HW exceptions */ + if (i =3D=3D 17 && !has_hw_exception) { + type =3D NULL; + } + + sprintf(reg_name, "r%d", i); + mb_gen_xml_reg_tag(cpu, s, reg_name, 32, type); + } +} + +static void mb_gen_xml_sreg_tags(const MicroBlazeCPU *cpu, GString *s) +{ + uint8_t i; + + static const char *sreg_names[] =3D { + "rpc", + "rmsr", + "rear", + "resr", + "rfsr", + "rbtr", + "rpvr0", + "rpvr1", + "rpvr2", + "rpvr3", + "rpvr4", + "rpvr5", + "rpvr6", + "rpvr7", + "rpvr8", + "rpvr9", + "rpvr10", + "rpvr11", + "redr", + "rpid", + "rzpr", + "rtlblo", + "rtlbhi", + "rtlbx", + "rtlbsx", + "rslr", + "rshr" + }; + + static const char *sreg_types[ARRAY_SIZE(sreg_names)] =3D { + [SR_PC] =3D "code_ptr" + }; + + for (i =3D 0; i < ARRAY_SIZE(sreg_names); ++i) { + mb_gen_xml_reg_tag(cpu, s, sreg_names[i], mb_cpu_sreg_size(cpu, i), + sreg_types[i]); + } +} + +void mb_gen_dynamic_xml(MicroBlazeCPU *cpu) +{ + GString *s =3D g_string_new(NULL); + + g_string_printf(s, "\n" + "\n" + "\n= "); + + mb_gen_xml_reg_tags(cpu, s); + mb_gen_xml_sreg_tags(cpu, s); + + g_string_append_printf(s, ""); + + cpu->dyn_xml.xml =3D g_string_free(s, false); +} + +const char *mb_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname) +{ + MicroBlazeCPU *cpu =3D MICROBLAZE_CPU(cs); + + return cpu->dyn_xml.xml; +} --=20 2.7.4 From nobody Fri Nov 14 16:55:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) ARC-Seal: i=2; a=rsa-sha256; t=1589217800; cv=pass; d=zohomail.com; s=zohoarc; b=csbx9Hc6d5V8MCD++2YqWL67m0Ry1+/UWzCygv5PKiAnkTyId2YsKjnFynBt3jfvq/MEglD2Xwezjgz/VVtRq9ifZBj07BM4IcTzU2FdlVtwWP6D/5qlUFtlD9E7DfncxmhsS1wKFpU6Y3h7Rxm0wLq5g1qBxW439/pvUHMg8bw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589217800; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ky2frw7xYYuP3OgTRuJ2N2y/8tHtihYuCes7f18Xri4=; b=Z9boxqv0AVQp5pHWfou7mr5tzSjlQ9fljPkDyFPy2STPvhjaszZa9WPXmZhUdWrGXA+c0uOls0qlCv8PqCIj3bquUKxPXnFYyD/9TJY169mhHeBDdKtTt6RXLlLChIrrJliTA68N/DWcrR1Z3B1mXcDjmAXWSfKlgmh6HYGjBJA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589217800898913.9654502918654; Mon, 11 May 2020 10:23:20 -0700 (PDT) Received: from localhost ([::1]:53008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYC99-0000tK-My for importer@patchew.org; Mon, 11 May 2020 13:23:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYC6y-00056N-Lh for qemu-devel@nongnu.org; Mon, 11 May 2020 13:21:04 -0400 Received: from mail-bn7nam10on2067.outbound.protection.outlook.com ([40.107.92.67]:10528 helo=NAM10-BN7-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYC6w-0003uT-1W for qemu-devel@nongnu.org; Mon, 11 May 2020 13:21:03 -0400 Received: from SN4PR0501CA0033.namprd05.prod.outlook.com (2603:10b6:803:40::46) by MN2PR02MB6878.namprd02.prod.outlook.com (2603:10b6:208:20c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.34; Mon, 11 May 2020 17:05:57 +0000 Received: from SN1NAM02FT015.eop-nam02.prod.protection.outlook.com (2603:10b6:803:40:cafe::d2) by SN4PR0501CA0033.outlook.office365.com (2603:10b6:803:40::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.12 via Frontend Transport; Mon, 11 May 2020 17:05:56 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT015.mail.protection.outlook.com (10.152.72.109) with Microsoft SMTP Server id 15.20.2979.29 via Frontend Transport; Mon, 11 May 2020 17:05:56 +0000 Received: from [149.199.38.66] (port=35080 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1jYBs4-0007nE-Ul for qemu-devel@nongnu.org; Mon, 11 May 2020 10:05:40 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1jYBsK-0004Py-3B for qemu-devel@nongnu.org; Mon, 11 May 2020 10:05:56 -0700 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 04BH5pRC000795; Mon, 11 May 2020 10:05:52 -0700 Received: from [172.19.2.32] (helo=xsjkomlodi50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1jYBsF-0004PW-Ql; Mon, 11 May 2020 10:05:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jozrcfD5844Hy8lyXgPNnM6hx/CTRFcGhx0Clvs4WnZXWrS78cKbjZGkQ4qHgfSE0n2jMCpqdKahIVnX9CGzRtO4iYXXuRWyL+PhfqOTWTSipKEtPiDOr2AlhsUnFARbrkOl9QZGVKtXds5SkHbgKynZ/hrAhgl0r0mLTM72SFZVXrshGWKuZQ8Rx6Gb6sIz4dsOOFFBoaRYW1laIxWuB76v9hOrafSe6sNm6KESnUZGQzE9f34wwSekH7vn0limL9g9T3qSEOq1PcZ9qVz+OGwNP92gPmqQmZmYHPGSSzRv8j9C4cDNlfbtkfvX6K8hQ2RCJMZO1kLpD2f2NS/Qhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ky2frw7xYYuP3OgTRuJ2N2y/8tHtihYuCes7f18Xri4=; b=Zo/g62hwEyZ2ufYGJ7YW6KDdFQZsSixNahhPJ3l0tlJyVvjc6hxVdN2rgGRrYg5TYc0pn6QQAi0jF6/WMqll25amFzDT3e7Y52YGALCeCxKIU9/R5p2P+5WQ4nES0HtIIN9fmV69A44oe7u7to7ankiNnKtMGhkrsD0/Yr8cEejGISYPj81JYIFBfyIVguC6VXu0pEFhs1n1JSXStjnj7RAGWuzUWdqLaYa31D/i1/3z66T+gbS362VsoDS70iEuCXnjVFnM00er8/wp1GDJzFmMkc5cgByB8G5Dx31sU1rkoFZxehHb4LslWHKV71a7KzoYdQeve7tb3Xfo1W5hxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ky2frw7xYYuP3OgTRuJ2N2y/8tHtihYuCes7f18Xri4=; b=FJeG0AIpv9VnMlkCR1Zqklv96oOQXFGYt5zZpzvOVmUR2oRNsn0X8RbHgqJIjmzayN1YOLIWvSh5QMoDh0XSKIl6xOIhkLCHCaHinB2EGLnKdCJAFnpudlz7fpbMfXcDWAUYN8bfipaPsv/cw9VvTeOFjEbIY7aXZi1RlJcJQDo= Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; From: Joe Komlodi To: qemu-devel@nongnu.org Subject: [PATCH v1 2/4] target/microblaze: gdb: Extend the number of registers presented to GDB Date: Mon, 11 May 2020 10:05:49 -0700 Message-Id: <1589216751-106038-3-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1589216751-106038-1-git-send-email-komlodi@xilinx.com> References: <1589216751-106038-1-git-send-email-komlodi@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFTY:; SFS:(136003)(376002)(396003)(39860400002)(346002)(46966005)(33430700001)(26005)(186003)(47076004)(82740400003)(82310400002)(426003)(2616005)(86362001)(316002)(336012)(356005)(81166007)(33440700001)(478600001)(2906002)(8676002)(70586007)(4326008)(70206006)(107886003)(36756003)(9786002)(44832011)(7696005)(8936002)(6916009)(5660300002); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b84efa0b-df72-4ff8-f724-08d7f5cd920f X-MS-TrafficTypeDiagnostic: MN2PR02MB6878: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 04004D94E2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2aQCzDJXxuI+nUI5V3ns+v09wZE9MjZOSqdQrbTa/sGGwCD2aWRnY0iVQjoYzy/tpXnlw/NSYlR139kbKCpRBjz8ITmmu5U6yaIEuHeEbWpg7QJKdvfUFW6qyTN6CCYrai3shKBWvIp6a/CFrsCCj03yKkUY5CaH6Btd+osGJgyeXAI8573E+eS4B76JX4ghWKLSCtgbU8pxGLruGvIPzESyGA18mQLHmn5jw7NtNe1FBcL7zaZhQfT90qDSjLbE5SZvd/sXm5jxCB6Po0g1H7PZu7QqJVyNxRKfmkFftM4n0jYEt8QjfQbb9QeAZNB7HuJ3jaE4TDB+n87kfMVkpGH1akotCbaEojLprFxZHxRmNX/2hHGc2wWp9OOIgVBXf68P402c/MbIsJ2EIhHGm7gyId6UJ+d3/vjJ/jzc2iR0Y5S2FhF1aym5COXDZptZ3xWd2cDcUNTJauSFarSJ6hDO0UC09c2RXLr7xAIU+uZLU4+Q7tca2cZDkO3lWJPWKYZ2S1UCnRCAmfgHa7ATfMjw4/cP45i7OicdaRDQ6TJT9pmAbYOamcfi+OyNfR3U63ONMG2idI4qzx4tSuYiKQ== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 17:05:56.3805 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b84efa0b-df72-4ff8-f724-08d7f5cd920f X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR02MB6878 Received-SPF: pass client-ip=40.107.92.67; envelope-from=komlodi@xilinx.com; helo=NAM10-BN7-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 13:20:59 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: edgar.iglesias@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Increase the number of Microblaze registers QEMU will report when talking to GDB. Signed-off-by: Joe Komlodi Reviewed-by: Edgar E. Iglesias --- target/microblaze/cpu.c | 2 +- target/microblaze/gdbstub.c | 52 +++++++++++++++++++++++++++++++++++++++++= +--- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 41cac1b..5b6ad5b 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -331,7 +331,7 @@ static void mb_cpu_class_init(ObjectClass *oc, void *da= ta) #endif dc->vmsd =3D &vmstate_mb_cpu; device_class_set_props(dc, mb_properties); - cc->gdb_num_core_regs =3D 32 + 5; + cc->gdb_num_core_regs =3D 32 + 27; cc->gdb_get_dynamic_xml =3D mb_gdb_get_dynamic_xml; cc->gdb_core_xml_file =3D "microblaze-core.xml"; =20 diff --git a/target/microblaze/gdbstub.c b/target/microblaze/gdbstub.c index cdca434..af29f00 100644 --- a/target/microblaze/gdbstub.c +++ b/target/microblaze/gdbstub.c @@ -26,12 +26,37 @@ int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *= mem_buf, int n) MicroBlazeCPU *cpu =3D MICROBLAZE_CPU(cs); CPUMBState *env =3D &cpu->env; =20 + /* + * GDB expects registers to be reported in this order: + * R0-R31 + * PC-BTR + * PVR0-PVR11 + * EDR-TLBHI + * SLR-SHR + */ if (n < 32) { return gdb_get_reg32(mem_buf, env->regs[n]); } else { - return gdb_get_reg32(mem_buf, env->sregs[n - 32]); + n -=3D 32; + switch (n) { + case 0 ... 5: + return gdb_get_reg32(mem_buf, env->sregs[n]); + /* PVR12 is intentionally skipped */ + case 6 ... 17: + n -=3D 6; + return gdb_get_reg32(mem_buf, env->pvr.regs[n]); + case 18 ... 24: + /* Add an offset of 6 to resume where we left off with SRegs */ + n =3D n - 18 + 6; + return gdb_get_reg32(mem_buf, env->sregs[n]); + case 25: + return gdb_get_reg32(mem_buf, env->slr); + case 26: + return gdb_get_reg32(mem_buf, env->shr); + default: + return 0; + } } - return 0; } =20 int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) @@ -50,7 +75,28 @@ int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *mem= _buf, int n) if (n < 32) { env->regs[n] =3D tmp; } else { - env->sregs[n - 32] =3D tmp; + n -=3D 32; + switch (n) { + case 0 ... 5: + env->sregs[n] =3D tmp; + break; + /* PVR12 is intentionally skipped */ + case 6 ... 17: + n -=3D 6; + env->pvr.regs[n] =3D tmp; + break; + case 18 ... 24: + /* Add an offset of 6 to resume where we left off with SRegs */ + n =3D n - 18 + 6; + env->sregs[n] =3D tmp; + break; + case 25: + env->slr =3D tmp; + break; + case 26: + env->shr =3D tmp; + break; + } } return 4; } --=20 2.7.4 From nobody Fri Nov 14 16:55:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) ARC-Seal: i=2; a=rsa-sha256; t=1589217735; cv=pass; d=zohomail.com; s=zohoarc; b=guf07m+hlYfZoy9FpsVK35btX+0KVvdv7OKyEvWQClMH7iRttcpMwUyFAm5kA6pvM3D6iBPfKDaySKSCXeRaP729xP+ZEIz3Tu2GJ2XO8IwQX6Sc3zJp2oH/F+Vcsv4gk90RB44v7J8yuujW5KBgA7k0TEruQP8P7vr/iRWZG1g= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589217735; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gUBtE68pDVFOLxmda2X/+UzxTjyagMw2y9Wh/zkqtPk=; b=hj7lGuDiTNWxl606I1KpYXGPDxlPQI/s4MSUHSftCZAVEchSwKD4MQ43psljacrkBrlRO+gMMmH+W1QAQaabpZN4B6jUGPpKwtRCxUPJt372gAzmVRxn7q0XkMPn2P/AgY7fP8jkuCHKHizEe4v191MIW56n9itumObHjE8VSNA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589217735602151.19080363005537; Mon, 11 May 2020 10:22:15 -0700 (PDT) Received: from localhost ([::1]:48422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYC86-00074B-5b for importer@patchew.org; Mon, 11 May 2020 13:22:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYC70-0005Bn-IF for qemu-devel@nongnu.org; Mon, 11 May 2020 13:21:06 -0400 Received: from mail-dm6nam10on2075.outbound.protection.outlook.com ([40.107.93.75]:49536 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYC6v-0003uR-W0 for qemu-devel@nongnu.org; Mon, 11 May 2020 13:21:06 -0400 Received: from CY4PR01CA0016.prod.exchangelabs.com (2603:10b6:903:1f::26) by BYAPR02MB5926.namprd02.prod.outlook.com (2603:10b6:a03:11e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.34; Mon, 11 May 2020 17:05:57 +0000 Received: from CY1NAM02FT018.eop-nam02.prod.protection.outlook.com (2603:10b6:903:1f:cafe::7d) by CY4PR01CA0016.outlook.office365.com (2603:10b6:903:1f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.27 via Frontend Transport; Mon, 11 May 2020 17:05:57 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT018.mail.protection.outlook.com (10.152.75.183) with Microsoft SMTP Server id 15.20.2979.29 via Frontend Transport; Mon, 11 May 2020 17:05:56 +0000 Received: from [149.199.38.66] (port=35090 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1jYBs5-0007nK-3I for qemu-devel@nongnu.org; Mon, 11 May 2020 10:05:41 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1jYBsK-0004Py-7l for qemu-devel@nongnu.org; Mon, 11 May 2020 10:05:56 -0700 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 04BH5pQL000797; Mon, 11 May 2020 10:05:52 -0700 Received: from [172.19.2.32] (helo=xsjkomlodi50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1jYBsF-0004PW-SP; Mon, 11 May 2020 10:05:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DAXYwUkepeb3IxW/H69fEtCoPd0O9Gxtjb6ll+E2XnlI9G3piZQWXv8qTIO84HdquYDMPNxEmxwQSd+WSuryFypngx6yhrG1Q+HXup9HRHCB4HsEb4VB9tj2AAqVe/6yUcquMhPPdVwsNTECD0xyI+6IWO00aoIpb6jD+efew9oNPCgQ4IaGEahqlVYwvEQl4yYQid9tNpn3/zQPpEHK0M61j8OQenSOOHpLIVzsD6SIxsVOSqDxaAzEAQosfZ0SjrY89fnHbJyom9hggjkadg9sgeCjW8f7wJWv4lPP9n9M2Sexq/HWaivQXvM8RrnlflphKQpP1ZTi80x1xV43Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gUBtE68pDVFOLxmda2X/+UzxTjyagMw2y9Wh/zkqtPk=; b=YE+klWCCThk2B8o1T42n5jTBGqWFZkR6tosgeZUDfYhueTpLRaD4g9MzdsE5yZWvoFYXlpoHpk/zIIbqrw3q14CCmel5YFS/JgqqdPjrqpWClaiR6kXmVt+x6A9zZohJX/axkf/Qh6VOTY6L624X1KZHylZ/I6ONdcDEiyYaGOcDsA1weW+HH8dAqT5tGkZvCBs1BNVtF1IXn6peTwiMgdOtQXOGXTMliBkNgN2Ml8fG0n6dM1TSd2/XK/kEJSKeqVVgtuC3QLpE89VM6uDonYmxXGTuNC9QzQvU62zN8Po1sqaOAc4yoKsdFShmD0MKa9B7kY/cNOemcIB/2GBA3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gUBtE68pDVFOLxmda2X/+UzxTjyagMw2y9Wh/zkqtPk=; b=L5Yd9StxQAv+mVcaW+gtp9TGRbfK/HoykM/KFs1WgRTJAMOoJNIKKsUHpIN1Cp2L+0Xse4M2cvGtw3cVdooEz0OqWLu4b4piMfuw1oyvyEkny5WtFnvgE161Q6XmnPLIOIpv9WPLk18wRUihr8Eu42ufd8ANdnXPR4DQYQMLvC8= Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; From: Joe Komlodi To: qemu-devel@nongnu.org Subject: [PATCH v1 3/4] target/microblaze: gdb: Fix incorrect SReg reporting Date: Mon, 11 May 2020 10:05:50 -0700 Message-Id: <1589216751-106038-4-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1589216751-106038-1-git-send-email-komlodi@xilinx.com> References: <1589216751-106038-1-git-send-email-komlodi@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFTY:; SFS:(376002)(346002)(39860400002)(136003)(396003)(46966005)(33430700001)(107886003)(4326008)(6916009)(70206006)(478600001)(316002)(36756003)(7696005)(47076004)(2906002)(426003)(5660300002)(2616005)(336012)(86362001)(26005)(70586007)(186003)(9786002)(8676002)(82310400002)(44832011)(356005)(82740400003)(81166007)(33440700001)(8936002); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be2a6a3d-06af-4b43-b03d-08d7f5cd922e X-MS-TrafficTypeDiagnostic: BYAPR02MB5926: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-Forefront-PRVS: 04004D94E2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TZajc8Ygv9xfrhvXQYTFGG6RmyZmx4HbeQCjHoeyOgiVI9hZo1uDw5F1+qUGjcQt8kBjv/nT29zTYSfxvs6/YvTD9jFlI3Ni6fcrBRxRxiC7Y1dhctJl2HzezusP70FP6Wj+YyYcgK0pV9CibZbnPDyoTK+k4xLuPw/bxzruWvqSOjarLLjtutBv8/rOOSNseYnfi6E/GG6/nKi+Wf4CX9rfoh58ibAtN+mel3AVz1rwltSsjU5jjMf+yTRqglECbD2wP2i8vJqtqn+Iq6ri3VmqzLhNg/9KgAwBo+IO5kyLahBZi8Rmrvbp+PfIxHEGcx7gSmQqZz8DQlrvn0xQox3itLWt4AbTuVOlJrksdG9LpntdgWn3KCOLro7nqpfJN3DUNqfvszewx20Cfa7Tbolxzb06GerMqmFrGu58D5hroJqCXE/S3DGBzBkTg+bDLql2ZHP9+jCBS10ckkGzMrSDYw1NwW+gktcwc5636mkp0LaBq3iEE92eg1p+ETAJZ3Njxxn65qPDKVE5ukzuGKxOTLXJMwW8JDkJscAn4JNVXDGTUVXlzQi+sRLn5u+BoW3g4WDjRw5udiK1FKDyJA== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 17:05:56.5823 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be2a6a3d-06af-4b43-b03d-08d7f5cd922e X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR02MB5926 Received-SPF: pass client-ip=40.107.93.75; envelope-from=komlodi@xilinx.com; helo=NAM10-DM6-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 13:20:58 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: edgar.iglesias@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" SRegs used to be reported to GDB by iterating over the SRegs array, however we do not store them in an order that allows them to be reported to GDB in that way. To fix this, a simple map is used to map the register GDB wants to its location in the SRegs array. Signed-off-by: Joe Komlodi Reviewed-by: Edgar E. Iglesias --- target/microblaze/gdbstub.c | 59 +++++++++++++++++++++++++++++++++++++----= ---- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/target/microblaze/gdbstub.c b/target/microblaze/gdbstub.c index af29f00..485b717 100644 --- a/target/microblaze/gdbstub.c +++ b/target/microblaze/gdbstub.c @@ -25,6 +25,21 @@ int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *m= em_buf, int n) { MicroBlazeCPU *cpu =3D MICROBLAZE_CPU(cs); CPUMBState *env =3D &cpu->env; + /* + * GDB expects SREGs in the following order: + * PC, MSR, EAR, ESR, FSR, BTR, EDR, PID, ZPR, TLBX, TLBSX, TLBLO, TLB= HI. + * They aren't stored in this order, so make a map. + * PID, ZPR, TLBx, TLBsx, TLBLO, and TLBHI aren't modeled, so we don't + * map them to anything and return a value of 0 instead. + */ + static const uint8_t sreg_map[6] =3D { + SR_PC, + SR_MSR, + SR_EAR, + SR_ESR, + SR_FSR, + SR_BTR + }; =20 /* * GDB expects registers to be reported in this order: @@ -40,15 +55,16 @@ int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *= mem_buf, int n) n -=3D 32; switch (n) { case 0 ... 5: - return gdb_get_reg32(mem_buf, env->sregs[n]); + return gdb_get_reg32(mem_buf, env->sregs[sreg_map[n]]); /* PVR12 is intentionally skipped */ case 6 ... 17: n -=3D 6; return gdb_get_reg32(mem_buf, env->pvr.regs[n]); - case 18 ... 24: - /* Add an offset of 6 to resume where we left off with SRegs */ - n =3D n - 18 + 6; - return gdb_get_reg32(mem_buf, env->sregs[n]); + case 18: + return gdb_get_reg32(mem_buf, env->sregs[SR_EDR]); + /* Other SRegs aren't modeled, so report a value of 0 */ + case 19 ... 24: + return gdb_get_reg32(mem_buf, 0); case 25: return gdb_get_reg32(mem_buf, env->slr); case 26: @@ -66,29 +82,52 @@ int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *me= m_buf, int n) CPUMBState *env =3D &cpu->env; uint32_t tmp; =20 + /* + * GDB expects SREGs in the following order: + * PC, MSR, EAR, ESR, FSR, BTR, EDR, PID, ZPR, TLBX, TLBSX, TLBLO, TLB= HI. + * They aren't stored in this order, so make a map. + * PID, ZPR, TLBx, TLBsx, TLBLO, and TLBHI aren't modeled, so we don't + * map them to anything. + */ + static const uint8_t sreg_map[6] =3D { + SR_PC, + SR_MSR, + SR_EAR, + SR_ESR, + SR_FSR, + SR_BTR + }; + if (n > cc->gdb_num_core_regs) { return 0; } =20 tmp =3D ldl_p(mem_buf); =20 + /* + * GDB expects registers to be reported in this order: + * R0-R31 + * PC-BTR + * PVR0-PVR11 + * EDR-TLBHI + * SLR-SHR + */ if (n < 32) { env->regs[n] =3D tmp; } else { n -=3D 32; switch (n) { case 0 ... 5: - env->sregs[n] =3D tmp; + env->sregs[sreg_map[n]] =3D tmp; break; /* PVR12 is intentionally skipped */ case 6 ... 17: n -=3D 6; env->pvr.regs[n] =3D tmp; break; - case 18 ... 24: - /* Add an offset of 6 to resume where we left off with SRegs */ - n =3D n - 18 + 6; - env->sregs[n] =3D tmp; + /* Only EDR is modeled in these indeces, so ignore the rest */ + case 18: + env->sregs[SR_EDR] =3D tmp; break; case 25: env->slr =3D tmp; --=20 2.7.4 From nobody Fri Nov 14 16:55:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) ARC-Seal: i=2; a=rsa-sha256; t=1589217779; cv=pass; d=zohomail.com; s=zohoarc; b=iCAjJtsLgU+seqelYfm1zaGArdP+kXqGH6WlqMUiKV8a/h2YHlIgQWYDWJoQNAQhXtMo9ZLFHhi3of/9N4NU5giZS2uUToQiDIRbZcNq/FXFqzq/KO1DP+WKJEByb9UkwjpUC8AETi4ptyiDd6esYMIozgJpAxqAmr97C6M9ZXQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589217779; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=95yqqbip7xXPz09ylUg1tmOBtjWhHrQ0bniJROEWzEE=; b=NMK5BTqMf1GcfplREuKGwfMlTCHe8bhb9T/nIEt/VJNcGmfN59heJk1DZ0Y5CksKA/T2ur7ybyupQxdTgk+N/birsa+jqJimGxJfSd/PadRU70v154JCrnv/lE8cn8nddk7jWGwkdSMSYTY00EPTW5etRpJ543zmre9m3b+PIP4= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=xilinx.com) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589217779667725.7855407843778; Mon, 11 May 2020 10:22:59 -0700 (PDT) Received: from localhost ([::1]:51482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYC8o-00007r-Cs for importer@patchew.org; Mon, 11 May 2020 13:22:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYC6z-00058d-7v for qemu-devel@nongnu.org; Mon, 11 May 2020 13:21:05 -0400 Received: from mail-eopbgr760058.outbound.protection.outlook.com ([40.107.76.58]:8291 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYC6w-0003uZ-0l for qemu-devel@nongnu.org; Mon, 11 May 2020 13:21:04 -0400 Received: from CY4PR16CA0008.namprd16.prod.outlook.com (2603:10b6:903:102::18) by MWHPR02MB2221.namprd02.prod.outlook.com (2603:10b6:300:5a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.29; Mon, 11 May 2020 17:05:56 +0000 Received: from CY1NAM02FT046.eop-nam02.prod.protection.outlook.com (2603:10b6:903:102:cafe::57) by CY4PR16CA0008.outlook.office365.com (2603:10b6:903:102::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.29 via Frontend Transport; Mon, 11 May 2020 17:05:56 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT046.mail.protection.outlook.com (10.152.74.232) with Microsoft SMTP Server id 15.20.2979.29 via Frontend Transport; Mon, 11 May 2020 17:05:56 +0000 Received: from [149.199.38.66] (port=35066 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1jYBs4-0007n8-PJ for qemu-devel@nongnu.org; Mon, 11 May 2020 10:05:40 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1jYBsJ-0004Py-TP for qemu-devel@nongnu.org; Mon, 11 May 2020 10:05:55 -0700 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 04BH5qi3028919; Mon, 11 May 2020 10:05:52 -0700 Received: from [172.19.2.32] (helo=xsjkomlodi50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1jYBsF-0004PW-Tz; Mon, 11 May 2020 10:05:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h1XMymMWEDUw54CF/6WVqeKPE389EFBdS6KsHwQeR512tEmliVohxN00OJ8NbgFQ+tkNkG0eLkKkLPPLzukGsXN1W6w98PsDuUvUFaT+63ixlPWB/uYWq158X+YILZGGUzbhsBFEGgqivS3T9hBwb4UB6qhnMTKNVdhAkN+OTryzmO0Ud1GSYGyOj7rluXTSXINy/zAMR2Ejh9PouMDtwVvxkJn2zXTMyjWCR2uM5gX9yoZzREriKZaewCpqHox3XyS5E+TSzws/ZdnjWJE56UDnJeylRzpBNol8RNrdfQo0vwQAr5l0RFYDQvqKpstU06F0RJmMaMms3LtS0bGVsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=95yqqbip7xXPz09ylUg1tmOBtjWhHrQ0bniJROEWzEE=; b=EDK3RQJER7RY0Cw/u+iDYHkPg6Ek2VdstqGp8f58lXCZXOP6qk3lel5uIEkhM1jhQatyIilG+0lpGSwKnmZ8pT2/6P0swguoIO4qVyo8riF8i3R56APJZTcMqMGKOAx8xycOePkD6tpcCkI1+aMVP+vT4z5XCt/g8YB0JCHFrsigVyYE7AzgPeWYk4awSrCMfQwJSdiBtnJmK40gb8d3z5nDLcmA/+6McmZElB64yqjERot6+nNg932kh3N3dgdUUgUon8enjKoo7S0mZmftdbDxnWy7DGf84MDw3w7a1LQcxFUw3VZ+jiKD/d4CkPBv3B5uNW4/KA519Hc1uEq+KQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=nongnu.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=95yqqbip7xXPz09ylUg1tmOBtjWhHrQ0bniJROEWzEE=; b=VKvV+FnIhqDkVnOSxmlgIbpMz4lp0MACOIdSFS7wRmRh3bYss9oplToZdgxT6t9yua2J2TvMCcegzMz3H+C1gLTIW9evG7OD1DcDc8B/UNQos24s34Pq4/C92hlbuCURBTXWbHIHmWQyOFtKkoIIDqFKAwLyt5sNXI3ujN4X0MM= Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; From: Joe Komlodi To: qemu-devel@nongnu.org Subject: [PATCH v1 4/4] target/microblaze: monitor: Increase the number of registers reported Date: Mon, 11 May 2020 10:05:51 -0700 Message-Id: <1589216751-106038-5-git-send-email-komlodi@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1589216751-106038-1-git-send-email-komlodi@xilinx.com> References: <1589216751-106038-1-git-send-email-komlodi@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFTY:; SFS:(136003)(346002)(39860400002)(396003)(376002)(46966005)(33430700001)(33440700001)(2906002)(82740400003)(8936002)(81166007)(82310400002)(426003)(5660300002)(478600001)(107886003)(6916009)(7696005)(8676002)(316002)(47076004)(336012)(9786002)(356005)(186003)(36756003)(2616005)(44832011)(86362001)(26005)(4326008)(70586007)(70206006); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 433c2f05-0a6c-4cd6-8ead-08d7f5cd91ef X-MS-TrafficTypeDiagnostic: MWHPR02MB2221: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:287; X-Forefront-PRVS: 04004D94E2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4ao8x8JeP0WxWl4vZIo7bB2OzVhOtMhanIzpLRT3007V2e85ZsATv7+U3MkAhtm0d9phy1XqL8VFxaCJWjW2PI+6DIlbq73ivyT7GYBkiOJ1XbW+D5pgnkUU5gwlRKE7d1BV3CtKHJJzcfLsqhBinYAkalN6D09B7GGBmtmDHA3+8p+aZ2IT+KjnlN3DjSYUhJiGdNttcXJiDuHv+uM/5ofAANdqbK5usl+XGT3BweoYMUhsIHJGdPlZDge7S581ASsuc9TasFVIpEBIbidY0Xlta/CKQqkyfWx9uyXVzQMrjFWhR991vwBOh+tUZsdluTLKSc2rKqXo8B/6S4ko2ju3GWyhoqxxUGKJEnBH9B2o2kpHJaIQxbrwNHMjTx+4tCy0CM1Ycauc0LNKhDVhNfPkPKHtNJSvETntBpLph9HLG4eHzOfodNaOvltk831OtH9qW2kXTkSrHuigOG1Ln7fHtHOgUYrghswcXOQRM4Fjdu/MvB/ip8NdEr8VRxmSAtHcIAb2ZUErz69+lmdriKOl8zwFWK3IEslMIISZB877+H9dXK54297i0iLAUaZLi/esJYFn3iJcdC2Bwqn1VQ== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 17:05:56.1691 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 433c2f05-0a6c-4cd6-8ead-08d7f5cd91ef X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR02MB2221 Received-SPF: pass client-ip=40.107.76.58; envelope-from=komlodi@xilinx.com; helo=NAM02-CY1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 13:20:59 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: edgar.iglesias@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @xilinx.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Increase the number of registers reported to match GDB. Registers that aren't modeled are reported as 0. Signed-off-by: Joe Komlodi Reviewed-by: Edgar E. Iglesias --- target/microblaze/translate.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 20b7427..4e7f903a 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1788,9 +1788,11 @@ void mb_cpu_dump_state(CPUState *cs, FILE *f, int fl= ags) qemu_fprintf(f, "IN: PC=3D%" PRIx64 " %s\n", env->sregs[SR_PC], lookup_symbol(env->sregs[SR_PC])); qemu_fprintf(f, "rmsr=3D%" PRIx64 " resr=3D%" PRIx64 " rear=3D%" PRIx6= 4 " " - "debug=3D%x imm=3D%x iflags=3D%x fsr=3D%" PRIx64 "\n", + "debug=3D%x imm=3D%x iflags=3D%x fsr=3D%" PRIx64 " " + "rbtr=3D%" PRIx64 "\n", env->sregs[SR_MSR], env->sregs[SR_ESR], env->sregs[SR_EAR= ], - env->debug, env->imm, env->iflags, env->sregs[SR_FSR]); + env->debug, env->imm, env->iflags, env->sregs[SR_FSR], + env->sregs[SR_BTR]); qemu_fprintf(f, "btaken=3D%d btarget=3D%" PRIx64 " mode=3D%s(saved=3D%= s) " "eip=3D%d ie=3D%d\n", env->btaken, env->btarget, @@ -1798,7 +1800,17 @@ void mb_cpu_dump_state(CPUState *cs, FILE *f, int fl= ags) (env->sregs[SR_MSR] & MSR_UMS) ? "user" : "kernel", (bool)(env->sregs[SR_MSR] & MSR_EIP), (bool)(env->sregs[SR_MSR] & MSR_IE)); + for (i =3D 0; i < 12; i++) { + qemu_fprintf(f, "rpvr%2.2d=3D%8.8x ", i, env->pvr.regs[i]); + if ((i + 1) % 4 =3D=3D 0) { + qemu_fprintf(f, "\n"); + } + } =20 + /* Registers that aren't modeled are reported as 0 */ + qemu_fprintf(f, "redr=3D%" PRIx64 " rpid=3D0 rzpr=3D0 rtlbx=3D0 rtlbsx= =3D0 " + "rtlblo=3D0 rtlbhi=3D0\n", env->sregs[SR_EDR]); + qemu_fprintf(f, "slr=3D%x shr=3D%x\n", env->slr, env->shr); for (i =3D 0; i < 32; i++) { qemu_fprintf(f, "r%2.2d=3D%8.8x ", i, env->regs[i]); if ((i + 1) % 4 =3D=3D 0) --=20 2.7.4