This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [committed] Fix gcore crashes on s390
From: Daniel Jacobowitz <drow@false.org>
Date: Fri, 5 May 2006 21:56:42 -0400
> I guess we're going to have to check the collect_regset function
> pointer for NULL then. David, would you mind making that change?
I'll note in passing that we're back to the original patch
I wrote :-)
Ok to commit?
2006-05-05 David S. Miller <davem@sunset.davemloft.net>
* linux-nat.c (linux_nad_do_thread_registers): Check for
NULL collect_regset method.
Index: linux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/linux-nat.c,v
retrieving revision 1.46
diff -u -p -r1.46 linux-nat.c
--- linux-nat.c 5 May 2006 23:48:28 -0000 1.46
+++ linux-nat.c 6 May 2006 06:27:37 -0000
@@ -2549,70 +2549,52 @@ linux_nat_do_thread_registers (bfd *obfd
unsigned long lwp = ptid_get_lwp (ptid);
struct gdbarch *gdbarch = current_gdbarch;
const struct regset *regset;
- int core_regset_p, record_reg_p;
+ int core_regset_p;
core_regset_p = gdbarch_regset_from_core_section_p (gdbarch);
- record_reg_p = 1;
- if (core_regset_p)
- {
- regset = gdbarch_regset_from_core_section (gdbarch, ".reg",
- sizeof (gregs));
- if (regset)
- regset->collect_regset (regset, current_regcache, -1,
- &gregs, sizeof (gregs));
- else
- record_reg_p = 0;
- }
+ if (core_regset_p
+ && (regset = gdbarch_regset_from_core_section (gdbarch, ".reg",
+ sizeof (gregs))) != NULL
+ && regset->collect_regset != NULL)
+ regset->collect_regset (regset, current_regcache, -1,
+ &gregs, sizeof (gregs));
else
fill_gregset (&gregs, -1);
- if (record_reg_p)
- note_data = (char *) elfcore_write_prstatus (obfd,
- note_data,
- note_size,
- lwp,
- stop_signal, &gregs);
-
- record_reg_p = 1;
- if (core_regset_p)
- {
- regset = gdbarch_regset_from_core_section (gdbarch, ".reg2",
- sizeof (fpregs));
- if (regset)
- regset->collect_regset (regset, current_regcache, -1,
- &fpregs, sizeof (fpregs));
- else
- record_reg_p = 0;
- }
+ note_data = (char *) elfcore_write_prstatus (obfd,
+ note_data,
+ note_size,
+ lwp,
+ stop_signal, &gregs);
+
+ if (core_regset_p
+ && (regset = gdbarch_regset_from_core_section (gdbarch, ".reg2",
+ sizeof (fpregs))) != NULL
+ && regset->collect_regset != NULL)
+ regset->collect_regset (regset, current_regcache, -1,
+ &fpregs, sizeof (fpregs));
else
fill_fpregset (&fpregs, -1);
- if (record_reg_p)
- note_data = (char *) elfcore_write_prfpreg (obfd,
- note_data,
- note_size,
- &fpregs, sizeof (fpregs));
+ note_data = (char *) elfcore_write_prfpreg (obfd,
+ note_data,
+ note_size,
+ &fpregs, sizeof (fpregs));
#ifdef FILL_FPXREGSET
- record_reg_p = 1;
- if (core_regset_p)
- {
- regset = gdbarch_regset_from_core_section (gdbarch, ".reg-xfp",
- sizeof (fpxregs));
- if (regset)
- regset->collect_regset (regset, current_regcache, -1,
- &fpxregs, sizeof (fpxregs));
- else
- record_reg_p = 0;
- }
+ if (core_regset_p
+ && (regset = gdbarch_regset_from_core_section (gdbarch, ".reg-xfp",
+ sizeof (fpxregs))) != NULL
+ && regset->collect_regset != NULL)
+ regset->collect_regset (regset, current_regcache, -1,
+ &fpxregs, sizeof (fpxregs));
else
fill_fpxregset (&fpxregs, -1);
- if (record_reg_p)
- note_data = (char *) elfcore_write_prxfpreg (obfd,
- note_data,
- note_size,
- &fpxregs, sizeof (fpxregs));
+ note_data = (char *) elfcore_write_prxfpreg (obfd,
+ note_data,
+ note_size,
+ &fpxregs, sizeof (fpxregs));
#endif
return note_data;
}