diff options
| -rw-r--r-- | gdb/ChangeLog | 13 | ||||
| -rw-r--r-- | gdb/gdbarch.c | 4 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 15 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 9 | ||||
| -rw-r--r-- | gdb/i386-cygwin-tdep.c | 4 | ||||
| -rw-r--r-- | gdb/rs6000-aix-tdep.c | 6 | ||||
| -rw-r--r-- | gdb/rs6000-aix-tdep.h | 12 |
7 files changed, 41 insertions, 22 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index de3c3a60fd1..146ac98faeb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,18 @@ 2014-02-07 Yao Qi <yao@codesourcery.com> + * gdbarch.sh (core_xfer_shared_libraries): Returns ULONGEST. Add + comments. + (core_xfer_shared_libraries_aix): Likewise. + * gdbarch.c, gdbarch.h: Regenerated. + * i386-cygwin-tdep.c (windows_core_xfer_shared_libraries): Return + ULONGEST. Change 'len_avail' type to ULONGEST. + * rs6000-aix-tdep.c (rs6000_aix_ld_info_to_xml): Likewise. + * rs6000-aix-tdep.h (rs6000_aix_ld_info_to_xml): Update + declaration. + (rs6000_aix_core_xfer_shared_libraries_aix): Return ULONGEST. + +2014-02-07 Yao Qi <yao@codesourcery.com> + * corefile.c (memory_error): Get 'exception' from ERR and pass 'exception' to throw_error. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index e26681c16bd..89223583ac4 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -3532,7 +3532,7 @@ gdbarch_core_xfer_shared_libraries_p (struct gdbarch *gdbarch) return gdbarch->core_xfer_shared_libraries != NULL; } -LONGEST +ULONGEST gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len) { gdb_assert (gdbarch != NULL); @@ -3556,7 +3556,7 @@ gdbarch_core_xfer_shared_libraries_aix_p (struct gdbarch *gdbarch) return gdbarch->core_xfer_shared_libraries_aix != NULL; } -LONGEST +ULONGEST gdbarch_core_xfer_shared_libraries_aix (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len) { gdb_assert (gdbarch != NULL); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 9698e111873..bb355d74cd1 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -779,21 +779,24 @@ extern int gdbarch_find_memory_regions (struct gdbarch *gdbarch, find_memory_reg extern void set_gdbarch_find_memory_regions (struct gdbarch *gdbarch, gdbarch_find_memory_regions_ftype *find_memory_regions); /* Read offset OFFSET of TARGET_OBJECT_LIBRARIES formatted shared libraries list from - core file into buffer READBUF with length LEN. */ + core file into buffer READBUF with length LEN. Return the number of bytes read + (zero indicates failure). + failed, otherwise, return the red length of READBUF. */ extern int gdbarch_core_xfer_shared_libraries_p (struct gdbarch *gdbarch); -typedef LONGEST (gdbarch_core_xfer_shared_libraries_ftype) (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len); -extern LONGEST gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len); +typedef ULONGEST (gdbarch_core_xfer_shared_libraries_ftype) (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len); +extern ULONGEST gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len); extern void set_gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdbarch_core_xfer_shared_libraries_ftype *core_xfer_shared_libraries); /* Read offset OFFSET of TARGET_OBJECT_LIBRARIES_AIX formatted shared - libraries list from core file into buffer READBUF with length LEN. */ + libraries list from core file into buffer READBUF with length LEN. + Return the number of bytes read (zero indicates failure). */ extern int gdbarch_core_xfer_shared_libraries_aix_p (struct gdbarch *gdbarch); -typedef LONGEST (gdbarch_core_xfer_shared_libraries_aix_ftype) (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len); -extern LONGEST gdbarch_core_xfer_shared_libraries_aix (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len); +typedef ULONGEST (gdbarch_core_xfer_shared_libraries_aix_ftype) (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len); +extern ULONGEST gdbarch_core_xfer_shared_libraries_aix (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len); extern void set_gdbarch_core_xfer_shared_libraries_aix (struct gdbarch *gdbarch, gdbarch_core_xfer_shared_libraries_aix_ftype *core_xfer_shared_libraries_aix); /* How the core target converts a PTID from a core file to a string. */ diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index e785999d3e0..fe7119f1109 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -672,12 +672,15 @@ F:char *:elfcore_write_linux_prpsinfo:bfd *obfd, char *note_data, int *note_size M:int:find_memory_regions:find_memory_region_ftype func, void *data:func, data # Read offset OFFSET of TARGET_OBJECT_LIBRARIES formatted shared libraries list from -# core file into buffer READBUF with length LEN. -M:LONGEST:core_xfer_shared_libraries:gdb_byte *readbuf, ULONGEST offset, ULONGEST len:readbuf, offset, len +# core file into buffer READBUF with length LEN. Return the number of bytes read +# (zero indicates failure). +# failed, otherwise, return the red length of READBUF. +M:ULONGEST:core_xfer_shared_libraries:gdb_byte *readbuf, ULONGEST offset, ULONGEST len:readbuf, offset, len # Read offset OFFSET of TARGET_OBJECT_LIBRARIES_AIX formatted shared # libraries list from core file into buffer READBUF with length LEN. -M:LONGEST:core_xfer_shared_libraries_aix:gdb_byte *readbuf, ULONGEST offset, ULONGEST len:readbuf, offset, len +# Return the number of bytes read (zero indicates failure). +M:ULONGEST:core_xfer_shared_libraries_aix:gdb_byte *readbuf, ULONGEST offset, ULONGEST len:readbuf, offset, len # How the core target converts a PTID from a core file to a string. M:char *:core_pid_to_str:ptid_t ptid:ptid diff --git a/gdb/i386-cygwin-tdep.c b/gdb/i386-cygwin-tdep.c index 4b8a00dee1c..7b7785a07e6 100644 --- a/gdb/i386-cygwin-tdep.c +++ b/gdb/i386-cygwin-tdep.c @@ -168,14 +168,14 @@ out: return; } -static LONGEST +static ULONGEST windows_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, ULONGEST len) { struct obstack obstack; const char *buf; - LONGEST len_avail; + ULONGEST len_avail; struct cpms_data data = { gdbarch, &obstack, 0 }; obstack_init (&obstack); diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c index aeea3ed2eef..3ab88830e87 100644 --- a/gdb/rs6000-aix-tdep.c +++ b/gdb/rs6000-aix-tdep.c @@ -965,14 +965,14 @@ rs6000_aix_shared_library_to_xml (struct ld_info *ldi, as the consumer of the XML library list might live in a different process. */ -LONGEST +ULONGEST rs6000_aix_ld_info_to_xml (struct gdbarch *gdbarch, const gdb_byte *ldi_buf, gdb_byte *readbuf, ULONGEST offset, ULONGEST len, int close_ldinfo_fd) { struct obstack obstack; const char *buf; - LONGEST len_avail; + ULONGEST len_avail; obstack_init (&obstack); obstack_grow_str (&obstack, "<library-list-aix version=\"1.0\">\n"); @@ -1009,7 +1009,7 @@ rs6000_aix_ld_info_to_xml (struct gdbarch *gdbarch, const gdb_byte *ldi_buf, /* Implement the core_xfer_shared_libraries_aix gdbarch method. */ -static LONGEST +static ULONGEST rs6000_aix_core_xfer_shared_libraries_aix (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, diff --git a/gdb/rs6000-aix-tdep.h b/gdb/rs6000-aix-tdep.h index 76765f11d8c..90fc5edba58 100644 --- a/gdb/rs6000-aix-tdep.h +++ b/gdb/rs6000-aix-tdep.h @@ -18,11 +18,11 @@ #ifndef RS6000_AIX_TDEP_H #define RS6000_AIX_TDEP_H -extern LONGEST rs6000_aix_ld_info_to_xml (struct gdbarch *gdbarch, - const gdb_byte *ldi_buf, - gdb_byte *readbuf, - ULONGEST offset, - ULONGEST len, - int close_ldinfo_fd); +extern ULONGEST rs6000_aix_ld_info_to_xml (struct gdbarch *gdbarch, + const gdb_byte *ldi_buf, + gdb_byte *readbuf, + ULONGEST offset, + ULONGEST len, + int close_ldinfo_fd); #endif /* RS6000_AIX_TDEP_H */ |