* src/vm/jit/jit.h (stackptr): Removed.

[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 8889b892bb4d3b8dde43a49d1878f452d4ab3fd4..f3636f88d1118d9635bb60741de06f9ffb065593 100644 (file)
--- a/src/vm/jit/disass-common.c
+++ b/src/vm/jit/disass-common.c
@@ -1,9 +1,9 @@
 /* src/vm/jit/disass-common.c - common 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, 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
 
    This file is part of CACAO.
 
@@ -19,26 +19,15 @@
 
    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.
-
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Christian Thalinger
-
-   Changes:
-
-   $Id: disass-common.c 4109 2006-01-09 16:30:12Z twisti $
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 */
 
 
 #include "config.h"
 
-#if defined(WITH_BINUTILS_DISASSEMBLER)
-# include <dis-asm.h>
-#endif
-
+#include <dis-asm.h>
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -46,16 +35,46 @@
 
 #include "mm/memory.h"
 
+#include "vm/jit/disass.h"
+
+
+/* global variables ***********************************************************/
+
+#if defined(WITH_BINUTILS_DISASSEMBLER)
+disassemble_info info;
+bool disass_initialized = false;
+#endif
+
 
 /* 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__)
+#if defined(__I386__) || defined(__X86_64__) || defined(__S390__) || defined(__M68K__)
 char disass_buf[512];
 s4   disass_len;
 #endif
 
 
+/* disassemble *****************************************************************
+
+   Outputs a disassembler listing of some machine code on `stdout'.
+
+   start: pointer to first machine instruction
+   end:   pointer after last machine instruction
+
+*******************************************************************************/
+
+#if defined(ENABLE_JIT)
+void disassemble(u1 *start, u1 *end)
+{
+       printf("  --- disassembler listing ---\n");
+
+       for (; start < end; )
+               start = disassinstr(start);
+}
+#endif
+
+
 /* disass_printf ***************************************************************
 
    Required by binutils disassembler.  This just prints the
@@ -63,18 +82,17 @@ s4   disass_len;
 
 *******************************************************************************/
 
-#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__)
+#if defined(__I386__) || defined(__X86_64__) || defined(__S390__) || defined(__M68K__)
+       disass_len += vsprintf(disass_buf + disass_len, fmt, ap);
+#else
        vprintf(fmt, ap);
        fflush(stdout);
-#else
-       disass_len += vsprintf(disass_buf + disass_len, fmt, ap);
 #endif
 
        va_end(ap);
@@ -87,13 +105,12 @@ void disass_printf(PTR p, const char *fmt, ...)
 
 *******************************************************************************/
 
-int buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, unsigned int length, struct disassemble_info *info)
+int disass_buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, unsigned int length, struct disassemble_info *info)
 {
-       MCOPY(myaddr, (void *) memaddr, u1, length);
+       MCOPY(myaddr, (void *) (ptrint) memaddr, u1, length);
 
        return 0;
 }
-#endif /* defined(WITH_BINUTILS_DISASSEMBLER) */
 
 
 /*