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 19 matching lines...) Expand all Loading... |
30 #include "api.h" | 30 #include "api.h" |
31 #include "bootstrapper.h" | 31 #include "bootstrapper.h" |
32 #include "compiler.h" | 32 #include "compiler.h" |
33 #include "debug.h" | 33 #include "debug.h" |
34 #include "execution.h" | 34 #include "execution.h" |
35 #include "global-handles.h" | 35 #include "global-handles.h" |
36 #include "platform.h" | 36 #include "platform.h" |
37 #include "serialize.h" | 37 #include "serialize.h" |
38 #include "snapshot.h" | 38 #include "snapshot.h" |
39 #include "v8threads.h" | 39 #include "v8threads.h" |
| 40 #include "version.h" |
40 | 41 |
41 | 42 |
42 #define LOG_API(expr) LOG(ApiEntryCall(expr)) | 43 #define LOG_API(expr) LOG(ApiEntryCall(expr)) |
43 | 44 |
44 #ifdef ENABLE_HEAP_PROTECTION | 45 #ifdef ENABLE_HEAP_PROTECTION |
45 #define ENTER_V8 i::VMState __state__(i::OTHER) | 46 #define ENTER_V8 i::VMState __state__(i::OTHER) |
46 #define LEAVE_V8 i::VMState __state__(i::EXTERNAL) | 47 #define LEAVE_V8 i::VMState __state__(i::EXTERNAL) |
47 #else | 48 #else |
48 #define ENTER_V8 ((void) 0) | 49 #define ENTER_V8 ((void) 0) |
49 #define LEAVE_V8 ((void) 0) | 50 #define LEAVE_V8 ((void) 0) |
(...skipping 2365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2415 } | 2416 } |
2416 | 2417 |
2417 | 2418 |
2418 bool v8::V8::Dispose() { | 2419 bool v8::V8::Dispose() { |
2419 i::V8::TearDown(); | 2420 i::V8::TearDown(); |
2420 return true; | 2421 return true; |
2421 } | 2422 } |
2422 | 2423 |
2423 | 2424 |
2424 const char* v8::V8::GetVersion() { | 2425 const char* v8::V8::GetVersion() { |
2425 return "1.2.2 (candidate)"; | 2426 static v8::internal::EmbeddedVector<char, 128> buffer; |
| 2427 v8::internal::Version::GetString(buffer); |
| 2428 return buffer.start(); |
2426 } | 2429 } |
2427 | 2430 |
2428 | 2431 |
2429 static i::Handle<i::FunctionTemplateInfo> | 2432 static i::Handle<i::FunctionTemplateInfo> |
2430 EnsureConstructor(i::Handle<i::ObjectTemplateInfo> templ) { | 2433 EnsureConstructor(i::Handle<i::ObjectTemplateInfo> templ) { |
2431 if (templ->constructor()->IsUndefined()) { | 2434 if (templ->constructor()->IsUndefined()) { |
2432 Local<FunctionTemplate> constructor = FunctionTemplate::New(); | 2435 Local<FunctionTemplate> constructor = FunctionTemplate::New(); |
2433 Utils::OpenHandle(*constructor)->set_instance_template(*templ); | 2436 Utils::OpenHandle(*constructor)->set_instance_template(*templ); |
2434 templ->set_constructor(*Utils::OpenHandle(*constructor)); | 2437 templ->set_constructor(*Utils::OpenHandle(*constructor)); |
2435 } | 2438 } |
(...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3387 reinterpret_cast<HandleScopeImplementer*>(storage); | 3390 reinterpret_cast<HandleScopeImplementer*>(storage); |
3388 List<void**>* blocks_of_archived_thread = thread_local->Blocks(); | 3391 List<void**>* blocks_of_archived_thread = thread_local->Blocks(); |
3389 v8::ImplementationUtilities::HandleScopeData* handle_data_of_archived_thread = | 3392 v8::ImplementationUtilities::HandleScopeData* handle_data_of_archived_thread = |
3390 &thread_local->handle_scope_data_; | 3393 &thread_local->handle_scope_data_; |
3391 Iterate(v, blocks_of_archived_thread, handle_data_of_archived_thread); | 3394 Iterate(v, blocks_of_archived_thread, handle_data_of_archived_thread); |
3392 | 3395 |
3393 return storage + ArchiveSpacePerThread(); | 3396 return storage + ArchiveSpacePerThread(); |
3394 } | 3397 } |
3395 | 3398 |
3396 } } // namespace v8::internal | 3399 } } // namespace v8::internal |
OLD | NEW |