GNU header update.

[cacao.git] / src / vm / jit / verify / typecheck.c

diff --git a/src/vm/jit/verify/typecheck.c b/src/vm/jit/verify/typecheck.c
index 5f3d91f10eaa3ebab3c88fb7e9ab0eee8ffeadc4..900262a3512d3c92cffcbffb930e3ca1dfa70732 100644 (file)
--- a/src/vm/jit/verify/typecheck.c
+++ b/src/vm/jit/verify/typecheck.c
@@ -1,9 +1,9 @@
-/* jit/typecheck.c - typechecking (part of bytecode verification)
+/* vm/jit/verify/typecheck.c - typechecking (part of bytecode verification)
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   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
 
    This file is part of CACAO.
 
@@ -26,26 +26,28 @@
 
    Authors: Edwin Steiner
 
-   $Id: typecheck.c 1510 2004-11-17 11:33:44Z twisti $
+   $Id: typecheck.c 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
-#include "global.h" /* must be here because of CACAO_TYPECHECK */
+#include <string.h>
+
+#include "vm/global.h" /* must be here because of CACAO_TYPECHECK */
 
 #ifdef CACAO_TYPECHECK
 
-#include <string.h>
-#include "main.h"
-#include "builtin.h"
-#include "tables.h"
-#include "loader.h"
-#include "native.h"
 #include "types.h"
-#include "jit/jit.h"
-#include "jit/stack.h"
+/*  #include "main.h" */
+#include "mm/memory.h"
 #include "toolbox/logging.h"
-#include "toolbox/memory.h"
-#include "options.h"
+#include "native/native.h"
+#include "vm/builtin.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+#include "vm/tables.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/stack.h"
+
 
 /****************************************************************************/
 /* DEBUG HELPERS                                                            */
@@ -518,7 +520,9 @@ typestate_reach(codegendata *cd, registerdata *rd,void *localbuf,
        if (destblock <= current) {
                stackptr sp;
                int i;
+#if defined(__GNUC__)
 #warning FIXME FOR INLINING
+#endif
                if (!useinlining) {
                        TYPECHECK_COUNT(stat_backwards);
                        LOG("BACKWARDS!");