Moved the builtins used by the debugger to a separate list.

src/builtins.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 34 matching lines @@
   V(HandleApiCallAsFunction)
 
 
 // Define list of builtins implemented in assembly.
 #define BUILTIN_LIST_A(V)                                      \
   V(ArgumentsAdaptorTrampoline, BUILTIN, UNINITIALIZED)        \
   V(JSConstructCall,            BUILTIN, UNINITIALIZED)        \
   V(JSEntryTrampoline,          BUILTIN, UNINITIALIZED)        \
   V(JSConstructEntryTrampoline, BUILTIN, UNINITIALIZED)        \
                                                                \
-  V(Return_DebugBreak,          BUILTIN, DEBUG_BREAK)          \
-  V(Return_DebugBreakEntry,     BUILTIN, DEBUG_BREAK)          \
-  V(ConstructCall_DebugBreak,   BUILTIN, DEBUG_BREAK)          \
-  V(StubNoRegisters_DebugBreak, BUILTIN, DEBUG_BREAK)          \
-                                                               \
   V(LoadIC_Miss,                BUILTIN, UNINITIALIZED)        \
   V(KeyedLoadIC_Miss,           BUILTIN, UNINITIALIZED)        \
   V(StoreIC_Miss,               BUILTIN, UNINITIALIZED)        \
   V(KeyedStoreIC_Miss,          BUILTIN, UNINITIALIZED)        \
                                                                \
   V(StoreIC_ExtendStorage,      BUILTIN, UNINITIALIZED)        \
   V(KeyedStoreIC_ExtendStorage, BUILTIN, UNINITIALIZED)        \
                                                                \
   V(LoadIC_Initialize,          LOAD_IC, UNINITIALIZED)        \
   V(LoadIC_PreMonomorphic,      LOAD_IC, PREMONOMORPHIC)       \
   V(LoadIC_Normal,              LOAD_IC, MONOMORPHIC)          \
   V(LoadIC_ArrayLength,         LOAD_IC, MONOMORPHIC)          \
   V(LoadIC_StringLength,        LOAD_IC, MONOMORPHIC)          \
   V(LoadIC_FunctionPrototype,   LOAD_IC, MONOMORPHIC)          \
   V(LoadIC_Megamorphic,         LOAD_IC, MEGAMORPHIC)          \
-  V(LoadIC_DebugBreak,          LOAD_IC, DEBUG_BREAK)          \
                                                                \
   V(KeyedLoadIC_Initialize,     KEYED_LOAD_IC, UNINITIALIZED)  \
   V(KeyedLoadIC_PreMonomorphic, KEYED_LOAD_IC, PREMONOMORPHIC) \
   V(KeyedLoadIC_Generic,        KEYED_LOAD_IC, MEGAMORPHIC)    \
-  V(KeyedLoadIC_DebugBreak,     KEYED_LOAD_IC, DEBUG_BREAK)    \
                                                                \
   V(StoreIC_Initialize,         STORE_IC, UNINITIALIZED)       \
   V(StoreIC_Megamorphic,        STORE_IC, MEGAMORPHIC)         \
-  V(StoreIC_DebugBreak,         STORE_IC, DEBUG_BREAK)         \
                                                                \
   V(KeyedStoreIC_Initialize,    KEYED_STORE_IC, UNINITIALIZED) \
   V(KeyedStoreIC_Generic,       KEYED_STORE_IC, MEGAMORPHIC)   \
-  V(KeyedStoreIC_DebugBreak,    KEYED_STORE_IC, DEBUG_BREAK)   \
                                                                \
   /* Uses KeyedLoadIC_Initialize; must be after in list. */    \
   V(FunctionCall,               BUILTIN, UNINITIALIZED)        \
   V(FunctionApply,              BUILTIN, UNINITIALIZED)
 
 
+// Define list of builtins used by the debugger implemented in assembly.
+#define BUILTIN_LIST_DEBUG_A(V)                                \
+  V(Return_DebugBreak,          BUILTIN, DEBUG_BREAK)          \
+  V(Return_DebugBreakEntry,     BUILTIN, DEBUG_BREAK)          \
+  V(ConstructCall_DebugBreak,   BUILTIN, DEBUG_BREAK)          \
+  V(StubNoRegisters_DebugBreak, BUILTIN, DEBUG_BREAK)          \
+  V(LoadIC_DebugBreak,          LOAD_IC, DEBUG_BREAK)          \
+  V(KeyedLoadIC_DebugBreak,     KEYED_LOAD_IC, DEBUG_BREAK)    \
+  V(StoreIC_DebugBreak,         STORE_IC, DEBUG_BREAK)         \
+  V(KeyedStoreIC_DebugBreak,    KEYED_STORE_IC, DEBUG_BREAK)   
+
+
 // Define list of builtins implemented in JavaScript.
 #define BUILTINS_LIST_JS(V)    \
   V(EQUALS, 1)                 \
   V(STRICT_EQUALS, 1)          \
   V(COMPARE, 2)                \
   V(ADD, 1)                    \
   V(SUB, 1)                    \
   V(MUL, 1)                    \
   V(DIV, 1)                    \
   V(MOD, 1)                    \
@@ skipping 34 matching lines @@
   static void IterateBuiltins(ObjectVisitor* v);
 
   // Disassembler support.
   static const char* Lookup(byte* pc);
 
   enum Name {
 #define DEF_ENUM_C(name) name,
 #define DEF_ENUM_A(name, kind, state) name,
     BUILTIN_LIST_C(DEF_ENUM_C)
     BUILTIN_LIST_A(DEF_ENUM_A)
+    BUILTIN_LIST_DEBUG_A(DEF_ENUM_A)
 #undef DEF_ENUM_C
 #undef DEF_ENUM_A
     builtin_count
   };
 
   enum CFunctionId {
 #define DEF_ENUM_C(name) c_##name,
     BUILTIN_LIST_C(DEF_ENUM_C)
 #undef DEF_ENUM_C
     cfunction_count
@@ skipping 57 matching lines @@
   static void Generate_KeyedStoreIC_DebugBreak(MacroAssembler* masm);
   static void Generate_ConstructCall_DebugBreak(MacroAssembler* masm);
   static void Generate_Return_DebugBreak(MacroAssembler* masm);
   static void Generate_Return_DebugBreakEntry(MacroAssembler* masm);
   static void Generate_StubNoRegisters_DebugBreak(MacroAssembler* masm);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_BUILTINS_H_