Index: runtime/vm/code_patcher_arm.cc |
diff --git a/runtime/vm/code_patcher_arm.cc b/runtime/vm/code_patcher_arm.cc |
index 49477c9deba013a791b3a6f1c6a19bedcc0cdb6c..c8a1e1b42a290c902b71e133923b15b16a6df24b 100644 |
--- a/runtime/vm/code_patcher_arm.cc |
+++ b/runtime/vm/code_patcher_arm.cc |
@@ -13,48 +13,48 @@ |
namespace dart { |
-uword CodePatcher::GetStaticCallTargetAt(uword return_address, |
- const Code& code) { |
+RawCode* CodePatcher::GetStaticCallTargetAt(uword return_address, |
+ const Code& code) { |
ASSERT(code.ContainsInstructionAt(return_address)); |
CallPattern call(return_address, code); |
- return call.TargetAddress(); |
+ return call.TargetCode(); |
} |
void CodePatcher::PatchStaticCallAt(uword return_address, |
const Code& code, |
- uword new_target) { |
+ const Code& new_target) { |
ASSERT(code.ContainsInstructionAt(return_address)); |
CallPattern call(return_address, code); |
- call.SetTargetAddress(new_target); |
+ call.SetTargetCode(new_target); |
} |
void CodePatcher::PatchInstanceCallAt(uword return_address, |
const Code& code, |
- uword new_target) { |
+ const Code& new_target) { |
ASSERT(code.ContainsInstructionAt(return_address)); |
CallPattern call(return_address, code); |
- call.SetTargetAddress(new_target); |
+ call.SetTargetCode(new_target); |
} |
-void CodePatcher::InsertCallAt(uword start, uword target) { |
+void CodePatcher::InsertDeoptimizationCallAt(uword start, uword target) { |
// The inserted call should not overlap the lazy deopt jump code. |
- ASSERT(start + CallPattern::LengthInBytes() <= target); |
- CallPattern::InsertAt(start, target); |
+ ASSERT(start + CallPattern::DeoptCallPatternLengthInBytes() <= target); |
+ CallPattern::InsertDeoptCallAt(start, target); |
} |
-uword CodePatcher::GetInstanceCallAt(uword return_address, |
- const Code& code, |
- ICData* ic_data) { |
+RawCode* CodePatcher::GetInstanceCallAt(uword return_address, |
+ const Code& code, |
+ ICData* ic_data) { |
ASSERT(code.ContainsInstructionAt(return_address)); |
CallPattern call(return_address, code); |
if (ic_data != NULL) { |
*ic_data = call.IcData(); |
} |
- return call.TargetAddress(); |
+ return call.TargetCode(); |
} |
@@ -84,12 +84,12 @@ void CodePatcher::PatchNativeCallAt(uword return_address, |
const Code& trampoline) { |
ASSERT(code.ContainsInstructionAt(return_address)); |
NativeCallPattern call(return_address, code); |
- call.set_target(trampoline.EntryPoint()); |
+ call.set_target(trampoline); |
call.set_native_function(target); |
} |
-uword CodePatcher::GetNativeCallAt(uword return_address, |
+RawCode* CodePatcher::GetNativeCallAt(uword return_address, |
const Code& code, |
NativeFunction* target) { |
ASSERT(code.ContainsInstructionAt(return_address)); |