| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 factory->DictionaryAtNumberPut( | 135 factory->DictionaryAtNumberPut( |
| 136 Handle<UnseededNumberDictionary>(heap->code_stubs()), | 136 Handle<UnseededNumberDictionary>(heap->code_stubs()), |
| 137 GetKey(), | 137 GetKey(), |
| 138 new_object); | 138 new_object); |
| 139 heap->public_set_code_stubs(*dict); | 139 heap->public_set_code_stubs(*dict); |
| 140 } | 140 } |
| 141 code = *new_object; | 141 code = *new_object; |
| 142 } | 142 } |
| 143 | 143 |
| 144 Activate(code); | 144 Activate(code); |
| 145 ASSERT(!NeedsImmovableCode() || | 145 ASSERT(!NeedsImmovableCode() || heap->lo_space()->Contains(code)); |
| 146 heap->lo_space()->Contains(code) || | |
| 147 heap->code_space()->FirstPage()->Contains(code->address())); | |
| 148 return Handle<Code>(code, isolate); | 146 return Handle<Code>(code, isolate); |
| 149 } | 147 } |
| 150 | 148 |
| 151 | 149 |
| 152 const char* CodeStub::MajorName(CodeStub::Major major_key, | 150 const char* CodeStub::MajorName(CodeStub::Major major_key, |
| 153 bool allow_unknown_keys) { | 151 bool allow_unknown_keys) { |
| 154 switch (major_key) { | 152 switch (major_key) { |
| 155 #define DEF_CASE(name) case name: return #name "Stub"; | 153 #define DEF_CASE(name) case name: return #name "Stub"; |
| 156 CODE_STUB_LIST(DEF_CASE) | 154 CODE_STUB_LIST(DEF_CASE) |
| 157 #undef DEF_CASE | 155 #undef DEF_CASE |
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 496 // already active, as the hooks won't stack. | 494 // already active, as the hooks won't stack. |
| 497 if (entry_hook != 0 && entry_hook_ != 0) | 495 if (entry_hook != 0 && entry_hook_ != 0) |
| 498 return false; | 496 return false; |
| 499 | 497 |
| 500 entry_hook_ = entry_hook; | 498 entry_hook_ = entry_hook; |
| 501 return true; | 499 return true; |
| 502 } | 500 } |
| 503 | 501 |
| 504 | 502 |
| 505 } } // namespace v8::internal | 503 } } // namespace v8::internal |
| OLD | NEW |