/* src/vm/jit/jit.cpp - Just-In-Time compiler
- Copyright (C) 1996-2005, 2006, 2007, 2008
+ Copyright (C) 1996-2011
CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
#include "md.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
-#include "native/native.h"
+#include "native/native.hpp"
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
-#include "threads/lock-common.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/hook.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"
#include "vm/jit/cfg.h"
-#include "vm/jit/codegen-common.h"
+#include "vm/jit/codegen-common.hpp"
#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_OPAGENT)
-#include "vm/jit/oprofile-agent.hpp"
-#endif
-
#include "vm/jit/allocator/simplereg.h"
#if defined(ENABLE_LSRA) && !defined(ENABLE_SSA)
# include "vm/jit/allocator/lsra.h"
#endif
#if defined(ENABLE_INLINING)
-# include "vm/jit/inline/inline.h"
+# include "vm/jit/inline/inline.hpp"
#endif
#include "vm/jit/ir/bytecode.h"
# include "vm/jit/python.h"
#endif
-#include "vm/jit/verify/typecheck.h"
+#include "vm/jit/verify/typecheck.hpp"
/* debug macros ***************************************************************/
#else
intrp_md_init();
#endif
-
-#if defined(ENABLE_OPAGENT)
- if (opt_EnableOpagent)
- OprofileAgent_initialize();
-#endif
}
void jit_close(void)
{
-#if defined(ENABLE_OPAGENT)
- if (opt_EnableOpagent)
- OprofileAgent_close();
-#endif
+ /* nop */
}
/* allocate jitdata structure and fill it */
- jd = DNEW(jitdata);
+ jd = (jitdata*) DumpMemory::allocate(sizeof(jitdata));
jd->m = m;
- jd->cd = DNEW(codegendata);
- jd->rd = DNEW(registerdata);
+ jd->cd = (codegendata*) DumpMemory::allocate(sizeof(codegendata));
+ jd->rd = (registerdata*) DumpMemory::allocate(sizeof(registerdata));
#if defined(ENABLE_LOOP)
- jd->ld = DNEW(loopdata);
+ jd->ld = (loopdata*) DumpMemory::allocate(sizeof(loopdata));
#endif
/* Allocate codeinfo memory from the heap as we need to keep them. */
{
u1 *r;
jitdata *jd;
- int32_t dumpmarker;
STATISTICS(count_jit_calls++);
/* enter a monitor on the method */
- LOCK_MONITOR_ENTER(m);
+ m->mutex->lock();
/* if method has been already compiled return immediately */
if (m->code != NULL) {
- LOCK_MONITOR_EXIT(m);
+ m->mutex->unlock();
assert(m->code->entrypoint);
return m->code->entrypoint;
compilingtime_start();
#endif
- /* mark start of dump memory area */
-
- DMARKER;
+ // Create new dump memory area.
+ DumpMemoryArea dma;
/* create jitdata structure */
/* release codeinfo */
code_codeinfo_free(jd->code);
-
-#if defined(ENABLE_PROFILING)
- /* Release memory for basic block profiling information. */
-
- if (JITDATA_HAS_FLAG_INSTRUMENT(jd))
- if (jd->code->bbfrequency != NULL)
- MFREE(jd->code->bbfrequency, u4, jd->code->basicblockcount);
-#endif
}
else {
DEBUG_JIT_COMPILEVERBOSE("Running: ");
}
- /* release dump area */
-
- DRELEASE;
-
#if defined(ENABLE_STATISTICS)
/* measure time */
compilingtime_stop();
#endif
-#if defined(ENABLE_OPAGENT)
- if (opt_EnableOpagent)
- OprofileAgent_newmethod(m);
-#endif
+ // Hook point just after code was generated.
+ Hook::jit_generated(m, m->code);
/* leave the monitor */
- LOCK_MONITOR_EXIT(m);
+ m->mutex->unlock();
/* return pointer to the methods entry point */
u1 *r;
jitdata *jd;
u1 optlevel;
- int32_t dumpmarker;
/* check for max. optimization level */
compilingtime_start();
#endif
- /* mark start of dump memory area */
-
- DMARKER;
+ // Create new dump memory area.
+ DumpMemoryArea dma;
/* create jitdata structure */
code_codeinfo_free(jd->code);
}
- /* release dump area */
-
- DRELEASE;
-
#if defined(ENABLE_STATISTICS)
/* measure time */
compilingtime_stop();
#endif
-#if defined(ENABLE_OPAGENT)
- if (opt_EnableOpagent)
- OprofileAgent_newmethod(m);
-#endif
+ // Hook point just after code was generated.
+ Hook::jit_generated(m, m->code);
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. */
/*&& jd->exceptiontablelength == 0*/
) {
/*printf("=== %s ===\n", jd->m->name->text);*/
- jd->ls = DNEW(lsradata);
+ jd->ls = (lsradata*) DumpMemory::allocate(sizeof(lsradata));
jd->ls = NULL;
ssa(jd);
/*lsra(jd);*/ regalloc(jd);
_must_ be done after loop optimization and register allocation,
since they can change the basic block count. */
- if (JITDATA_HAS_FLAG_INSTRUMENT(jd))
+ if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) {
+ code->basicblockcount = jd->basicblockcount;
code->bbfrequency = MNEW(u4, jd->basicblockcount);
+ }
#endif
DEBUG_JIT_COMPILEVERBOSE("Generating code: ");
#if defined(ENABLE_JIT)
#if !defined(JIT_COMPILER_VIA_SIGNAL)
-u1 *jit_asm_compile(methodinfo *m, u1 *mptr, u1 *sp, u1 *ra)
+extern "C" {
+void* jit_asm_compile(methodinfo *m, void* mptr, void* sp, void* ra)
{
stackframeinfo_t sfi;
- u1 *entrypoint;
- u1 *pa;
- ptrint *p;
+ void *entrypoint;
+ void *pa;
+ uintptr_t *p;
/* create the stackframeinfo (subtract 1 from RA as it points to the */
/* instruction after the call) */
- stacktrace_stackframeinfo_add(&sfi, NULL, sp, ra, ra-1);
+ stacktrace_stackframeinfo_add(&sfi, NULL, sp, ra, ((uint8_t*) ra) - 1);
/* actually compile the method */
/* patch the method entry point */
- p = (ptrint *) pa;
+ p = (uintptr_t*) pa;
- *p = (ptrint) entrypoint;
+ *p = (uintptr_t) entrypoint;
/* flush the instruction cache */
return entrypoint;
}
+}
#endif
/* jit_compile_handle **********************************************************
*p = (uintptr_t) newpv;
+#if !defined(JIT_COMPILER_VIA_SIGNAL)
/* Flush both caches. */
+ /* This might have been necessary before we had the compiler trap, but now
+ * it's not. I don't care enough about the (broken) non-signal case to
+ * investigate this. */
md_cacheflush(pa, SIZEOF_VOID_P);
+#endif
return newpv;
}
projects / cacao.git / blobdiff