Fix prototype problems related to recent disassembler changes

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 502bf4b8a0940389efb84aa53027cce972343192..ef4c16bf986345b00923ddcda94f7ef49eebfbbc 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr  1 09:01:38 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+       * core.c (dis_asm_read_memory): Reinstate 4th arg.  The prototype
+       has been fixed.
+
 Thu Apr  1 09:34:43 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
        * breakpoint.c (bpstat_print, bpstat_stop_status): Change to walk the

diff --git a/gdb/core.c b/gdb/core.c
index 3fa964b99f808b2991cf4d997689cd134aa71d6e..a513dbc1e0a4d45eefd859944f86f46b86a35e83 100644 (file)
--- a/gdb/core.c
+++ b/gdb/core.c
@@ -166,10 +166,11 @@ read_memory (memaddr, myaddr, len)
    FIXME: not according to it's prototype.  930331 krp. */
 
 int
-dis_asm_read_memory (memaddr, myaddr, len)
+dis_asm_read_memory (memaddr, myaddr, len, info)
      bfd_vma memaddr;
      bfd_byte *myaddr;
      int len;
+     disassemble_info *info;
 {
   return target_read_memory (memaddr, myaddr, len);
 }

diff --git a/include/ChangeLog b/include/ChangeLog
index f0379b5608cddbfca8c86b4d80f4d348f0ae01a8..7e8e48257b8b2eeb78016d4e3e2f4b5f69326edc 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr  1 09:00:10 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+       * dis-asm.h (dis_asm_read_memory): Fix prototype.
+
 Wed Mar 31 17:40:16 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
        * dis-asm.h: Add print_insn_sparc.

diff --git a/include/dis-asm.h b/include/dis-asm.h
index 86666c32a28e9243522c36e9ae2194a12278c8ff..51808a84a00815d65524568e8df5168fb5814cea 100644 (file)
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -54,7 +54,8 @@ extern void perror_memory PARAMS ((int, bfd_vma, struct disassemble_info *));
 
 /* GDB--Like target_read_memory, but slightly different parameters.  */
 extern int
-dis_asm_read_memory PARAMS ((bfd_vma memaddr, bfd_byte *myaddr, int len));
+dis_asm_read_memory PARAMS ((bfd_vma memaddr, bfd_byte *myaddr, int len,
+                            disassemble_info *info));
 
 /* GDB--Like memory_error with slightly different parameters.  */
 extern void

diff --git a/opcodes/sparc-dis.c b/opcodes/sparc-dis.c
index 2d20e6067dd6c6f76f4a9a9082fca3f4a965b447..5a1031086f494de6a45cca045ec06437c82d168c 100644 (file)
--- a/opcodes/sparc-dis.c
+++ b/opcodes/sparc-dis.c
@@ -460,7 +460,7 @@ print_insn_sparc (memaddr, info)
              errcode =
                (*info->read_memory_func)
                  (memaddr - 4,
-                  (char *)&prev_insn, sizeof (prev_insn));
+                  (char *)&prev_insn, sizeof (prev_insn), info);
 
              if (errcode == 0)
                {
@@ -475,7 +475,8 @@ print_insn_sparc (memaddr, info)
 
                  if (is_delayed_branch (prev_insn))
                    errcode = (*info->read_memory_func)
-                     (memaddr - 8, (char *)&prev_insn, sizeof (prev_insn));
+                     (memaddr - 8, (char *)&prev_insn, sizeof (prev_insn),
+                      info);
                }
 
              /* If there was a problem reading memory, then assume