projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* src/vm/global.h: Made 'lockword' member of java_object_t a plain
[cacao.git]
/
src
/
vm
/
jit
/
builtin.cpp
diff --git
a/src/vm/jit/builtin.cpp
b/src/vm/jit/builtin.cpp
index ff1e2dd9c9c7ae9532d8cfa1a30241fa7d361cc9..146e64dffdb87a8fbbc3820076088d0d08cb02ab 100644
(file)
--- a/
src/vm/jit/builtin.cpp
+++ b/
src/vm/jit/builtin.cpp
@@
-1,6
+1,6
@@
/* src/vm/jit/builtin.cpp - functions for unsupported operations
/* src/vm/jit/builtin.cpp - functions for unsupported operations
- Copyright (C) 1996-2005, 2006, 2007, 2008
+ Copyright (C) 1996-2005, 2006, 2007, 2008
, 2010
CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
@@
-75,6
+75,7
@@
#include "vm/string.hpp"
#include "vm/jit/asmpart.h"
#include "vm/string.hpp"
#include "vm/jit/asmpart.h"
+#include "vm/jit/emit-common.hpp"
#include "vm/jit/stubs.hpp"
#include "vm/jit/trace.hpp"
#include "vm/jit/stubs.hpp"
#include "vm/jit/trace.hpp"
@@
-862,7
+863,7
@@
java_handle_t *builtin_new(classinfo *c)
LLNI_vftbl_direct(o) = c->vftbl;
#if defined(ENABLE_THREADS)
LLNI_vftbl_direct(o) = c->vftbl;
#if defined(ENABLE_THREADS)
- L
LNI_DIRECT(o)->lockword
.init();
+ L
ockword(LLNI_DIRECT(o)->lockword)
.init();
#endif
CYCLES_STATS_GET(cycles_end);
#endif
CYCLES_STATS_GET(cycles_end);
@@
-944,7
+945,7
@@
java_handle_t *builtin_tlh_new(classinfo *c)
LLNI_vftbl_direct(o) = c->vftbl;
# if defined(ENABLE_THREADS)
LLNI_vftbl_direct(o) = c->vftbl;
# if defined(ENABLE_THREADS)
- L
LNI_DIRECT(o)->lockword
.init();
+ L
ockword(LLNI_DIRECT(o)->lockword)
.init();
# endif
CYCLES_STATS_GET(cycles_end);
# endif
CYCLES_STATS_GET(cycles_end);
@@
-1023,7
+1024,7
@@
java_object_t *builtin_fast_new(classinfo *c)
o->vftbl = c->vftbl;
#if defined(ENABLE_THREADS)
o->vftbl = c->vftbl;
#if defined(ENABLE_THREADS)
- L
LNI_DIRECT(o)->lockword
.init();
+ L
ockword(LLNI_DIRECT(o)->lockword)
.init();
#endif
CYCLES_STATS_GET(cycles_end);
#endif
CYCLES_STATS_GET(cycles_end);
@@
-2162,7
+2163,7
@@
java_handle_t *builtin_clone(void *env, java_handle_t *o)
#endif
#if defined(ENABLE_THREADS)
#endif
#if defined(ENABLE_THREADS)
- L
LNI_DIRECT(co)->lockword
.init();
+ L
ockword(LLNI_DIRECT(co)->lockword)
.init();
#endif
LLNI_CRITICAL_END;
#endif
LLNI_CRITICAL_END;
@@
-2197,7
+2198,7
@@
java_handle_t *builtin_clone(void *env, java_handle_t *o)
#endif
#if defined(ENABLE_THREADS)
#endif
#if defined(ENABLE_THREADS)
- L
LNI_DIRECT(co)->lockword
.init();
+ L
ockword(LLNI_DIRECT(co)->lockword)
.init();
#endif
LLNI_CRITICAL_END;
#endif
LLNI_CRITICAL_END;