diff options
-rw-r--r-- | gdb-xml/aarch64-pauth.xml | 2 | ||||
-rw-r--r-- | target/arm/gdbstub.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gdb-xml/aarch64-pauth.xml b/gdb-xml/aarch64-pauth.xml index 24af5f9..0a5c566 100644 --- a/gdb-xml/aarch64-pauth.xml +++ b/gdb-xml/aarch64-pauth.xml @@ -6,7 +6,7 @@ notice and this notice are preserved. --> <!DOCTYPE feature SYSTEM "gdb-target.dtd"> -<feature name="org.gnu.gdb.aarch64.pauth"> +<feature name="org.gnu.gdb.aarch64.pauth_v2"> <reg name="pauth_dmask" bitsize="64"/> <reg name="pauth_cmask" bitsize="64"/> <reg name="pauth_dmask_high" bitsize="64"/> diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index 13fbe9b..03b17c8 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -521,11 +521,11 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) aarch64_gdb_set_fpu_reg, 34, "aarch64-fpu.xml", 0); } -#if 0 /* - * GDB versions 9 through 12 have a bug which means they will - * crash if they see this XML from QEMU; disable it for the 8.0 - * release, pending a better solution. + * Note that we report pauth information via the feature name + * org.gnu.gdb.aarch64.pauth_v2, not org.gnu.gdb.aarch64.pauth. + * GDB versions 9 through 12 have a bug where they will crash + * if they see the latter XML from QEMU. */ if (isar_feature_aa64_pauth(&cpu->isar)) { gdb_register_coprocessor(cs, aarch64_gdb_get_pauth_reg, @@ -533,7 +533,6 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) 4, "aarch64-pauth.xml", 0); } #endif -#endif } else { if (arm_feature(env, ARM_FEATURE_NEON)) { gdb_register_coprocessor(cs, vfp_gdb_get_reg, vfp_gdb_set_reg, |