Move ExitFrame::ComputeStackPointer from frames-<arch>.cc to frames.cc

The method has identical implementation for all architectures. Moved it into frames.cc

Drive-by: deleted SafeStackFrameIterator::is_working_iterator_, SafeStackFrameIterator::iteration_done_ is used instead.
BUG=None
R=loislo@chromium.org, svenpanne@chromium.org

Review URL: https://codereview.chromium.org/17581004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15293 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/arm/frames-arm.cc b/src/arm/frames-arm.cc
index f5a7dbd..72fc5ce 100644 (file)
--- a/src/arm/frames-arm.cc
+++ b/src/arm/frames-arm.cc
@@ -32,7 +32,7 @@
 #include "assembler.h"
 #include "assembler-arm.h"
 #include "assembler-arm-inl.h"
-#include "frames-inl.h"
+#include "frames.h"
 #include "macro-assembler.h"
 #include "macro-assembler-arm.h"
 
@@ -40,11 +40,6 @@ namespace v8 {
 namespace internal {
 
 
-Address ExitFrame::ComputeStackPointer(Address fp) {
-  return Memory::Address_at(fp + ExitFrameConstants::kSPOffset);
-}
-
-
 Register JavaScriptFrame::fp_register() { return v8::internal::fp; }
 Register JavaScriptFrame::context_register() { return cp; }
 

diff --git a/src/frames.cc b/src/frames.cc
index 16b73c0..5ea0fd8 100644 (file)
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -289,8 +289,7 @@ SafeStackFrameIterator::SafeStackFrameIterator(
     stack_validator_(low_bound, high_bound),
     is_valid_top_(IsValidTop(isolate, low_bound, high_bound)),
     is_valid_fp_(IsWithinBounds(low_bound, high_bound, fp)),
-    is_working_iterator_(is_valid_top_ || is_valid_fp_),
-    iteration_done_(!is_working_iterator_),
+    iteration_done_(!is_valid_top_ && !is_valid_fp_),
     iterator_(isolate, is_valid_top_, is_valid_fp_ ? fp : NULL, sp) {
 }
 
@@ -310,7 +309,6 @@ bool SafeStackFrameIterator::IsValidTop(Isolate* isolate,
 
 
 void SafeStackFrameIterator::Advance() {
-  ASSERT(is_working_iterator_);
   ASSERT(!done());
   StackFrame* last_frame = iterator_.frame();
   Address last_sp = last_frame->sp(), last_fp = last_frame->fp();
@@ -564,6 +562,11 @@ StackFrame::Type ExitFrame::GetStateForFramePointer(Address fp, State* state) {
 }
 
 
+Address ExitFrame::ComputeStackPointer(Address fp) {
+  return Memory::Address_at(fp + ExitFrameConstants::kSPOffset);
+}
+
+
 void ExitFrame::FillState(Address fp, Address sp, State* state) {
   state->sp = sp;
   state->fp = fp;

diff --git a/src/frames.h b/src/frames.h
index 53668d0..5c3acf2 100644 (file)
--- a/src/frames.h
+++ b/src/frames.h
@@ -860,7 +860,6 @@ class JavaScriptFrameIterator BASE_EMBEDDED {
 // functions in runtime.js.
 class StackTraceFrameIterator: public JavaScriptFrameIterator {
  public:
-  StackTraceFrameIterator();
   explicit StackTraceFrameIterator(Isolate* isolate);
   void Advance();
 
@@ -876,22 +875,22 @@ class SafeStackFrameIterator BASE_EMBEDDED {
                          Address low_bound, Address high_bound);
 
   StackFrame* frame() const {
-    ASSERT(is_working_iterator_);
+    ASSERT(!iteration_done_);
     return iterator_.frame();
   }
 
-  bool done() const { return iteration_done_ ? true : iterator_.done(); }
+  bool done() const { return iteration_done_ || iterator_.done(); }
 
   void Advance();
 
   static bool is_active(Isolate* isolate);
 
+ private:
   static bool IsWithinBounds(
       Address low_bound, Address high_bound, Address addr) {
     return low_bound <= addr && addr <= high_bound;
   }
 
- private:
   class StackAddressValidator {
    public:
     StackAddressValidator(Address low_bound, Address high_bound)
@@ -941,7 +940,6 @@ class SafeStackFrameIterator BASE_EMBEDDED {
   StackAddressValidator stack_validator_;
   const bool is_valid_top_;
   const bool is_valid_fp_;
-  const bool is_working_iterator_;
   bool iteration_done_;
   StackFrameIterator iterator_;
 };

diff --git a/src/ia32/frames-ia32.cc b/src/ia32/frames-ia32.cc
index ea19e9f..61d6876 100644 (file)
--- a/src/ia32/frames-ia32.cc
+++ b/src/ia32/frames-ia32.cc
@@ -32,17 +32,12 @@
 #include "assembler.h"
 #include "assembler-ia32.h"
 #include "assembler-ia32-inl.h"
-#include "frames-inl.h"
+#include "frames.h"
 
 namespace v8 {
 namespace internal {
 
 
-Address ExitFrame::ComputeStackPointer(Address fp) {
-  return Memory::Address_at(fp + ExitFrameConstants::kSPOffset);
-}
-
-
 Register JavaScriptFrame::fp_register() { return ebp; }
 Register JavaScriptFrame::context_register() { return esi; }
 

diff --git a/src/mips/frames-mips.cc b/src/mips/frames-mips.cc
index 540caa9..d070b56 100644 (file)
--- a/src/mips/frames-mips.cc
+++ b/src/mips/frames-mips.cc
@@ -33,20 +33,12 @@
 #include "assembler.h"
 #include "assembler-mips.h"
 #include "assembler-mips-inl.h"
-#include "frames-inl.h"
-#include "mips/assembler-mips-inl.h"
-#include "macro-assembler.h"
-#include "macro-assembler-mips.h"
+#include "frames.h"
 
 namespace v8 {
 namespace internal {
 
 
-Address ExitFrame::ComputeStackPointer(Address fp) {
-  return Memory::Address_at(fp + ExitFrameConstants::kSPOffset);
-}
-
-
 Register JavaScriptFrame::fp_register() { return v8::internal::fp; }
 Register JavaScriptFrame::context_register() { return cp; }
 

diff --git a/src/x64/frames-x64.cc b/src/x64/frames-x64.cc
index a811a34..21cb79c 100644 (file)
--- a/src/x64/frames-x64.cc
+++ b/src/x64/frames-x64.cc
@@ -32,17 +32,12 @@
 #include "assembler.h"
 #include "assembler-x64.h"
 #include "assembler-x64-inl.h"
-#include "frames-inl.h"
+#include "frames.h"
 
 namespace v8 {
 namespace internal {
 
 
-Address ExitFrame::ComputeStackPointer(Address fp) {
-  return Memory::Address_at(fp + ExitFrameConstants::kSPOffset);
-}
-
-
 Register JavaScriptFrame::fp_register() { return rbp; }
 Register JavaScriptFrame::context_register() { return rsi; }