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 1538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1549 Locker lock(isolate); | 1549 Locker lock(isolate); |
1550 Locker::StopPreemption(); | 1550 Locker::StopPreemption(); |
1551 } | 1551 } |
1552 #endif // V8_SHARED | 1552 #endif // V8_SHARED |
1553 return 0; | 1553 return 0; |
1554 } | 1554 } |
1555 | 1555 |
1556 | 1556 |
1557 #ifdef V8_SHARED | 1557 #ifdef V8_SHARED |
1558 static void SetStandaloneFlagsViaCommandLine() { | 1558 static void SetStandaloneFlagsViaCommandLine() { |
1559 int fake_argc = 2; | 1559 int fake_argc = 3; |
1560 char **fake_argv = new char*[2]; | 1560 char **fake_argv = new char*[3]; |
1561 fake_argv[0] = NULL; | 1561 fake_argv[0] = NULL; |
1562 fake_argv[1] = strdup("--trace-hydrogen-file=hydrogen.cfg"); | 1562 fake_argv[1] = strdup("--harmony-typed-arrays"); |
| 1563 fake_argv[2] = strdup("--trace-hydrogen-file=hydrogen.cfg"); |
1563 v8::V8::SetFlagsFromCommandLine(&fake_argc, fake_argv, false); | 1564 v8::V8::SetFlagsFromCommandLine(&fake_argc, fake_argv, false); |
1564 free(fake_argv[1]); | 1565 free(fake_argv[1]); |
1565 delete[] fake_argv; | 1566 delete[] fake_argv; |
1566 } | 1567 } |
1567 #endif | 1568 #endif |
1568 | 1569 |
1569 | 1570 |
1570 #ifndef V8_SHARED | 1571 #ifndef V8_SHARED |
1571 static void DumpHeapConstants(i::Isolate* isolate) { | 1572 static void DumpHeapConstants(i::Isolate* isolate) { |
1572 i::Heap* heap = isolate->heap(); | 1573 i::Heap* heap = isolate->heap(); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1641 UNREACHABLE(); | 1642 UNREACHABLE(); |
1642 #endif | 1643 #endif |
1643 } | 1644 } |
1644 }; | 1645 }; |
1645 | 1646 |
1646 | 1647 |
1647 int Shell::Main(int argc, char* argv[]) { | 1648 int Shell::Main(int argc, char* argv[]) { |
1648 if (!SetOptions(argc, argv)) return 1; | 1649 if (!SetOptions(argc, argv)) return 1; |
1649 v8::V8::InitializeICU(); | 1650 v8::V8::InitializeICU(); |
1650 #ifndef V8_SHARED | 1651 #ifndef V8_SHARED |
| 1652 i::FLAG_harmony_array_buffer = true; |
| 1653 i::FLAG_harmony_typed_arrays = true; |
1651 i::FLAG_trace_hydrogen_file = "hydrogen.cfg"; | 1654 i::FLAG_trace_hydrogen_file = "hydrogen.cfg"; |
1652 #else | 1655 #else |
1653 SetStandaloneFlagsViaCommandLine(); | 1656 SetStandaloneFlagsViaCommandLine(); |
1654 #endif | 1657 #endif |
1655 ShellArrayBufferAllocator array_buffer_allocator; | 1658 ShellArrayBufferAllocator array_buffer_allocator; |
1656 v8::V8::SetArrayBufferAllocator(&array_buffer_allocator); | 1659 v8::V8::SetArrayBufferAllocator(&array_buffer_allocator); |
1657 int result = 0; | 1660 int result = 0; |
1658 Isolate* isolate = Isolate::GetCurrent(); | 1661 Isolate* isolate = Isolate::GetCurrent(); |
1659 DumbLineEditor dumb_line_editor(isolate); | 1662 DumbLineEditor dumb_line_editor(isolate); |
1660 { | 1663 { |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1729 } | 1732 } |
1730 | 1733 |
1731 } // namespace v8 | 1734 } // namespace v8 |
1732 | 1735 |
1733 | 1736 |
1734 #ifndef GOOGLE3 | 1737 #ifndef GOOGLE3 |
1735 int main(int argc, char* argv[]) { | 1738 int main(int argc, char* argv[]) { |
1736 return v8::Shell::Main(argc, argv); | 1739 return v8::Shell::Main(argc, argv); |
1737 } | 1740 } |
1738 #endif | 1741 #endif |
OLD | NEW |