Rebase of partial ia32 implementation of optimized try/catch (started by Kevin Millikin, continued …

src/objects.h

 // Copyright 2012 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 4246 matching lines @@
 
 // DeoptimizationInputData is a fixed array used to hold the deoptimization
 // data for code generated by the Hydrogen/Lithium compiler.  It also
 // contains information about functions that were inlined.  If N different
 // functions were inlined then first N elements of the literal array will
 // contain these functions.
 //
 // It can be empty.
 class DeoptimizationInputData: public FixedArray {
  public:
-  // Layout description.  Indices in the array.
-  static const int kTranslationByteArrayIndex = 0;
-  static const int kInlinedFunctionCountIndex = 1;
-  static const int kLiteralArrayIndex = 2;
-  static const int kOsrAstIdIndex = 3;
-  static const int kOsrPcOffsetIndex = 4;
-  static const int kFirstDeoptEntryIndex = 5;
+  // Fixed array consists of a header and sequence of entries.
 
-  // Offsets of deopt entry elements relative to the start of the entry.
-  static const int kAstIdRawOffset = 0;
-  static const int kTranslationIndexOffset = 1;
-  static const int kArgumentsStackHeightOffset = 2;
-  static const int kPcOffset = 3;
-  static const int kDeoptEntrySize = 4;
+  // ==== Header field names and types.
+#define FOR_EACH_HEADER_FIELD(F)                \
+  F(TranslationByteArray, ByteArray)            \
+  F(InlinedFunctionCount, Smi)                  \
+  F(LiteralArray, FixedArray)                   \
+  F(OsrAstId, Smi)                              \
+  F(OsrPcOffset, Smi)
 
-  // Simple element accessors.
-#define DEFINE_ELEMENT_ACCESSORS(name, type)      \
+  // Header layout description by an enum.  Value is an index into the fixed
+  // array.
+#define MAKE_TAG(name, type) k##name##Index,
+  enum {
+    FOR_EACH_HEADER_FIELD(MAKE_TAG)
+    kFirstDeoptEntryIndex  // Pseudo-tag.
+  };
+#undef MAKE_TAG
+
+  // Header field accessors.
+#define DEFINE_HEADER_ACCESSORS(name, type)       \
   type* name() {                                  \
     return type::cast(get(k##name##Index));       \
   }                                               \
   void Set##name(type* value) {                   \
     set(k##name##Index, value);                   \
   }
 
-  DEFINE_ELEMENT_ACCESSORS(TranslationByteArray, ByteArray)
-  DEFINE_ELEMENT_ACCESSORS(InlinedFunctionCount, Smi)
-  DEFINE_ELEMENT_ACCESSORS(LiteralArray, FixedArray)
-  DEFINE_ELEMENT_ACCESSORS(OsrAstId, Smi)
-  DEFINE_ELEMENT_ACCESSORS(OsrPcOffset, Smi)
+  FOR_EACH_HEADER_FIELD(DEFINE_HEADER_ACCESSORS)
 
-#undef DEFINE_ELEMENT_ACCESSORS
+#undef DEFINE_HEADER_ACCESSORS
+#undef FOR_EACH_HEADER_FIELD
 
-  // Accessors for elements of the ith deoptimization entry.
+  // ==== Entry field names and types.
+#define FOR_EACH_ENTRY_FIELD(F)                 \
+  F(AstIdRaw, Smi)                              \
+  F(TranslationIndex, Smi)                      \
+  F(ArgumentsStackHeight, Smi)                  \
+  F(HandlerCount, Smi)                          \
+  F(Pc, Smi)
+
+  // Entry layout description by an enum.  Value is an offset relative to
+  // the start of the entry.
+#define MAKE_TAG(name, type) k##name##Offset,
+  enum {
+    FOR_EACH_ENTRY_FIELD(MAKE_TAG)
+    kDeoptEntrySize  // Pseudo-value
+  };
+#undef MAKE_TAG
+
+  // Accessors for fields of the ith deoptimization entry.
 #define DEFINE_ENTRY_ACCESSORS(name, type)                       \
   type* name(int i) {                                            \
     return type::cast(get(IndexForEntry(i) + k##name##Offset));  \
   }                                                              \
   void Set##name(int i, type* value) {                           \
     set(IndexForEntry(i) + k##name##Offset, value);              \
   }
 
-  DEFINE_ENTRY_ACCESSORS(AstIdRaw, Smi)
-  DEFINE_ENTRY_ACCESSORS(TranslationIndex, Smi)
-  DEFINE_ENTRY_ACCESSORS(ArgumentsStackHeight, Smi)
-  DEFINE_ENTRY_ACCESSORS(Pc, Smi)
+  FOR_EACH_ENTRY_FIELD(DEFINE_ENTRY_ACCESSORS)
 
 #undef DEFINE_ENTRY_ACCESSORS
+#undef FOR_EACH_ENTRY_FIELD
 
   BailoutId AstId(int i) {
     return BailoutId(AstIdRaw(i)->value());
   }
 
   void SetAstId(int i, BailoutId value) {
     SetAstIdRaw(i, Smi::FromInt(value.ToInt()));
   }
 
   int DeoptCount() {
@@ skipping 1865 matching lines @@
   // Indicates that the function is anonymous (the name field can be set
   // through the API, which does not change this flag).
   DECL_BOOLEAN_ACCESSORS(is_anonymous)
 
   // Is this a function or top-level/eval code.
   DECL_BOOLEAN_ACCESSORS(is_function)
 
   // Indicates that the function cannot be optimized.
   DECL_BOOLEAN_ACCESSORS(dont_optimize)
 
+  // Indicates that the function cannot be on stack replaced.
+  DECL_BOOLEAN_ACCESSORS(dont_osr)
+
   // Indicates that the function cannot be inlined.
   DECL_BOOLEAN_ACCESSORS(dont_inline)
 
   // Indicates that code for this function cannot be cached.
   DECL_BOOLEAN_ACCESSORS(dont_cache)
 
   // Indicates that code for this function cannot be flushed.
   DECL_BOOLEAN_ACCESSORS(dont_flush)
 
   // Indicates that this function is a generator.
@@ skipping 185 matching lines @@
     kStrictModeFunction,
     kExtendedModeFunction,
     kUsesArguments,
     kHasDuplicateParameters,
     kNative,
     kBoundFunction,
     kIsAnonymous,
     kNameShouldPrintAsAnonymous,
     kIsFunction,
     kDontOptimize,
+    kDontOsr,
     kDontInline,
     kDontCache,
     kDontFlush,
     kIsGenerator,
     kCompilerHintsCount  // Pseudo entry
   };
 
   class DeoptCountBits: public BitField<int, 0, 4> {};
   class OptReenableTriesBits: public BitField<int, 4, 18> {};
   class ICAgeBits: public BitField<int, 22, 8> {};
@@ skipping 3314 matching lines @@
     } else {
       value &= ~(1 << bit_position);
     }
     return value;
   }
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_H_