Mercurial > hg > truffle
comparison src/share/vm/graal/graalCodeInstaller.cpp @ 7081:3e61ffb9ce29
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Wed, 28 Nov 2012 09:01:39 +0100 |
parents | c2a3b92c9e79 b6a8f2d23057 |
children | 9ba90252ce08 |
comparison
equal
deleted
inserted
replaced
7080:15055bdafbfc | 7081:3e61ffb9ce29 |
---|---|
528 | 528 |
529 DebugToken* locals_token = _debug_recorder->create_scope_values(locals); | 529 DebugToken* locals_token = _debug_recorder->create_scope_values(locals); |
530 DebugToken* expressions_token = _debug_recorder->create_scope_values(expressions); | 530 DebugToken* expressions_token = _debug_recorder->create_scope_values(expressions); |
531 DebugToken* monitors_token = _debug_recorder->create_monitor_values(monitors); | 531 DebugToken* monitors_token = _debug_recorder->create_monitor_values(monitors); |
532 | 532 |
533 GrowableArray<DeferredWriteValue*>* deferred_writes = new GrowableArray<DeferredWriteValue*> (); | |
534 // deferred_writes->append(new DeferredWriteValue(new LocationValue(Location::new_reg_loc(Location::lng, rax->as_VMReg())), new ConstantIntValue(0), 0, 100, new ConstantIntValue(123))); | |
535 DebugToken* deferred_writes_token = _debug_recorder->create_deferred_writes(deferred_writes); | |
536 | |
533 bool throw_exception = BytecodeFrame::rethrowException(frame) == JNI_TRUE; | 537 bool throw_exception = BytecodeFrame::rethrowException(frame) == JNI_TRUE; |
534 | 538 |
535 _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, false, locals_token, expressions_token, monitors_token); | 539 _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, false, locals_token, expressions_token, monitors_token, deferred_writes_token); |
536 } | 540 } |
537 | 541 |
538 void CodeInstaller::site_Safepoint(CodeBuffer& buffer, jint pc_offset, oop site) { | 542 void CodeInstaller::site_Safepoint(CodeBuffer& buffer, jint pc_offset, oop site) { |
539 oop debug_info = CompilationResult_Safepoint::debugInfo(site); | 543 oop debug_info = CompilationResult_Safepoint::debugInfo(site); |
540 assert(debug_info != NULL, "debug info expected"); | 544 assert(debug_info != NULL, "debug info expected"); |