OLD | NEW |
1 // Copyright 2009 the V8 project authors. All rights reserved. | 1 // Copyright 2009 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 12 matching lines...) Expand all Loading... |
23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | 27 |
28 #include <stdarg.h> | 28 #include <stdarg.h> |
29 | 29 |
30 #include "v8.h" | 30 #include "v8.h" |
31 | 31 |
32 #include "bootstrapper.h" | 32 #include "bootstrapper.h" |
| 33 #include "code-stubs.h" |
33 #include "global-handles.h" | 34 #include "global-handles.h" |
34 #include "log.h" | 35 #include "log.h" |
35 #include "macro-assembler.h" | 36 #include "macro-assembler.h" |
36 #include "serialize.h" | 37 #include "serialize.h" |
37 #include "string-stream.h" | 38 #include "string-stream.h" |
38 | 39 |
39 namespace v8 { | 40 namespace v8 { |
40 namespace internal { | 41 namespace internal { |
41 | 42 |
42 #ifdef ENABLE_LOGGING_AND_PROFILING | 43 #ifdef ENABLE_LOGGING_AND_PROFILING |
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1259 if (FLAG_log_code) { | 1260 if (FLAG_log_code) { |
1260 Code* code_object = Code::cast(object); | 1261 Code* code_object = Code::cast(object); |
1261 LogEventsAndTags tag = Logger::STUB_TAG; | 1262 LogEventsAndTags tag = Logger::STUB_TAG; |
1262 const char* description = "Unknown code from the snapshot"; | 1263 const char* description = "Unknown code from the snapshot"; |
1263 switch (code_object->kind()) { | 1264 switch (code_object->kind()) { |
1264 case Code::FUNCTION: | 1265 case Code::FUNCTION: |
1265 return; // We log this later using LogCompiledFunctions. | 1266 return; // We log this later using LogCompiledFunctions. |
1266 case Code::BINARY_OP_IC: | 1267 case Code::BINARY_OP_IC: |
1267 // fall through | 1268 // fall through |
1268 case Code::STUB: | 1269 case Code::STUB: |
1269 description = CodeStub::MajorName(code_object->major_key(), true); | 1270 description = |
| 1271 CodeStub::MajorName(CodeStub::GetMajorKey(code_object), true); |
1270 if (description == NULL) | 1272 if (description == NULL) |
1271 description = "A stub from the snapshot"; | 1273 description = "A stub from the snapshot"; |
1272 tag = Logger::STUB_TAG; | 1274 tag = Logger::STUB_TAG; |
1273 break; | 1275 break; |
1274 case Code::BUILTIN: | 1276 case Code::BUILTIN: |
1275 description = "A builtin from the snapshot"; | 1277 description = "A builtin from the snapshot"; |
1276 tag = Logger::BUILTIN_TAG; | 1278 tag = Logger::BUILTIN_TAG; |
1277 break; | 1279 break; |
1278 case Code::KEYED_LOAD_IC: | 1280 case Code::KEYED_LOAD_IC: |
1279 description = "A keyed load IC from the snapshot"; | 1281 description = "A keyed load IC from the snapshot"; |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1552 } | 1554 } |
1553 // Otherwise, if the sliding state window computation has not been | 1555 // Otherwise, if the sliding state window computation has not been |
1554 // started we do it now. | 1556 // started we do it now. |
1555 if (sliding_state_window_ == NULL) { | 1557 if (sliding_state_window_ == NULL) { |
1556 sliding_state_window_ = new SlidingStateWindow(); | 1558 sliding_state_window_ = new SlidingStateWindow(); |
1557 } | 1559 } |
1558 #endif | 1560 #endif |
1559 } | 1561 } |
1560 | 1562 |
1561 } } // namespace v8::internal | 1563 } } // namespace v8::internal |
OLD | NEW |