Mercurial > hg > truffle

comparison src/cpu/x86/vm/templateInterpreter_x86_64.cpp @ 4762:069ab3f976d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7118863: Move sizeof(klassOopDesc) into the *Klass::*_offset_in_bytes() functions Summary: Moved sizeof(klassOopDesc), changed the return type to ByteSize and removed the _in_bytes suffix. Reviewed-by: never, bdelsart, coleenp, jrose
author stefank
date Wed, 07 Dec 2011 11:35:03 +0100
parents b20d64f83668
children 22cee0ee8927
comparison
equal deleted inserted replaced
4761:65149e74c706 4762:069ab3f976d3
503 } 503 }
504 #endif // ASSERT 504 #endif // ASSERT
505 505
506 // get synchronization object 506 // get synchronization object
507 { 507 {
508 const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + 508 const int mirror_offset = in_bytes(Klass::java_mirror_offset());
509 Klass::java_mirror_offset_in_bytes();
510 Label done; 509 Label done;
511 __ movl(rax, access_flags); 510 __ movl(rax, access_flags);
512 __ testl(rax, JVM_ACC_STATIC); 511 __ testl(rax, JVM_ACC_STATIC);
513 // get receiver (assume this is frequent case) 512 // get receiver (assume this is frequent case)
514 __ movptr(rax, Address(r14, Interpreter::local_offset_in_bytes(0))); 513 __ movptr(rax, Address(r14, Interpreter::local_offset_in_bytes(0)));
1004 rax); 1003 rax);
1005 1004
1006 // pass mirror handle if static call 1005 // pass mirror handle if static call
1007 { 1006 {
1008 Label L; 1007 Label L;
1009 const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + 1008 const int mirror_offset = in_bytes(Klass::java_mirror_offset());
1010 Klass::java_mirror_offset_in_bytes();
1011 __ movl(t, Address(method, methodOopDesc::access_flags_offset())); 1009 __ movl(t, Address(method, methodOopDesc::access_flags_offset()));
1012 __ testl(t, JVM_ACC_STATIC); 1010 __ testl(t, JVM_ACC_STATIC);
1013 __ jcc(Assembler::zero, L); 1011 __ jcc(Assembler::zero, L);
1014 // get mirror 1012 // get mirror
1015 __ movptr(t, Address(method, methodOopDesc::constants_offset())); 1013 __ movptr(t, Address(method, methodOopDesc::constants_offset()));