Mercurial > hg > truffle

comparison src/gpu/hsail/vm/gpu_hsail.cpp @ 18043:f55f2d400797

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some format strings
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 20:34:55 +0200
parents 2d6dd2eebd51
children 82e5b5ccdb0c
comparison
equal deleted inserted replaced
18042:3498d73280c8 18043:f55f2d400797
249 int myActionReason = Deoptimization::make_trap_request(Deoptimization::trap_request_reason(pdeopt->reason()), Deoptimization::Action_none); 249 int myActionReason = Deoptimization::make_trap_request(Deoptimization::trap_request_reason(pdeopt->reason()), Deoptimization::Action_none);
250 javaArgs.push_int(myActionReason); 250 javaArgs.push_int(myActionReason);
251 javaArgs.push_oop((oop) NULL); 251 javaArgs.push_oop((oop) NULL);
252 javaArgs.push_int(mh->size_of_parameters()); 252 javaArgs.push_int(mh->size_of_parameters());
253 if (TraceGPUInteraction) { 253 if (TraceGPUInteraction) {
254 tty->print_cr("[HSAIL] Deoptimizing to host for workitem=%d (slot=%d) with deoptId=%d, frame=" INTPTR_FORMAT ", actionAndReason=%d", workitem, k, deoptId, hsailFrame, myActionReason); 254 tty->print_cr("[HSAIL] Deoptimizing to host for workitem=%d (slot=%d) with deoptId=%d, frame=" INTPTR_FORMAT ", actionAndReason=%d", workitem, k, deoptId, p2i(hsailFrame), myActionReason);
255 // show the $d registers or stack slots containing references 255 // show the $d registers or stack slots containing references
256 int maxOopBits = hsailFrame->num_d_regs() + hsailFrame->num_stack_slots(); 256 int maxOopBits = hsailFrame->num_d_regs() + hsailFrame->num_stack_slots();
257 HSAILOopMapHelper oopMapHelper(oop_map_array); 257 HSAILOopMapHelper oopMapHelper(oop_map_array);
258 int pc_offset = hsailFrame->pc_offset(); 258 int pc_offset = hsailFrame->pc_offset();
259 for (int bit = 0; bit < maxOopBits; bit++) { 259 for (int bit = 0; bit < maxOopBits; bit++) {
260 if (oopMapHelper.is_oop(pc_offset, bit)) { 260 if (oopMapHelper.is_oop(pc_offset, bit)) {
261 if (bit < hsailFrame->num_d_regs()) { 261 if (bit < hsailFrame->num_d_regs()) {
262 // show $d reg oop 262 // show $d reg oop
263 tty->print_cr(" oop $d%d = %p", bit, hsailFrame->get_oop_for_bit(bit)); 263 tty->print_cr(" oop $d%d = " INTPTR_FORMAT, bit, hsailFrame->get_oop_for_bit(bit));
264 } else { 264 } else {
265 // show stack slot oop 265 // show stack slot oop
266 int stackOffset = (bit - hsailFrame->num_d_regs()) * 8; // 8 bytes per stack slot 266 int stackOffset = (bit - hsailFrame->num_d_regs()) * 8; // 8 bytes per stack slot
267 tty->print_cr(" oop stk:%d = %p", stackOffset, hsailFrame->get_oop_for_bit(bit)); 267 tty->print_cr(" oop stk:%d = " INTPTR_FORMAT, stackOffset, hsailFrame->get_oop_for_bit(bit));
268 } 268 }
269 } 269 }
270 } 270 }
271 } 271 }
272 JavaCalls::call(&result, mh, &javaArgs, THREAD); 272 JavaCalls::call(&result, mh, &javaArgs, THREAD);
458 458
459 459
460 void Hsail::HSAILDeoptimizationInfo::oops_do(OopClosure* f) { 460 void Hsail::HSAILDeoptimizationInfo::oops_do(OopClosure* f) {
461 int unprocessed_deopts = num_deopts() - deopt_work_index(); 461 int unprocessed_deopts = num_deopts() - deopt_work_index();
462 if (TraceGPUInteraction) { 462 if (TraceGPUInteraction) {
463 tty->print_cr("HSAILDeoptimizationInfo::oops_do deopt_occurred=%d, total_deopts=%d, unprocessed_deopts=%d, oop_map_array=%p", _deopt_occurred, num_deopts(), unprocessed_deopts, _oop_map_array); 463 tty->print_cr("HSAILDeoptimizationInfo::oops_do deopt_occurred=%d, total_deopts=%d, unprocessed_deopts=%d, oop_map_array=" INTPTR_FORMAT, _deopt_occurred, num_deopts(), unprocessed_deopts, p2i(_oop_map_array));
464 } 464 }
465 if (num_deopts() == 0 || unprocessed_deopts <= 0) { 465 if (num_deopts() == 0 || unprocessed_deopts <= 0) {
466 return; // nothing to do 466 return; // nothing to do
467 } 467 }
468 HSAILOopMapHelper oopMapHelper(_oop_map_array); 468 HSAILOopMapHelper oopMapHelper(_oop_map_array);