Reviewers: Mads Ager, Description: Moved the builtins used by the debugger to a separate list.
Please review this at http://codereview.chromium.org/13241 SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/builtins.h M src/builtins.cc M src/serialize.cc Index: src/serialize.cc =================================================================== --- src/serialize.cc (revision 929) +++ src/serialize.cc (working copy) @@ -470,6 +470,7 @@ BUILTIN_LIST_C(DEF_ENTRY_C) BUILTIN_LIST_A(DEF_ENTRY_A) + BUILTIN_LIST_DEBUG_A(DEF_ENTRY_A) #undef DEF_ENTRY_C #undef DEF_ENTRY_A Index: src/builtins.cc =================================================================== --- src/builtins.cc (revision 929) +++ src/builtins.cc (working copy) @@ -615,6 +615,7 @@ static BuiltinDesc functions[] = { BUILTIN_LIST_C(DEF_FUNCTION_PTR_C) BUILTIN_LIST_A(DEF_FUNCTION_PTR_A) + BUILTIN_LIST_DEBUG_A(DEF_FUNCTION_PTR_A) // Terminator: { NULL, NULL, NULL, builtin_count, static_cast<Code::Flags>(0) } }; Index: src/builtins.h =================================================================== --- src/builtins.h (revision 929) +++ src/builtins.h (working copy) @@ -52,11 +52,6 @@ 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) \ @@ -72,26 +67,34 @@ 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) \ @@ -146,6 +149,7 @@ #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 --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
