diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2010-04-21 20:22:14 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2010-04-21 20:22:14 +0000 |
| commit | 2e9157d5ff407b896faf67e01efcd7f943c5032a (patch) | |
| tree | a081432014fe0b6f929f0b04265b71fef328b063 | |
| parent | 369d8b6a68317b868746581b3f03340a18bd49d8 (diff) | |
| download | gdb-2e9157d5ff407b896faf67e01efcd7f943c5032a.tar.gz | |
Properly read i386 coredump.
2010-04-21 H.J. Lu <hongjiu.lu@intel.com>
PR corefiles/11523
* amd64-linux-tdep.c (amd64_linux_core_read_description): Check
XCR0 first.
* i386-linux-tdep.c (i386_linux_core_read_xcr0): Return 0 if
there is no .reg-xstate section.
(i386_linux_core_read_description): Check XCR0 first.
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/amd64-linux-tdep.c | 19 | ||||
| -rw-r--r-- | gdb/i386-linux-tdep.c | 32 |
3 files changed, 35 insertions, 26 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2ba55a26942..07b0efc8a72 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2010-04-21 H.J. Lu <hongjiu.lu@intel.com> + + PR corefiles/11523 + * amd64-linux-tdep.c (amd64_linux_core_read_description): Check + XCR0 first. + + * i386-linux-tdep.c (i386_linux_core_read_xcr0): Return 0 if + there is no .reg-xstate section. + (i386_linux_core_read_description): Check XCR0 first. + 2010-04-21 Mike Frysinger <vapier@gentoo.org> * gdb/sparc-tdep.c (sparc32_store_return_value): Add gdb_assert () diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index f249d5dcd17..7376ba7b715 100644 --- a/gdb/amd64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -1269,18 +1269,15 @@ amd64_linux_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) { - asection *section = bfd_get_section_by_name (abfd, ".reg2"); - uint64_t xcr0; - - if (section == NULL) - return NULL; - /* Linux/x86-64. */ - xcr0 = i386_linux_core_read_xcr0 (gdbarch, target, abfd); - if ((xcr0 & I386_XSTATE_AVX_MASK) == I386_XSTATE_AVX_MASK) - return tdesc_amd64_avx_linux; - else - return tdesc_amd64_linux; + uint64_t xcr0 = i386_linux_core_read_xcr0 (gdbarch, target, abfd); + switch ((xcr0 & I386_XSTATE_AVX_MASK)) + { + case I386_XSTATE_AVX_MASK: + return tdesc_amd64_avx_linux; + default: + return tdesc_amd64_linux; + } } static void diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index 4e3408c2670..272cc998907 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -611,7 +611,7 @@ i386_linux_core_read_xcr0 (struct gdbarch *gdbarch, } } else - xcr0 = I386_XSTATE_SSE_MASK; + xcr0 = 0; return xcr0; } @@ -623,22 +623,24 @@ i386_linux_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) { - asection *section = bfd_get_section_by_name (abfd, ".reg2"); - uint64_t xcr0; - - if (section == NULL) - return NULL; - - section = bfd_get_section_by_name (abfd, ".reg-xfp"); - if (section == NULL) - return tdesc_i386_mmx_linux; - /* Linux/i386. */ - xcr0 = i386_linux_core_read_xcr0 (gdbarch, target, abfd); - if ((xcr0 & I386_XSTATE_AVX_MASK) == I386_XSTATE_AVX_MASK) - return tdesc_i386_avx_linux; - else + uint64_t xcr0 = i386_linux_core_read_xcr0 (gdbarch, target, abfd); + switch ((xcr0 & I386_XSTATE_AVX_MASK)) + { + case I386_XSTATE_AVX_MASK: + return tdesc_i386_avx_linux; + case I386_XSTATE_SSE_MASK: + return tdesc_i386_linux; + case I386_XSTATE_X87_MASK: + return tdesc_i386_mmx_linux; + default: + break; + } + + if (bfd_get_section_by_name (abfd, ".reg-xfp") != NULL) return tdesc_i386_linux; + else + return tdesc_i386_mmx_linux; } static void |