Mercurial > hg > truffle
comparison src/cpu/x86/vm/templateInterpreter_x86_32.cpp @ 4768:8940fd98d540
Merge
author | kvn |
---|---|
date | Thu, 29 Dec 2011 11:37:50 -0800 |
parents | 069ab3f976d3 |
children | 22cee0ee8927 |
comparison
equal
deleted
inserted
replaced
4730:7faca6dfa2ed | 4768:8940fd98d540 |
---|---|
550 __ bind(L); | 550 __ bind(L); |
551 } | 551 } |
552 #endif // ASSERT | 552 #endif // ASSERT |
553 // get synchronization object | 553 // get synchronization object |
554 { Label done; | 554 { Label done; |
555 const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes(); | 555 const int mirror_offset = in_bytes(Klass::java_mirror_offset()); |
556 __ movl(rax, access_flags); | 556 __ movl(rax, access_flags); |
557 __ testl(rax, JVM_ACC_STATIC); | 557 __ testl(rax, JVM_ACC_STATIC); |
558 __ movptr(rax, Address(rdi, Interpreter::local_offset_in_bytes(0))); // get receiver (assume this is frequent case) | 558 __ movptr(rax, Address(rdi, Interpreter::local_offset_in_bytes(0))); // get receiver (assume this is frequent case) |
559 __ jcc(Assembler::zero, done); | 559 __ jcc(Assembler::zero, done); |
560 __ movptr(rax, Address(rbx, methodOopDesc::constants_offset())); | 560 __ movptr(rax, Address(rbx, methodOopDesc::constants_offset())); |
1010 // set result handler | 1010 // set result handler |
1011 __ movptr(Address(rbp, frame::interpreter_frame_result_handler_offset*wordSize), rax); | 1011 __ movptr(Address(rbp, frame::interpreter_frame_result_handler_offset*wordSize), rax); |
1012 | 1012 |
1013 // pass mirror handle if static call | 1013 // pass mirror handle if static call |
1014 { Label L; | 1014 { Label L; |
1015 const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes(); | 1015 const int mirror_offset = in_bytes(Klass::java_mirror_offset()); |
1016 __ movl(t, Address(method, methodOopDesc::access_flags_offset())); | 1016 __ movl(t, Address(method, methodOopDesc::access_flags_offset())); |
1017 __ testl(t, JVM_ACC_STATIC); | 1017 __ testl(t, JVM_ACC_STATIC); |
1018 __ jcc(Assembler::zero, L); | 1018 __ jcc(Assembler::zero, L); |
1019 // get mirror | 1019 // get mirror |
1020 __ movptr(t, Address(method, methodOopDesc:: constants_offset())); | 1020 __ movptr(t, Address(method, methodOopDesc:: constants_offset())); |