* src/vm/jit/mips/emit.c (emit_branch): Implemented

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

diff --git a/src/vm/jit/dseg.h b/src/vm/jit/dseg.h
index d641a2c55cc23464d9bcca5b5ba00aa29be6ff40..a18a6b135a89861e87836bd335081f4d7b5fe638 100644 (file)
--- a/src/vm/jit/dseg.h
+++ b/src/vm/jit/dseg.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/dseg.c - data segment handling stuff
 
-   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
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -30,19 +28,16 @@
 
 /* forward typedefs ***********************************************************/
 
-typedef struct dsegentry             dsegentry;
-typedef struct linenumbertable_entry linenumbertable_entry;
+typedef struct dsegentry dsegentry;
 
 
 #include "config.h"
 #include "vm/types.h"
 
-#include "toolbox/list.h"
+#include "vm/references.h"
 
-#include "vm/jit/jit.h"
-#include "vm/jit/codegen-common.h"
-
-#include "vmcore/references.h"
+#include "vm/jit/jit.hpp"
+#include "vm/jit/codegen-common.hpp"
 
 
 /* convenience macros *********************************************************/
@@ -65,19 +60,12 @@ struct dsegentry {
 };
 
 
-/* linenumbertable_entry ******************************************************/
-
-/* Keep the type of line the same as the pointer type, otherwise we
-   run into alignment troubles (like on MIPS64). */
-
-struct linenumbertable_entry {
-       ptrint  line;               /* NOTE: see doc/inlining_stacktrace.txt for  */
-       u1     *pc;                 /*       special meanings of line and pc.     */
-};
-
-
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void dseg_finish(jitdata *jd);
 
 s4 dseg_add_unique_s4(codegendata *cd, s4 value);
@@ -95,15 +83,6 @@ s4 dseg_add_address(codegendata *cd, void *value);
 void dseg_add_unique_target(codegendata *cd, basicblock *target);
 void dseg_add_target(codegendata *cd, basicblock *target);
 
-void dseg_addlinenumbertablesize(codegendata *cd);
-void dseg_addlinenumber(codegendata *cd, u2 linenumber);
-void dseg_addlinenumber_inline_start(codegendata *cd, instruction *iptr);
-void dseg_addlinenumber_inline_end(codegendata *cd, instruction *iptr);
-
-void dseg_createlinenumbertable(codegendata *cd);
-
-s4 dseg_get_linenumber_from_pc(methodinfo **pm, u1 *pv, u1 *pc);
-
 #if defined(__I386__) || defined(__X86_64__) || defined(__XDSPCORE__) || defined(__M68K__) || defined(ENABLE_INTRP)
 void dseg_adddata(codegendata *cd);
 void dseg_resolve_datareferences(jitdata *jd);
@@ -113,6 +92,10 @@ void dseg_resolve_datareferences(jitdata *jd);
 void dseg_display(jitdata *jd);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _DSEG_H */