* src/vm/jit/emit.h: New file.

[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 6d8c672776727c346378ad85617c788f3b3f2576..7ccb0f29640487c6d652f45742b1da9bf6910a39 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,106 +30,20 @@
    Changes: Stefan Ring
             Christian Thalinger
 
-   $Id: disass.c 3181 2005-09-15 19:19:38Z twisti $
+   $Id: disass.c 4712 2006-03-30 11:59:46Z twisti $
 
 */
 
 
-#include <stdarg.h>
-#include <string.h>
-#include <assert.h>
-
-#include "vm/jit/powerpc/types.h"
-#include "vm/jit/powerpc/dis-asm.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",
-};
-
-
-void myprintf(PTR p, const char *fmt, ...)
-{
-       va_list ap;
-       va_start(ap, fmt);
-       vprintf(fmt, ap);
-       va_end(ap);
-       fflush(stdout);
-}
-
-
-int buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, unsigned int length, struct disassemble_info *info)
-{
-       memcpy(myaddr, (void*) memaddr, length);
-       return 0;
-}
-
-
-void perror_memory(int status, bfd_vma memaddr, struct disassemble_info *info)
-{
-       assert(0);
-}
-
-
-void generic_print_address(bfd_vma addr, struct disassemble_info *info)
-{
-/*     myprintf(NULL, "0x%x", addr - (u4) info->application_data); */
-       myprintf(NULL, "0x%08x", addr);
-}
-
-
-int generic_symbol_at_address(bfd_vma addr, struct disassemble_info *info)
-{
-       assert(0);
-}
-
-
-unsigned long bfd_getb32(void *buf)
-{
-       return *(unsigned long *) buf;
-}
-
+#include "config.h"
 
-unsigned long bfd_getl32(void *buf)
-{
-       return *(unsigned long *) buf;
-}
+#include <dis-asm.h>
+#include <stdio.h>
 
+#include "vm/types.h"
 
-void sprintf_vma(char *buf, bfd_vma disp)
-{
-       sprintf(buf, "0x%x", disp);
-}
+#include "vm/global.h"
+#include "vm/jit/disass.h"
 
 
 /* disassinstr *****************************************************************
@@ -143,9 +57,16 @@ void sprintf_vma(char *buf, bfd_vma disp)
 
 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 */
 
-       INIT_DISASSEMBLE_INFO(info, NULL, myprintf);
+               info.read_memory_func = &disass_buffer_read_memory;
+
+               disass_initialized = true;
+       }
 
        printf("0x%08x:   %08x    ", (s4) code, *((s4 *) code));
 
@@ -157,27 +78,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, myprintf);
-
-       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