* Merged in twisti-branch.

[cacao.git] / src / vm / jit / disass-common.c

diff --git a/src/vm/jit/disass-common.c b/src/vm/jit/disass-common.c
index e87c704a8b429d09a3d0cfb160331da63411151f..fd269b175ac5bba3b7771e713080fbc64e1ad192 100644 (file)
--- a/src/vm/jit/disass-common.c
+++ b/src/vm/jit/disass-common.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/disass-common.c - common functions for GNU binutils disassembler
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   Copyright (C) 1996-2005, 2006, 2007 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
@@ -22,29 +22,21 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
-   $Id: disass-common.c 7219 2007-01-16 22:18:57Z pm $
+   $Id: disass-common.c 7436 2007-03-02 20:23:46Z tbfg $
 
 */
 
 
 #include "config.h"
 
-#if defined(WITH_BINUTILS_DISASSEMBLER)
-# include <dis-asm.h>
-#endif
-
+#include <dis-asm.h>
 #include <stdarg.h>
 #include <stdio.h>
 
 #include "vm/types.h"
 
 #include "mm/memory.h"
+
 #include "vm/jit/disass.h"
 
 
@@ -59,7 +51,7 @@ bool disass_initialized = false;
 /* We need this on i386 and x86_64 since we don't know the byte length
    of currently printed instructions.  512 bytes should be enough. */
 
-#if defined(__I386__) || defined(__X86_64__) || defined(__S390__)
+#if defined(__I386__) || defined(__X86_64__) || defined(__S390__) || defined(__M68K__)
 char disass_buf[512];
 s4   disass_len;
 #endif
@@ -92,14 +84,13 @@ void disassemble(u1 *start, u1 *end)
 
 *******************************************************************************/
 
-#if defined(WITH_BINUTILS_DISASSEMBLER)
 void disass_printf(PTR p, const char *fmt, ...)
 {
        va_list ap;
 
        va_start(ap, fmt);
 
-#if defined(__I386__) || defined(__X86_64__) || defined(__S390__)
+#if defined(__I386__) || defined(__X86_64__) || defined(__S390__) || defined(__M68K__)
        disass_len += vsprintf(disass_buf + disass_len, fmt, ap);
 #else
        vprintf(fmt, ap);
@@ -122,7 +113,6 @@ int disass_buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, unsigned int le
 
        return 0;
 }
-#endif /* defined(WITH_BINUTILS_DISASSEMBLER) */
 
 
 /*