Merge from subtype.

[cacao.git] / src / vm / jit / jit.cpp

diff --git a/src/vm/jit/jit.cpp b/src/vm/jit/jit.cpp
index 1dbb5c695c52c1b33d816289d32d55769d8767f9..baaf5900f62eeedcb16ce7aee9dbaa6e9ce91ac1 100644 (file)
--- a/src/vm/jit/jit.cpp
+++ b/src/vm/jit/jit.cpp
@@ -45,7 +45,7 @@
 #include "vm/globals.hpp"
 #include "vm/initialize.hpp"
 #include "vm/loader.hpp"
-#include "vm/method.h"
+#include "vm/method.hpp"
 #include "vm/options.h"
 #include "vm/rt-timing.h"
 #include "vm/statistics.h"
@@ -65,10 +65,6 @@
 #include "vm/jit/stack.h"
 #include "vm/jit/stubs.hpp"
 
-#if defined(ENABLE_JITCACHE)
-# include "vm/jit/jitcache.hpp"
-#endif
-
 #if defined(ENABLE_OPAGENT)
 #include "vm/jit/oprofile-agent.hpp"
 #endif
@@ -84,7 +80,7 @@
 #endif
 
 #if defined(ENABLE_INLINING)
-# include "vm/jit/inline/inline.h"
+# include "vm/jit/inline/inline.hpp"
 #endif
 
 #include "vm/jit/ir/bytecode.h"
@@ -103,7 +99,7 @@
 # include "vm/jit/python.h"
 #endif
 
-#include "vm/jit/verify/typecheck.h"
+#include "vm/jit/verify/typecheck.hpp"
 
 
 /* debug macros ***************************************************************/
@@ -316,17 +312,6 @@ u1 *jit_compile(methodinfo *m)
 
        STATISTICS(count_methods++);
 
-#if defined (ENABLE_JITCACHE)
-
-       if (jitcache_load (m))
-       {
-               m->mutex->unlock();
-
-               return m->code->entrypoint;
-       }
-
-#endif
-
 #if defined(ENABLE_STATISTICS)
        /* measure time */
 
@@ -417,10 +402,6 @@ u1 *jit_compile(methodinfo *m)
                DEBUG_JIT_COMPILEVERBOSE("Running: ");
        }
 
-#if defined (ENABLE_JITCACHE)
-       jitcache_store(m);
-#endif
-
 #if defined(ENABLE_STATISTICS)
        /* measure time */