* Removed all Id tags.

[cacao.git] / src / vm / jit / powerpc / disass.c

diff --git a/src/vm/jit/powerpc/disass.c b/src/vm/jit/powerpc/disass.c
index acf2ba0123fd30519bacb47a571eb9b774b8ae91..404055649273d4094da27a2e77ecf85de2a77e6b 100644 (file)
--- a/src/vm/jit/powerpc/disass.c
+++ b/src/vm/jit/powerpc/disass.c
@@ -1,9 +1,9 @@
 /* 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,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,10 +19,10 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Andreas  Krall
             Reinhard Grafl
@@ -30,7 +30,6 @@
    Changes: Stefan Ring
             Christian Thalinger
 
-   $Id: disass.c 4114 2006-01-09 20:19:02Z twisti $
 
 */
 
@@ -42,45 +41,10 @@
 
 #include "vm/types.h"
 
+#include "vm/global.h"
 #include "vm/jit/disass.h"
 
 
-char *regs[] = {
-       "r0",
-       "r1",
-       "r2",
-       "r3",
-       "r4",
-       "r5",
-       "r6",
-       "r7",
-       "r8",
-       "r9",
-       "r10",
-       "r11",
-       "r12",
-       "r13",
-       "r14",
-       "r15",
-       "r16",
-       "r17",
-       "r18",
-       "r19",
-       "r20",
-       "r21",
-       "r22",
-       "r23",
-       "r24",
-       "r25",
-       "r26",
-       "r27",
-       "r28",
-       "r29",
-       "r30",
-       "r31",
-};
-
-
 /* disassinstr *****************************************************************
 
    Outputs a disassembler listing of one machine code instruction on
@@ -92,9 +56,16 @@ char *regs[] = {
 
 u1 *disassinstr(u1 *code)
 {
-       disassemble_info info;
+       if (!disass_initialized) {
+               INIT_DISASSEMBLE_INFO(info, NULL, disass_printf);
+
+               /* setting the struct members must be done after
+                  INIT_DISASSEMBLE_INFO */
+
+               info.read_memory_func = &disass_buffer_read_memory;
 
-       INIT_DISASSEMBLE_INFO(info, NULL, disass_printf);
+               disass_initialized = true;
+       }
 
        printf("0x%08x:   %08x    ", (s4) code, *((s4 *) code));
 
@@ -106,27 +77,6 @@ u1 *disassinstr(u1 *code)
 }
 
 
-/* disassemble *****************************************************************
-
-   Outputs a disassembler listing of some machine code on `stdout'.
-
-   start: pointer to first instruction
-   end:   pointer to last instruction
-
-*******************************************************************************/
-
-void disassemble(u1 *start, u1 *end)
-{
-       disassemble_info info;
-
-       INIT_DISASSEMBLE_INFO(info, NULL, disass_printf);
-
-       printf("  --- disassembler listing ---\n");
-       for (; start < end; )
-               start = disassinstr(start);
-}
-
-
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where