From 5aa82d050d61784823767fe3c982b6862fa47391 Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Thu, 4 Sep 2014 15:26:43 +0000 Subject: Replace 'core_regset_sections' by iterator method The core_regset_sections list in gdbarch (needed for multi-arch capable core file generation support) is replaced by an iterator method. Overall, this reduces the code a bit, and it allows for more flexibility. gdb/ChangeLog: * amd64-linux-tdep.c (amd64_linux_regset_sections): Remove. (amd64_linux_iterate_over_regset_sections): New. (amd64_linux_init_abi_common): Don't install the regset section list, but the new iterator in gdbarch. * arm-linux-tdep.c (arm_linux_fpa_regset_sections) (arm_linux_vfp_regset_sections): Remove. Move combined logic... (arm_linux_iterate_over_regset_sections): ...here. New function. (arm_linux_init_abi): Set iterator instead of section list. * corelow.c (get_core_registers_cb): New function, logic moved from... (get_core_registers): ...loop body here. Use new iterator method instead of walking through the regset section list. * gdbarch.sh: Remove 'core_regset_sections'. New method 'iterate_over_regset_sections'. New typedef 'iterate_over_regset_sections_cb'. * gdbarch.c: Regenerate. * gdbarch.h: Likewise. * i386-linux-tdep.c (i386_linux_regset_sections) (i386_linux_sse_regset_sections, i386_linux_avx_regset_sections): Remove. (i386_linux_iterate_over_regset_sections): New. (i386_linux_init_abi): Don't choose a regset section list, but install new iterator in gdbarch. * linux-tdep.c (struct linux_collect_regset_section_cb_data): New. (linux_collect_regset_section_cb): New function, logic moved from... (linux_collect_thread_registers): ...loop body here. Use iterator method instead of walking through list. (linux_make_corefile_notes_1): Check for presence of iterator method instead of regset section list. * ppc-linux-tdep.c (ppc_linux_vsx_regset_sections) (ppc_linux_vmx_regset_sections, ppc_linux_fp_regset_sections) (ppc64_linux_vsx_regset_sections, ppc64_linux_vmx_regset_sections) (ppc64_linux_fp_regset_sections): Remove. Move combined logic... (ppc_linux_iterate_over_regset_sections): ...here. New function. (ppc_linux_init_abi): Don't choose from above regset section lists, but install new iterator in gdbarch. * regset.h (struct core_regset_section): Remove. * s390-linux-tdep.c (struct gdbarch_tdep): Add new fields have_linux_v1, have_linux_v2, and have_tdb. (s390_linux32_regset_sections, s390_linux32v1_regset_sections) (s390_linux32v2_regset_sections, s390_linux64_regset_sections) (s390_linux64v1_regset_sections, s390_linux64v2_regset_sections) (s390x_linux64_regset_sections, s390x_linux64v1_regset_sections) (s390x_linux64v2_regset_sections): Remove. Move combined logic... (s390_iterate_over_regset_sections): ...here. New function. Use new tdep fields. (s390_gdbarch_init): Set new tdep fields. Don't choose from above regset section lists, but install new iterator. --- gdb/i386-linux-tdep.c | 54 ++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 31 deletions(-) (limited to 'gdb/i386-linux-tdep.c') diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index b3707f7..4ee6874 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -52,28 +52,6 @@ #include "features/i386/i386-avx-linux.c" #include "features/i386/i386-avx512-linux.c" -/* Supported register note sections. */ -static struct core_regset_section i386_linux_regset_sections[] = -{ - { ".reg", 68, "general-purpose" }, - { ".reg2", 108, "floating-point" }, - { NULL, 0 } -}; - -static struct core_regset_section i386_linux_sse_regset_sections[] = -{ - { ".reg", 68, "general-purpose" }, - { ".reg-xfp", 512, "extended floating-point" }, - { NULL, 0 } -}; - -static struct core_regset_section i386_linux_avx_regset_sections[] = -{ - { ".reg", 68, "general-purpose" }, - { ".reg-xstate", X86_XSTATE_MAX_SIZE, "XSAVE extended state" }, - { NULL, 0 } -}; - /* Return non-zero, when the register is in the corresponding register group. Put the LINUX_ORIG_EAX register in the system group. */ static int @@ -670,6 +648,26 @@ i386_linux_core_read_description (struct gdbarch *gdbarch, return tdesc_i386_mmx_linux; } +/* Iterate over core file register note sections. */ + +static void +i386_linux_iterate_over_regset_sections (struct gdbarch *gdbarch, + iterate_over_regset_sections_cb *cb, + void *cb_data, + const struct regcache *regcache) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + cb (".reg", 68, "general-purpose", cb_data); + + if (tdep->xcr0 & X86_XSTATE_AVX) + cb (".reg-xstate", X86_XSTATE_MAX_SIZE, "XSAVE extended state", cb_data); + else if (tdep->xcr0 & X86_XSTATE_SSE) + cb (".reg-xfp", 512, "extended floating-point", cb_data); + else + cb (".reg2", 108, "floating-point", cb_data); +} + /* Linux kernel shows PC value after the 'int $0x80' instruction even if inferior is still inside the syscall. On next PTRACE_SINGLESTEP it will finish the syscall but PC will not change. @@ -948,15 +946,9 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_fetch_tls_load_module_address (gdbarch, svr4_fetch_objfile_link_map); - /* Install supported register note sections. */ - if (tdesc_find_feature (tdesc, "org.gnu.gdb.i386.avx512") - || tdesc_find_feature (tdesc, "org.gnu.gdb.i386.avx")) - set_gdbarch_core_regset_sections (gdbarch, i386_linux_avx_regset_sections); - else if (tdesc_find_feature (tdesc, "org.gnu.gdb.i386.sse")) - set_gdbarch_core_regset_sections (gdbarch, i386_linux_sse_regset_sections); - else - set_gdbarch_core_regset_sections (gdbarch, i386_linux_regset_sections); - + /* Core file support. */ + set_gdbarch_iterate_over_regset_sections + (gdbarch, i386_linux_iterate_over_regset_sections); set_gdbarch_core_read_description (gdbarch, i386_linux_core_read_description); -- cgit v1.1