OLD | NEW |
---|---|
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "vm/bootstrap.h" | 5 #include "vm/bootstrap.h" |
6 | 6 |
7 #include "include/dart_api.h" | 7 #include "include/dart_api.h" |
8 | 8 |
9 #include "vm/bootstrap_natives.h" | 9 #include "vm/bootstrap_natives.h" |
10 #include "vm/dart_api_impl.h" | 10 #include "vm/dart_api_impl.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 // TODO(regis): Should we pass a buffer for error reporting? | 44 // TODO(regis): Should we pass a buffer for error reporting? |
45 return NULL; | 45 return NULL; |
46 } | 46 } |
47 } | 47 } |
48 } | 48 } |
49 return NULL; | 49 return NULL; |
50 } | 50 } |
51 | 51 |
52 | 52 |
53 void Bootstrap::SetupNativeResolver() { | 53 void Bootstrap::SetupNativeResolver() { |
54 Library& library = Library::Handle(Library::CoreLibrary()); | 54 Isolate* isolate = Isolate::Current(); |
55 Library& library = Library::Handle(); | |
56 | |
57 library = isolate->object_store()->core_library(); | |
55 ASSERT(!library.IsNull()); | 58 ASSERT(!library.IsNull()); |
56 library.set_native_entry_resolver( | 59 library.set_native_entry_resolver( |
57 reinterpret_cast<Dart_NativeEntryResolver>(NativeLookup)); | 60 reinterpret_cast<Dart_NativeEntryResolver>(NativeLookup)); |
58 | 61 library = isolate->object_store()->core_impl_library(); |
59 library = Library::CoreImplLibrary(); | |
60 ASSERT(!library.IsNull()); | 62 ASSERT(!library.IsNull()); |
61 library.set_native_entry_resolver( | 63 library.set_native_entry_resolver( |
62 reinterpret_cast<Dart_NativeEntryResolver>(NativeLookup)); | 64 reinterpret_cast<Dart_NativeEntryResolver>(NativeLookup)); |
63 | 65 library = isolate->object_store()->mirrors_library(); |
66 ASSERT(!library.IsNull()); | |
67 library.set_native_entry_resolver( | |
68 reinterpret_cast<Dart_NativeEntryResolver>(NativeLookup)); | |
siva
2012/03/08 22:24:02
Did you change Library::CoreLibrary(), Library::Co
turnidge
2012/03/08 22:50:51
This is debris from before I added Library::Mirror
| |
64 library = Library::IsolateLibrary(); | 69 library = Library::IsolateLibrary(); |
65 ASSERT(!library.IsNull()); | 70 ASSERT(!library.IsNull()); |
66 library.set_native_entry_resolver( | 71 library.set_native_entry_resolver( |
67 reinterpret_cast<Dart_NativeEntryResolver>(NativeLookup)); | 72 reinterpret_cast<Dart_NativeEntryResolver>(NativeLookup)); |
68 } | 73 } |
69 | 74 |
70 } // namespace dart | 75 } // namespace dart |
OLD | NEW |