From 5579919f7d343f9118d42f1c443daf74996983e3 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Tue, 9 Apr 1996 06:09:33 +0000 Subject: [PATCH] * Makefile.in (scm-exp.o, scm-lang.o, scm-valprint.o): Add targets and dependencies. * scm-lang.c (gdb_string.h): Include. * objfiles.c (add_to_objfile_sections): Cast second arg of obstack_grow call to correct type (char *). * cp-valprint.c (cp_print_static_field): Ditto. * somsolib.c (som_solib_create_inferior_hook): Add a declaration for external find_unwind_entry function (from hppa-tdep.c). * remote-pa.c (remote_write_bytes, remote_read_bytes): Change type of second arg to "char *" to be type compatible with dcache. (remote_wait): Cast second arg to strtol to correct type. * hppa-tdep.c (compare_unwind_entries): Change argument types to "const void *" to be type compatible with qsort, and then assign to local args prior to use. --- gdb/ChangeLog | 18 ++++++++++++++++++ gdb/Makefile.in | 9 +++++++++ gdb/cp-valprint.c | 2 +- gdb/hppa-tdep.c | 12 +++++++----- gdb/objfiles.c | 2 +- gdb/remote-pa.c | 16 +++++++--------- gdb/scm-lang.c | 1 + gdb/somsolib.c | 1 + 8 files changed, 45 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index beeee921f0..8ede6a5cef 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,21 @@ +Mon Apr 8 12:53:56 1996 Fred Fish + + * Makefile.in (scm-exp.o, scm-lang.o, scm-valprint.o): Add targets and + dependencies. + * scm-lang.c (gdb_string.h): Include. + * objfiles.c (add_to_objfile_sections): Cast second arg of obstack_grow + call to correct type (char *). + * cp-valprint.c (cp_print_static_field): Ditto. + * somsolib.c (som_solib_create_inferior_hook): Add a declaration + for external find_unwind_entry function (from hppa-tdep.c). + * remote-pa.c (remote_write_bytes, remote_read_bytes): Change + type of second arg to "char *" to be type compatible with + dcache. + (remote_wait): Cast second arg to strtol to correct type. + * hppa-tdep.c (compare_unwind_entries): Change argument types to + "const void *" to be type compatible with qsort, and then + assign to local args prior to use. + Mon Apr 8 15:35:52 1996 Jeffrey A Law (law@cygnus.com) * infptrace.c (kill_inferior): Remove call to "kill"; update diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 464573e842..0e5bb9011f 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1408,6 +1408,15 @@ rs6000-nat.o: rs6000-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h rs6000-tdep.o: rs6000-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \ target.h xcoffsolib.h +scm-exp.o: $(defs_h) $(value_h) parser-defs.h language.h c-lang.h \ + scm-lang.h scm-tags.h + +scm-lang.o: $(defs_h) $(value_h) parser-defs.h language.h c-lang.h \ + scm-lang.h scm-tags.h gdb_string.h + +scm-valprint.o: $(defs_h) $(value_h) parser-defs.h language.h \ + scm-lang.h valprint.h + ser-go32.o: ser-go32.c $(defs_h) serial.h ser-mac.o: ser-mac.c $(defs_h) serial.h signals.h diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 7046007ea2..48f490518c 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -499,7 +499,7 @@ cp_print_static_field (type, val, stream, format, recurse, pretty) } } - obstack_grow (&dont_print_statmem_obstack, &VALUE_ADDRESS (val), + obstack_grow (&dont_print_statmem_obstack, (char *) &VALUE_ADDRESS (val), sizeof (CORE_ADDR)); CHECK_TYPEDEF (type); diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 86e3a257f0..efc8081cf0 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -73,8 +73,7 @@ static int pc_in_interrupt_handler PARAMS ((CORE_ADDR)); static int pc_in_linker_stub PARAMS ((CORE_ADDR)); -static int compare_unwind_entries PARAMS ((const struct unwind_table_entry *, - const struct unwind_table_entry *)); +static int compare_unwind_entries PARAMS ((const void *, const void *)); static void read_unwind_info PARAMS ((struct objfile *)); @@ -284,10 +283,13 @@ extract_17 (word) larger than the first, and zero if they are equal. */ static int -compare_unwind_entries (a, b) - const struct unwind_table_entry *a; - const struct unwind_table_entry *b; +compare_unwind_entries (arg1, arg2) + const void *arg1; + const void *arg2; { + const struct unwind_table_entry *a = arg1; + const struct unwind_table_entry *b = arg2; + if (a->region_start > b->region_start) return 1; else if (a->region_start < b->region_start) diff --git a/gdb/objfiles.c b/gdb/objfiles.c index ed9f1cf3ae..97b05dce3f 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -84,7 +84,7 @@ add_to_objfile_sections (abfd, asect, objfile_p_char) section.the_bfd_section = asect; section.addr = bfd_section_vma (abfd, asect); section.endaddr = section.addr + bfd_section_size (abfd, asect); - obstack_grow (&objfile->psymbol_obstack, §ion, sizeof(section)); + obstack_grow (&objfile->psymbol_obstack, (char *) §ion, sizeof(section)); objfile->sections_end = (struct obj_section *) (((unsigned long) objfile->sections_end) + 1); } diff --git a/gdb/remote-pa.c b/gdb/remote-pa.c index 1ac5d9c3b6..1121e15eff 100644 --- a/gdb/remote-pa.c +++ b/gdb/remote-pa.c @@ -160,10 +160,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Prototypes for local functions */ static int -remote_write_bytes PARAMS ((CORE_ADDR memaddr, unsigned char *myaddr, int len)); +remote_write_bytes PARAMS ((CORE_ADDR memaddr, char *myaddr, int len)); static int -remote_read_bytes PARAMS ((CORE_ADDR memaddr, unsigned char *myaddr, int len)); +remote_read_bytes PARAMS ((CORE_ADDR memaddr, char *myaddr, int len)); static void remote_files_info PARAMS ((struct target_ops *ignore)); @@ -650,7 +650,7 @@ remote_wait (pid, status) { unsigned char *p1; - regno = strtol (p, &p1, 16); /* Read the register number */ + regno = strtol (p, (char **) &p1, 16); /* Read the register number */ if (p1 == p) warning ("Remote sent badly formed register number: %s\nPacket: '%s'\n", @@ -880,7 +880,7 @@ remote_store_word (addr, word) static int remote_write_bytes (memaddr, myaddr, len) CORE_ADDR memaddr; - unsigned char *myaddr; + char *myaddr; int len; { char buf[PBUFSIZ]; @@ -928,7 +928,7 @@ remote_write_bytes (memaddr, myaddr, len) static int remote_read_bytes (memaddr, myaddr, len) CORE_ADDR memaddr; - unsigned char *myaddr; + char *myaddr; int len; { char buf[PBUFSIZ]; @@ -995,11 +995,9 @@ remote_xfer_memory(memaddr, myaddr, len, should_write, target) xfersize = len; if (should_write) - bytes_xferred = remote_write_bytes (memaddr, - (unsigned char *)myaddr, xfersize); + bytes_xferred = remote_write_bytes (memaddr, myaddr, xfersize); else - bytes_xferred = remote_read_bytes (memaddr, - (unsigned char *)myaddr, xfersize); + bytes_xferred = remote_read_bytes (memaddr, myaddr, xfersize); /* If we get an error, we are done xferring. */ if (bytes_xferred == 0) diff --git a/gdb/scm-lang.c b/gdb/scm-lang.c index f651ece888..b054dcf623 100644 --- a/gdb/scm-lang.c +++ b/gdb/scm-lang.c @@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "c-lang.h" #include "scm-lang.h" #include "scm-tags.h" +#include "gdb_string.h" extern struct type ** const (c_builtin_types[]); extern value_ptr value_allocate_space_in_inferior PARAMS ((int)); diff --git a/gdb/somsolib.c b/gdb/somsolib.c index 438bce0a3a..1c32837be1 100644 --- a/gdb/somsolib.c +++ b/gdb/somsolib.c @@ -557,6 +557,7 @@ som_solib_create_inferior_hook() ALL_OBJFILES (objfile) { struct unwind_table_entry *u; + extern struct unwind_table_entry *find_unwind_entry PARAMS ((CORE_ADDR pc)); /* What a crock. */ msymbol = lookup_minimal_symbol_solib_trampoline (SYMBOL_NAME (msymbol),