#include "mm/memory.h"
-#include "native/native.h"
+#include "native/native.hpp"
#include "toolbox/logging.h"
#include "threads/mutex.hpp"
-#include "vm/class.h"
+#include "vm/class.hpp"
#include "vm/global.h"
#include "vm/globals.hpp"
-#include "vm/initialize.h"
+#include "vm/initialize.hpp"
#include "vm/loader.hpp"
#include "vm/method.h"
#include "vm/options.h"
#include "vm/jit/disass.h"
#include "vm/jit/dseg.h"
#include "vm/jit/jit.hpp"
-#include "vm/jit/parse.h"
+#include "vm/jit/parse.hpp"
#include "vm/jit/reg.h"
-#include "vm/jit/show.h"
+#include "vm/jit/show.hpp"
#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
#if defined(ENABLE_OPAGENT)
if (opt_EnableOpagent)
- OprofileAgent_initialize();
+ OprofileAgent::initialize();
#endif
}
{
#if defined(ENABLE_OPAGENT)
if (opt_EnableOpagent)
- OprofileAgent_close();
+ OprofileAgent::close();
#endif
}
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 */
DEBUG_JIT_COMPILEVERBOSE("Running: ");
}
+#if defined (ENABLE_JITCACHE)
+ jitcache_store(m);
+#endif
+
#if defined(ENABLE_STATISTICS)
/* measure time */
#if defined(ENABLE_OPAGENT)
if (opt_EnableOpagent)
- OprofileAgent_newmethod(m);
+ OprofileAgent::newmethod(m);
#endif
/* leave the monitor */
#if defined(ENABLE_OPAGENT)
if (opt_EnableOpagent)
- OprofileAgent_newmethod(m);
+ OprofileAgent::newmethod(m);
#endif
DEBUG_JIT_COMPILEVERBOSE("Recompiling done: ");
show_filters_apply(jd->m);
#endif
- /* Handle native methods and create a native stub. */
-
+ // Handle native methods and create a native stub.
if (m->flags & ACC_NATIVE) {
- functionptr f;
-
- f = native_method_resolve(m);
+ NativeMethods& nm = VM::get_current()->get_nativemethods();
+ void* f = nm.resolve_method(m);
if (f == NULL)
return NULL;
- code = NativeStub::generate(m, f);
+ code = NativeStub::generate(m, (functionptr) f);
/* Native methods are never recompiled. */