@samitouri / QOSamiQemu / commits / aa75a7c09b

target/or1k: Use XML register definitions from GDB

Import gdb-xml/or1k-fpu.xml from mainstream binutils, tag 'binutils-2_46' [*]. Register as CPUClass::gdb_core_xml_file. [*] https://sourceware.org/git/?p=binutils-gdb.git;a=blob_plain;f=gdb/features/or1k-core.xml;h=0d13f355f5296ae426794eb3003dcc18fbbd49d5;hb=refs/tags/binutils-2_46 Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20260219191955.83815-23-philmd@linaro.org>

Philippe Mathieu-Daudé committed Feb 17, 2026 at 08:19 UTC aa75a7c09b5a4f9e3478c65261ec80ab48720925
5 files changed +69 -1
MAINTAINERS
+1
@@ -304,6 +304,7 @@ M: Stafford Horne <shorne@gmail.com>
304 S: Odd Fixes
305 F: docs/system/or1k/cpu-features.rst
306 F: target/or1k/
307 +F: gdb-xml/or1k-core.xml
308 F: hw/or1k/
309 F: include/hw/or1k/
310 F: tests/functional/or1k/meson.build
configs/targets/or1k-linux-user.mak
+1
@@ -2,5 +2,6 @@ TARGET_ARCH=or1k
2 TARGET_BIG_ENDIAN=y
3 TARGET_SYSTBL_ABI=common,32,or1k,time32,stat64,rlimit,renameat
4 TARGET_SYSTBL=syscall.tbl
5 +TARGET_XML_FILES= gdb-xml/or1k-core.xml
6 TARGET_LONG_BITS=32
7 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=y
configs/targets/or1k-softmmu.mak
+1
@@ -2,6 +2,7 @@ TARGET_ARCH=or1k
2 TARGET_BIG_ENDIAN=y
3 # needed by boot.c and all boards
4 TARGET_NEED_FDT=y
5 +TARGET_XML_FILES= gdb-xml/or1k-core.xml
6 TARGET_LONG_BITS=32
7 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=y
8 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=y
gdb-xml/or1k-core.xml new
+65
@@ -0,0 +1,65 @@
1 +<?xml version="1.0"?>
2 +<!-- Copyright (C) 2017-2026 Free Software Foundation, Inc.
3 +
4 + Copying and distribution of this file, with or without modification,
5 + are permitted in any medium without royalty provided the copyright
6 + notice and this notice are preserved. -->
7 +
8 +<!DOCTYPE feature SYSTEM "gdb-target.dtd">
9 +<feature name="org.gnu.gdb.or1k.group0">
10 + <reg name="r0" bitsize="32" type="int"/>
11 + <reg name="r1" bitsize="32" type="data_ptr"/>
12 + <reg name="r2" bitsize="32" type="data_ptr"/>
13 + <reg name="r3" bitsize="32" type="int"/>
14 + <reg name="r4" bitsize="32" type="int"/>
15 + <reg name="r5" bitsize="32" type="int"/>
16 + <reg name="r6" bitsize="32" type="int"/>
17 + <reg name="r7" bitsize="32" type="int"/>
18 + <reg name="r8" bitsize="32" type="int"/>
19 + <reg name="r9" bitsize="32" type="code_ptr"/>
20 + <reg name="r10" bitsize="32" type="int"/>
21 + <reg name="r11" bitsize="32" type="int"/>
22 + <reg name="r12" bitsize="32" type="int"/>
23 + <reg name="r13" bitsize="32" type="int"/>
24 + <reg name="r14" bitsize="32" type="int"/>
25 + <reg name="r15" bitsize="32" type="int"/>
26 + <reg name="r16" bitsize="32" type="int"/>
27 + <reg name="r17" bitsize="32" type="int"/>
28 + <reg name="r18" bitsize="32" type="int"/>
29 + <reg name="r19" bitsize="32" type="int"/>
30 + <reg name="r20" bitsize="32" type="int"/>
31 + <reg name="r21" bitsize="32" type="int"/>
32 + <reg name="r22" bitsize="32" type="int"/>
33 + <reg name="r23" bitsize="32" type="int"/>
34 + <reg name="r24" bitsize="32" type="int"/>
35 + <reg name="r25" bitsize="32" type="int"/>
36 + <reg name="r26" bitsize="32" type="int"/>
37 + <reg name="r27" bitsize="32" type="int"/>
38 + <reg name="r28" bitsize="32" type="int"/>
39 + <reg name="r29" bitsize="32" type="int"/>
40 + <reg name="r30" bitsize="32" type="int"/>
41 + <reg name="r31" bitsize="32" type="int"/>
42 + <reg name="ppc" bitsize="32" type="code_ptr"/>
43 + <reg name="npc" bitsize="32" type="code_ptr"/>
44 + <flags id="sr_flags" size="4">
45 + <field name="SM" start="0" end="0"/>
46 + <field name="TEE" start="1" end="1"/>
47 + <field name="IEE" start="2" end="2"/>
48 + <field name="DCE" start="3" end="3"/>
49 + <field name="ICE" start="4" end="4"/>
50 + <field name="DME" start="5" end="5"/>
51 + <field name="IME" start="6" end="6"/>
52 + <field name="LEE" start="7" end="7"/>
53 + <field name="CE" start="8" end="8"/>
54 + <field name="F" start="9" end="9"/>
55 + <field name="CY" start="10" end="10"/>
56 + <field name="OV" start="11" end="11"/>
57 + <field name="OVE" start="12" end="12"/>
58 + <field name="DSX" start="13" end="13"/>
59 + <field name="EPH" start="14" end="14"/>
60 + <field name="FO" start="15" end="15"/>
61 + <field name="SUMRA" start="16" end="16"/>
62 + <field name="CID" start="28" end="31"/>
63 + </flags>
64 + <reg name="sr" bitsize="32" type="sr_flags"/>
65 +</feature>
target/or1k/cpu.c
+1 -1
@@ -288,13 +288,13 @@ static void openrisc_cpu_class_init(ObjectClass *oc, const void *data)
288 cc->dump_state = openrisc_cpu_dump_state;
289 cc->set_pc = openrisc_cpu_set_pc;
290 cc->get_pc = openrisc_cpu_get_pc;
291 + cc->gdb_core_xml_file = "or1k-core.xml";
292 cc->gdb_read_register = openrisc_cpu_gdb_read_register;
293 cc->gdb_write_register = openrisc_cpu_gdb_write_register;
294 #ifndef CONFIG_USER_ONLY
295 dc->vmsd = &vmstate_openrisc_cpu;
296 cc->sysemu_ops = &openrisc_sysemu_ops;
297 #endif
297 - cc->gdb_num_core_regs = 32 + 3;
298 cc->disas_set_info = openrisc_disas_set_info;
299 cc->tcg_ops = &openrisc_tcg_ops;
300 }