Mercurial > hg > truffle

comparison src/cpu/x86/vm/c1_MacroAssembler_x86.cpp @ 4974:ab906cea36f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
4973:5d154704b04c 4974:ab906cea36f7
287 t1_zero);) 287 t1_zero);)
288 decrement(index); 288 decrement(index);
289 jcc(Assembler::notZero, loop); 289 jcc(Assembler::notZero, loop);
290 } 290 }
291 } 291 }
292 292
293 // (tw) fix me 293 #ifndef GRAAL
294 // if (CURRENT_ENV->dtrace_alloc_probes()) { 294 // TODO(tw): Check how we can access the flag without a ciEnv object.
295 // assert(obj == rax, "must be"); 295 if (CURRENT_ENV->dtrace_alloc_probes()) {
296 // call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id))); 296 assert(obj == rax, "must be");
297 // } 297 call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id)));
298 }
299 #endif
298 300
299 verify_oop(obj); 301 verify_oop(obj);
300 } 302 }
301 303
302 void C1_MacroAssembler::allocate_array(Register obj, Register len, Register t1, Register t2, int header_size, Address::ScaleFactor f, Register klass, Label& slow_case) { 304 void C1_MacroAssembler::allocate_array(Register obj, Register len, Register t1, Register t2, int header_size, Address::ScaleFactor f, Register klass, Label& slow_case) {
322 324
323 // clear rest of allocated space 325 // clear rest of allocated space
324 const Register len_zero = len; 326 const Register len_zero = len;
325 initialize_body(obj, arr_size, header_size * BytesPerWord, len_zero); 327 initialize_body(obj, arr_size, header_size * BytesPerWord, len_zero);
326 328
327 // TODO(tw): Re-enable this code once Graal no longer uses this method. 329
328 // if (CURRENT_ENV->dtrace_alloc_probes()) { 330 #ifndef GRAAL
329 // assert(obj == rax, "must be"); 331 // TODO(tw): Check how we can access the flag without a ciEnv object.
330 // call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id))); 332 if (CURRENT_ENV->dtrace_alloc_probes()) {
331 // } 333 assert(obj == rax, "must be");
334 call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id)));
335 }
336 #endif
332 337
333 verify_oop(obj); 338 verify_oop(obj);
334 } 339 }
335 340
336 341