* Removed all Id tags.

[cacao.git] / src / vm / jit / disass.h

diff --git a/src/vm/jit/disass.h b/src/vm/jit/disass.h
index 84429f4081c15a6a7655ecc960fa885b1c995838..70869659fe22b0b8948d1c96db20bcb7ed0b4969 100644 (file)
--- a/src/vm/jit/disass.h
+++ b/src/vm/jit/disass.h
@@ -1,9 +1,9 @@
 /* src/vm/jit/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,
-   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,16 +19,8 @@
 
    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.h 4117 2006-01-09 20:52:21Z twisti $
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 */
 
@@ -44,10 +36,57 @@
 
 #include "vm/types.h"
 
+#if defined(ENABLE_DISASSEMBLER)
+
+/* some macros ****************************************************************/
+
+#if defined(ENABLE_JIT)
+# if defined(ENABLE_INTRP)
+
+#define DISASSINSTR(code) \
+    do { \
+        if (opt_intrp) \
+            (code) = intrp_disassinstr((code)); \
+        else \
+            (code) = disassinstr((code)); \
+    } while (0)
+
+#define DISASSEMBLE(start,end) \
+    do { \
+        if (opt_intrp) \
+            intrp_disassemble((start), (end)); \
+        else \
+            disassemble((start), (end)); \
+    } while (0)
+
+# else /* defined(ENABLE_INTRP) */
+
+#define DISASSINSTR(code) \
+    (code) = disassinstr((code))
+
+#define DISASSEMBLE(start,end) \
+    disassemble((start), (end))
+
+# endif /* defined(ENABLE_INTRP) */
+#else /* defined(ENABLE_JIT) */
+
+#define DISASSINSTR(code) \
+    (code) = intrp_disassinstr((code))
+
+#define DISASSEMBLE(start,end) \
+    intrp_disassemble((start), (end))
+
+#endif /* defined(ENABLE_JIT) */
 
-extern char *regs[];
 
-#if defined(__I386__) || defined(__X86_64__)
+/* export global variables ****************************************************/
+
+#if defined(WITH_BINUTILS_DISASSEMBLER)
+extern disassemble_info info;
+extern bool disass_initialized;
+#endif
+
+#if defined(__I386__) || defined(__X86_64__) || defined(__S390__) || defined(__M68K__)
 extern char disass_buf[512];
 extern s4   disass_len;
 #endif
@@ -55,13 +94,28 @@ extern s4   disass_len;
 
 /* function prototypes *******************************************************/
 
+#if defined(ENABLE_JIT)
+void disassemble(u1 *start, u1 *end);
+#endif
+
 #if defined(WITH_BINUTILS_DISASSEMBLER)
 void disass_printf(PTR p, const char *fmt, ...);
+
+int disass_buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, unsigned int length, struct disassemble_info *info);
 #endif
 
 /* machine dependent functions */
+
+#if defined(ENABLE_JIT)
 u1 *disassinstr(u1 *code);
-void disassemble(u1 *start, u1 *end);
+#endif
+
+#if defined(ENABLE_INTRP)
+u1 *intrp_disassinstr(u1 *code);
+void intrp_disassemble(u1 *start, u1 *end);
+#endif
+
+#endif /* defined(ENABLE_DISASSEMBLER) */
 
 #endif /* _DISASS_H */