#include "native/llni.h"
-#include "threads/lock-common.h"
+#include "threads/mutex.hpp"
#include "vm/array.h"
-#include "vm/builtin.h"
+#include "vm/jit/builtin.hpp"
#include "vm/class.h"
#include "vm/exceptions.hpp"
#include "vm/global.h"
#include "vm/globals.hpp"
#include "vm/linker.h"
-#include "vm/loader.h"
+#include "vm/loader.hpp"
#include "vm/method.h"
#include "vm/options.h"
#include "vm/resolve.h"
#include "vm/jit/code.h"
#include "vm/jit/methodheader.h"
+#include "vm/jit/stubs.hpp"
#if !defined(NDEBUG) && defined(ENABLE_INLINING)
c = cb->clazz;
- LOCK_INIT_OBJECT_LOCK(&(m->header));
+ m->mutex = Mutex_new();
#if defined(ENABLE_STATISTICS)
if (opt_stat)
void method_free(methodinfo *m)
{
+ if (m->mutex)
+ Mutex_delete(m->mutex);
+
if (m->jcode)
MFREE(m->jcode, u1, m->jcodelength);
if (m->stubroutine) {
if (m->flags & ACC_NATIVE) {
- removenativestub(m->stubroutine);
-
- } else {
- removecompilerstub(m->stubroutine);
+ NativeStub_remove(m->stubroutine);
+ }
+ else {
+ CompilerStub_remove(m->stubroutine);
}
}
}
/* initialize methodinfo structure */
MZERO(m, methodinfo, 1);
- LOCK_INIT_OBJECT_LOCK(&(m->header));
-
+
+ m->mutex = Mutex_new();
m->flags = ACC_METHOD_BUILTIN;
m->parseddesc = bte->md;
m->name = bte->name;