Mercurial > hg > truffle
diff src/cpu/x86/vm/c1_MacroAssembler_x86.cpp @ 4974:ab906cea36f7
First round of minimizing diff vs OpenJDK.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Mon, 27 Feb 2012 15:15:59 +0100 |
| parents | 33df1aeaebbf |
| children | 2f2c6347fce4 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Mon Feb 27 14:58:47 2012 +0100 +++ b/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Mon Feb 27 15:15:59 2012 +0100 @@ -289,12 +289,14 @@ jcc(Assembler::notZero, loop); } } - - // (tw) fix me -// if (CURRENT_ENV->dtrace_alloc_probes()) { -// assert(obj == rax, "must be"); -// call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id))); -// } + +#ifndef GRAAL + // TODO(tw): Check how we can access the flag without a ciEnv object. + if (CURRENT_ENV->dtrace_alloc_probes()) { + assert(obj == rax, "must be"); + call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id))); + } +#endif verify_oop(obj); } @@ -324,11 +326,14 @@ const Register len_zero = len; initialize_body(obj, arr_size, header_size * BytesPerWord, len_zero); - // TODO(tw): Re-enable this code once Graal no longer uses this method. -// if (CURRENT_ENV->dtrace_alloc_probes()) { -// assert(obj == rax, "must be"); -// call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id))); -// } + +#ifndef GRAAL + // TODO(tw): Check how we can access the flag without a ciEnv object. + if (CURRENT_ENV->dtrace_alloc_probes()) { + assert(obj == rax, "must be"); + call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id))); + } +#endif verify_oop(obj); }