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 754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
765 | 765 |
766 #ifdef ENABLE_DEBUGGER_SUPPORT | 766 #ifdef ENABLE_DEBUGGER_SUPPORT |
767 if (i::FLAG_debugger) printf("JavaScript debugger enabled\n"); | 767 if (i::FLAG_debugger) printf("JavaScript debugger enabled\n"); |
768 // Install the debugger object in the utility scope | 768 // Install the debugger object in the utility scope |
769 i::Debug* debug = reinterpret_cast<i::Isolate*>(isolate)->debug(); | 769 i::Debug* debug = reinterpret_cast<i::Isolate*>(isolate)->debug(); |
770 debug->Load(); | 770 debug->Load(); |
771 i::Handle<i::JSObject> js_debug | 771 i::Handle<i::JSObject> js_debug |
772 = i::Handle<i::JSObject>(debug->debug_context()->global_object()); | 772 = i::Handle<i::JSObject>(debug->debug_context()->global_object()); |
773 utility_context->Global()->Set(String::New("$debug"), | 773 utility_context->Global()->Set(String::New("$debug"), |
774 Utils::ToLocal(js_debug)); | 774 Utils::ToLocal(js_debug)); |
775 debug->debug_context()->set_security_token(HEAP->undefined_value()); | 775 debug->debug_context()->set_security_token( |
| 776 reinterpret_cast<i::Isolate*>(isolate)->heap()->undefined_value()); |
776 #endif // ENABLE_DEBUGGER_SUPPORT | 777 #endif // ENABLE_DEBUGGER_SUPPORT |
777 | 778 |
778 // Run the d8 shell utility script in the utility context | 779 // Run the d8 shell utility script in the utility context |
779 int source_index = i::NativesCollection<i::D8>::GetIndex("d8"); | 780 int source_index = i::NativesCollection<i::D8>::GetIndex("d8"); |
780 i::Vector<const char> shell_source = | 781 i::Vector<const char> shell_source = |
781 i::NativesCollection<i::D8>::GetRawScriptSource(source_index); | 782 i::NativesCollection<i::D8>::GetRawScriptSource(source_index); |
782 i::Vector<const char> shell_source_name = | 783 i::Vector<const char> shell_source_name = |
783 i::NativesCollection<i::D8>::GetScriptName(source_index); | 784 i::NativesCollection<i::D8>::GetScriptName(source_index); |
784 Handle<String> source = String::New(shell_source.start(), | 785 Handle<String> source = String::New(shell_source.start(), |
785 shell_source.length()); | 786 shell_source.length()); |
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1724 } | 1725 } |
1725 | 1726 |
1726 } // namespace v8 | 1727 } // namespace v8 |
1727 | 1728 |
1728 | 1729 |
1729 #ifndef GOOGLE3 | 1730 #ifndef GOOGLE3 |
1730 int main(int argc, char* argv[]) { | 1731 int main(int argc, char* argv[]) { |
1731 return v8::Shell::Main(argc, argv); | 1732 return v8::Shell::Main(argc, argv); |
1732 } | 1733 } |
1733 #endif | 1734 #endif |
OLD | NEW |