Remove dependence of code-stubs on codegen, the virtual frame code generator....

src/arm/code-stubs-arm.h

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 10 matching lines @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef V8_ARM_CODE_STUBS_ARM_H_
 #define V8_ARM_CODE_STUBS_ARM_H_
 
-#include "codegen-inl.h"
 #include "ic-inl.h"
-#include "ast.h"
 
 namespace v8 {
 namespace internal {
 
 
 // Compute a transcendental math function natively, or call the
 // TranscendentalCache runtime function.
 class TranscendentalCacheStub: public CodeStub {
  public:
   explicit TranscendentalCacheStub(TranscendentalCache::Type type)
@@ skipping 15 matching lines @@
 
  private:
   Register tos_;
   Major MajorKey() { return ToBoolean; }
   int MinorKey() { return tos_.code(); }
 };
 
 
 class GenericBinaryOpStub : public CodeStub {
  public:
+  static const int kUnknownIntValue = -1;
+
   GenericBinaryOpStub(Token::Value op,
                       OverwriteMode mode,
                       Register lhs,
                       Register rhs,
-                      int constant_rhs = CodeGenerator::kUnknownIntValue)
+                      int constant_rhs = kUnknownIntValue)
       : op_(op),
         mode_(mode),
         lhs_(lhs),
         rhs_(rhs),
         constant_rhs_(constant_rhs),
         specialized_on_rhs_(RhsIsOneWeWantToOptimizeFor(op, constant_rhs)),
         runtime_operands_type_(BinaryOpIC::DEFAULT),
         name_(NULL) { }
 
   GenericBinaryOpStub(int key, BinaryOpIC::TypeInfo type_info)
@@ skipping 43 matching lines @@
                              Register lhs,
                              Register rhs);
   void HandleBinaryOpSlowCases(MacroAssembler* masm,
                                Label* not_smi,
                                Register lhs,
                                Register rhs,
                                const Builtins::JavaScript& builtin);
   void GenerateTypeTransition(MacroAssembler* masm);
 
   static bool RhsIsOneWeWantToOptimizeFor(Token::Value op, int constant_rhs) {
-    if (constant_rhs == CodeGenerator::kUnknownIntValue) return false;
+    if (constant_rhs == kUnknownIntValue) return false;
     if (op == Token::DIV) return constant_rhs >= 2 && constant_rhs <= 3;
     if (op == Token::MOD) {
       if (constant_rhs <= 1) return false;
       if (constant_rhs <= 10) return true;
       if (constant_rhs <= kMaxKnownRhs && IsPowerOf2(constant_rhs)) return true;
       return false;
     }
     return false;
   }
 
@@ skipping 315 matching lines @@
 #ifdef DEBUG
   void Print() {
     PrintF("RecordWriteStub (object reg %d), (offset reg %d),"
            " (scratch reg %d)\n",
            object_.code(), offset_.code(), scratch_.code());
   }
 #endif
 };
 
 
+// Enter C code from generated RegExp code in a way that allows
+// the C code to fix the return address in case of a GC.
+// Currently only needed on ARM.
+class RegExpCEntryStub: public CodeStub {
+ public:
+  RegExpCEntryStub() {}
+  virtual ~RegExpCEntryStub() {}
+  void Generate(MacroAssembler* masm);
+
+ private:
+  Major MajorKey() { return RegExpCEntry; }
+  int MinorKey() { return 0; }
+  const char* GetName() { return "RegExpCEntryStub"; }
+};
+
+
 } }  // namespace v8::internal
 
 #endif  // V8_ARM_CODE_STUBS_ARM_H_