ARM native regexps.

src/heap.h

 // Copyright 2006-2008 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 16 matching lines @@
 
 #ifndef V8_HEAP_H_
 #define V8_HEAP_H_
 
 #include "zone-inl.h"
 
 namespace v8 {
 namespace internal {
 
 // Defines all the roots in Heap.
-#define STRONG_ROOT_LIST(V)                                                    \
+#define UNCONDITIONAL_STRONG_ROOT_LIST(V)                                      \
   V(Map, meta_map, MetaMap)                                                    \
   V(Map, heap_number_map, HeapNumberMap)                                       \
   V(Map, short_string_map, ShortStringMap)                                     \
   V(Map, medium_string_map, MediumStringMap)                                   \
   V(Map, long_string_map, LongStringMap)                                       \
   V(Map, short_ascii_string_map, ShortAsciiStringMap)                          \
   V(Map, medium_ascii_string_map, MediumAsciiStringMap)                        \
   V(Map, long_ascii_string_map, LongAsciiStringMap)                            \
   V(Map, short_symbol_map, ShortSymbolMap)                                     \
   V(Map, medium_symbol_map, MediumSymbolMap)                                   \
@@ skipping 80 matching lines @@
   V(Code, js_entry_code, JsEntryCode)                                          \
   V(Code, js_construct_entry_code, JsConstructEntryCode)                       \
   V(Code, c_entry_code, CEntryCode)                                            \
   V(Code, c_entry_debug_break_code, CEntryDebugBreakCode)                      \
   V(FixedArray, number_string_cache, NumberStringCache)                        \
   V(FixedArray, single_character_string_cache, SingleCharacterStringCache)     \
   V(FixedArray, natives_source_cache, NativesSourceCache)                      \
   V(Object, last_script_id, LastScriptId)                                      \
   V(Smi, stack_limit, StackLimit)
 
+#if V8_TARGET_ARCH_ARM && V8_NATIVE_REGEXP

[Erik Corry, 2009/08/28 09:47:03]

Ugh

[Lasse Reichstein, 2009/08/28 11:43:15]

Agree, but it still seems better than having an unused strong root in the other
cases.

+#define STRONG_ROOT_LIST(V)                                                    \
+  UNCONDITIONAL_STRONG_ROOT_LIST(V)                                            \
+  V(Code, re_c_entry_code, RegExpCEntryCode)
+#else
+#define STRONG_ROOT_LIST(V) UNCONDITIONAL_STRONG_ROOT_LIST(V)
+#endif
 
 #define ROOT_LIST(V)                                  \
   STRONG_ROOT_LIST(V)                                 \
   V(SymbolTable, symbol_table, SymbolTable)
 
 #define SYMBOL_LIST(V)                                                   \
   V(Array_symbol, "Array")                                               \
   V(Object_symbol, "Object")                                             \
   V(Proto_symbol, "__proto__")                                           \
   V(StringImpl_symbol, "StringImpl")                                     \
@@ skipping 869 matching lines @@
 
   static bool CreateInitialMaps();
   static bool CreateInitialObjects();
 
   // These four Create*EntryStub functions are here because of a gcc-4.4 bug
   // that assigns wrong vtable entries.
   static void CreateCEntryStub();
   static void CreateCEntryDebugBreakStub();
   static void CreateJSEntryStub();
   static void CreateJSConstructEntryStub();
+#if V8_TARGET_ARCH_ARM && V8_NATIVE_REGEXP

[Erik Corry, 2009/08/28 09:47:03]

Can't we remove the #if here?

[Lasse Reichstein, 2009/08/28 11:43:15]

Sure. We still won't implement the function unless we are using native regexps
on ARM.

+  static void CreateRegExpCEntryStub();
+#endif
   static void CreateFixedStubs();
 
   static Object* CreateOddball(Map* map,
                                const char* to_string,
                                Object* to_number);
 
   // Allocate empty fixed array.
   static Object* AllocateEmptyFixedArray();
 
   // Performs a minor collection in new generation.
@@ skipping 468 matching lines @@
   int marked_count_;
 
   // The count from the end of the previous full GC.  Will be zero if there
   // was no previous full GC.
   int previous_marked_count_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_H_