Unify deoptimizer for stub failure trampoline frames.

src/arm/frames-arm.cc

Index: src/arm/frames-arm.cc
diff --git a/src/arm/frames-arm.cc b/src/arm/frames-arm.cc
index a805d280cad070f444d99b7aac1a5e4f2948681c..5cbe77afc2d74f060e34c5848f16bb961187279a 100644
--- a/src/arm/frames-arm.cc
+++ b/src/arm/frames-arm.cc
@@ -29,7 +29,12 @@
 
 #if defined(V8_TARGET_ARCH_ARM)
 
+#include "assembler.h"
+#include "assembler-arm.h"
+#include "assembler-arm-inl.h"
 #include "frames-inl.h"
+#include "macro-assembler.h"
+#include "macro-assembler-arm.h"

[danno, 2013/03/05 13:54:04]

Why the different includes here compared to other platforms?

[Michael Starzinger, 2013/03/08 11:54:09]

Unfortunately the "cp" register is defined as part of the MacroAssembler whereas
all other registers are defined as part of the Assembler on ARM. On the other
architectures all of the registers are defined as part of the Assembler.

 
 namespace v8 {
 namespace internal {
@@ -40,6 +45,10 @@ Address ExitFrame::ComputeStackPointer(Address fp) {
 }
 
 
+Register StubFailureTrampolineFrame::fp_register() { return v8::internal::fp; }
+Register StubFailureTrampolineFrame::context_register() { return cp; }
+
+
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM