comparison src/cpu/x86/vm/c1_Runtime1_x86.cpp @ 2044:06f017f7daa7

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 07 Jan 2011 18:18:08 +0100
parents 00bc9eaf0e24 ac637b7220d1
children 3c0a889a176b
comparison
equal deleted inserted replaced
1942:00bc9eaf0e24 2044:06f017f7daa7
20 * or visit www.oracle.com if you need additional information or have any 20 * or visit www.oracle.com if you need additional information or have any
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 #include "incls/_precompiled.incl" 25 #include "precompiled.hpp"
26 #include "incls/_c1_Runtime1_x86.cpp.incl" 26 #include "c1/c1_Defs.hpp"
27 #include "c1/c1_MacroAssembler.hpp"
28 #include "c1/c1_Runtime1.hpp"
29 #include "interpreter/interpreter.hpp"
30 #include "nativeInst_x86.hpp"
31 #include "oops/compiledICHolderOop.hpp"
32 #include "oops/oop.inline.hpp"
33 #include "prims/jvmtiExport.hpp"
34 #include "register_x86.hpp"
35 #include "runtime/sharedRuntime.hpp"
36 #include "runtime/signature.hpp"
37 #include "runtime/vframeArray.hpp"
38 #include "vmreg_x86.inline.hpp"
27 39
28 40
29 // Implementation of StubAssembler 41 // Implementation of StubAssembler
30 42
31 int StubAssembler::call_RT(Register oop_result1, Register oop_result2, address entry, int args_size) { 43 int StubAssembler::call_RT(Register oop_result1, Register oop_result2, address entry, int args_size) {
1341 #endif // _LP64 1353 #endif // _LP64
1342 1354
1343 // load the klass and check the has finalizer flag 1355 // load the klass and check the has finalizer flag
1344 Label register_finalizer; 1356 Label register_finalizer;
1345 Register t = rsi; 1357 Register t = rsi;
1346 __ movptr(t, Address(rax, oopDesc::klass_offset_in_bytes())); 1358 __ load_klass(t, rax);
1347 __ movl(t, Address(t, Klass::access_flags_offset_in_bytes() + sizeof(oopDesc))); 1359 __ movl(t, Address(t, Klass::access_flags_offset_in_bytes() + sizeof(oopDesc)));
1348 __ testl(t, JVM_ACC_HAS_FINALIZER); 1360 __ testl(t, JVM_ACC_HAS_FINALIZER);
1349 __ jcc(Assembler::notZero, register_finalizer); 1361 __ jcc(Assembler::notZero, register_finalizer);
1350 __ ret(0); 1362 __ ret(0);
1351 1363