projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MIPS repair work
[cacao.git]
/
src
/
vm
/
jit
/
jit.cpp
diff --git
a/src/vm/jit/jit.cpp
b/src/vm/jit/jit.cpp
index 095e9840155dba245ac7ec97a0a07909feaa1efb..a8ac2b160a196c7f7c1873db3e80bf196fab7e86 100644
(file)
--- a/
src/vm/jit/jit.cpp
+++ b/
src/vm/jit/jit.cpp
@@
-32,11
+32,11
@@
#include "md.h"
#include "md.h"
-#include "mm/memory.h"
+#include "mm/memory.h
pp
"
#include "native/native.hpp"
#include "native/native.hpp"
-#include "toolbox/logging.h"
+#include "toolbox/logging.h
pp
"
#include "threads/mutex.hpp"
#include "threads/mutex.hpp"
@@
-45,7
+45,7
@@
#include "vm/globals.hpp"
#include "vm/initialize.hpp"
#include "vm/loader.hpp"
#include "vm/globals.hpp"
#include "vm/initialize.hpp"
#include "vm/loader.hpp"
-#include "vm/method.h"
+#include "vm/method.h
pp
"
#include "vm/options.h"
#include "vm/rt-timing.h"
#include "vm/statistics.h"
#include "vm/options.h"
#include "vm/rt-timing.h"
#include "vm/statistics.h"
@@
-58,7
+58,7
@@
#include "vm/jit/disass.h"
#include "vm/jit/dseg.h"
#include "vm/jit/jit.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.h
pp
"
#include "vm/jit/reg.h"
#include "vm/jit/show.hpp"
#include "vm/jit/reg.h"
#include "vm/jit/show.hpp"
@@
-80,7
+80,7
@@
#endif
#if defined(ENABLE_INLINING)
#endif
#if defined(ENABLE_INLINING)
-# include "vm/jit/inline/inline.h"
+# include "vm/jit/inline/inline.h
pp
"
#endif
#include "vm/jit/ir/bytecode.h"
#endif
#include "vm/jit/ir/bytecode.h"
@@
-99,7
+99,7
@@
# include "vm/jit/python.h"
#endif
# include "vm/jit/python.h"
#endif
-#include "vm/jit/verify/typecheck.h"
+#include "vm/jit/verify/typecheck.h
pp
"
/* debug macros ***************************************************************/
/* debug macros ***************************************************************/
@@
-389,14
+389,6
@@
u1 *jit_compile(methodinfo *m)
/* release codeinfo */
code_codeinfo_free(jd->code);
/* 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: ");
}
else {
DEBUG_JIT_COMPILEVERBOSE("Running: ");
@@
-774,8
+766,10
@@
static u1 *jit_compile_intern(jitdata *jd)
_must_ be done after loop optimization and register allocation,
since they can change the basic block count. */
_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);
code->bbfrequency = MNEW(u4, jd->basicblockcount);
+ }
#endif
DEBUG_JIT_COMPILEVERBOSE("Generating code: ");
#endif
DEBUG_JIT_COMPILEVERBOSE("Generating code: ");