Index: src/arm/frames-arm.h |
diff --git a/src/arm/frames-arm.h b/src/arm/frames-arm.h |
index 1ea7b1af567413eca93068c02dcd2bca80d7a1c4..37927758c3559dda43f8eb6ef13fa61c88bf906d 100644 |
--- a/src/arm/frames-arm.h |
+++ b/src/arm/frames-arm.h |
@@ -93,16 +93,11 @@ class EntryFrameConstants : public AllStatic { |
-(StandardFrameConstants::kFixedFrameSizeFromFp + kPointerSize); |
}; |
- |
-class ExitFrameConstants : public AllStatic { |
+class ExitFrameConstants : public TypedFrameConstants { |
public: |
- static const int kFrameSize = |
- FLAG_enable_embedded_constant_pool ? 3 * kPointerSize : 2 * kPointerSize; |
- |
- static const int kConstantPoolOffset = |
- FLAG_enable_embedded_constant_pool ? -3 * kPointerSize : 0; |
- static const int kCodeOffset = -2 * kPointerSize; |
- static const int kSPOffset = -1 * kPointerSize; |
+ static const int kSPOffset = TYPED_FRAME_PUSHED_VALUE_OFFSET(0); |
+ static const int kCodeOffset = TYPED_FRAME_PUSHED_VALUE_OFFSET(1); |
+ DEFINE_TYPED_FRAME_SIZES(2); |
// The caller fields are below the frame pointer on the stack. |
static const int kCallerFPOffset = 0 * kPointerSize; |
@@ -120,7 +115,7 @@ class JavaScriptFrameConstants : public AllStatic { |
// FP-relative. |
static const int kLocal0Offset = StandardFrameConstants::kExpressionsOffset; |
static const int kLastParameterOffset = +2 * kPointerSize; |
- static const int kFunctionOffset = StandardFrameConstants::kMarkerOffset; |
+ static const int kFunctionOffset = StandardFrameConstants::kFunctionOffset; |
// Caller SP-relative. |
static const int kParam0Offset = -2 * kPointerSize; |