- don't pass unused pos to disassinstr

- use disassinstr in disassemble

diff --git a/src/vm/jit/powerpc/disass.c b/src/vm/jit/powerpc/disass.c
index 9e0a84ab7db30c841f3c2d74aa95cbc3ade66687..5df75dcd33abdeb81e87e9f2dfcb5703cae046d1 100644 (file)
--- a/src/vm/jit/powerpc/disass.c
+++ b/src/vm/jit/powerpc/disass.c
@@ -1,4 +1,4 @@
-/* jit/powerpc/disass.c - wrapper functions for GNU binutils disassembler
+/* src/vm/jit/powerpc/disass.c - wrapper functions for GNU binutils disassembler
 
    Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
    R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
@@ -28,8 +28,9 @@
             Reinhard Grafl
 
    Changes: Stefan Ring
+            Christian Thalinger
 
-   $Id: disass.c 1735 2004-12-07 14:33:27Z twisti $
+   $Id: disass.c 1976 2005-03-03 11:25:06Z twisti $
 
 */
 
@@ -130,7 +131,7 @@ void sprintf_vma(char *buf, bfd_vma disp)
 }
 
 
-void disassinstr(s4 *code, s4 pos)
+void disassinstr(s4 *code)
 {
        disassemble_info info;
 
@@ -145,17 +146,14 @@ void disassinstr(s4 *code, s4 pos)
 
 void disassemble(s4 *code, s4 len)
 {
-       int p;
+       s4 i;
        disassemble_info info;
 
        INIT_DISASSEMBLE_INFO(info, NULL, myprintf);
 /*     info.application_data = code; */
        printf ("  --- disassembler listing ---\n");
-       for (p = 0; p < len; p += 4, code++) {
-               myprintf(NULL, "0x%08x:   %08x    ", (s4) code, *code);
-               print_insn_big_powerpc((bfd_vma) code, &info);
-               myprintf(NULL, "\n");
-       }
+       for (i = 0; i < len; i += 4, code++)
+               disassinstr(code);
 }
 
 

diff --git a/src/vm/jit/powerpc/disass.h b/src/vm/jit/powerpc/disass.h
index 78c4b70c91bf6d6b41f22848149bcc04951c0678..3893069e025997b6016290a129cdd4aaca61e2f7 100644 (file)
--- a/src/vm/jit/powerpc/disass.h
+++ b/src/vm/jit/powerpc/disass.h
@@ -1,4 +1,4 @@
-/* jit/powerpc/disass.h - disassembler header
+/* srv/vm/jit/powerpc/disass.h - disassembler header
 
    Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
    R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
@@ -26,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: disass.h 1735 2004-12-07 14:33:27Z twisti $
+   $Id: disass.h 1976 2005-03-03 11:25:06Z twisti $
 
 */
 
@@ -41,10 +41,11 @@
 extern char *regs[];
 
 
-/* function prototypes */
+/* function prototypes ********************************************************/
+
 void myprintf(PTR p, const char *fmt, ...);
 int buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, unsigned int length, struct disassemble_info *info);
-void disassinstr(s4 *code, s4 pos);
+void disassinstr(s4 *code);
 void disassemble(s4 *code, s4 len);
 
 #endif /* _DISASS_H */