Mercurial > hg > graal-compiler
comparison src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp @ 4762:069ab3f976d3
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 | 3d42f82cd811 |
children | da91efe96a93 |
comparison
equal
deleted
inserted
replaced
4761:65149e74c706 | 4762:069ab3f976d3 |
---|---|
179 | 179 |
180 | 180 |
181 void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register t1, Register t2) { | 181 void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register t1, Register t2) { |
182 assert_different_registers(obj, klass, len, t1, t2); | 182 assert_different_registers(obj, klass, len, t1, t2); |
183 if (UseBiasedLocking && !len->is_valid()) { | 183 if (UseBiasedLocking && !len->is_valid()) { |
184 ld_ptr(klass, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes(), t1); | 184 ld_ptr(klass, in_bytes(Klass::prototype_header_offset()), t1); |
185 } else { | 185 } else { |
186 set((intx)markOopDesc::prototype(), t1); | 186 set((intx)markOopDesc::prototype(), t1); |
187 } | 187 } |
188 st_ptr(t1, obj, oopDesc::mark_offset_in_bytes()); | 188 st_ptr(t1, obj, oopDesc::mark_offset_in_bytes()); |
189 if (UseCompressedOops) { | 189 if (UseCompressedOops) { |
250 initialize_header(obj, klass, noreg, t1, t2); | 250 initialize_header(obj, klass, noreg, t1, t2); |
251 | 251 |
252 #ifdef ASSERT | 252 #ifdef ASSERT |
253 { | 253 { |
254 Label ok; | 254 Label ok; |
255 ld(klass, klassOopDesc::header_size() * HeapWordSize + Klass::layout_helper_offset_in_bytes(), t1); | 255 ld(klass, in_bytes(Klass::layout_helper_offset()), t1); |
256 if (var_size_in_bytes != noreg) { | 256 if (var_size_in_bytes != noreg) { |
257 cmp_and_brx_short(t1, var_size_in_bytes, Assembler::equal, Assembler::pt, ok); | 257 cmp_and_brx_short(t1, var_size_in_bytes, Assembler::equal, Assembler::pt, ok); |
258 } else { | 258 } else { |
259 cmp_and_brx_short(t1, con_size_in_bytes, Assembler::equal, Assembler::pt, ok); | 259 cmp_and_brx_short(t1, con_size_in_bytes, Assembler::equal, Assembler::pt, ok); |
260 } | 260 } |