OLD | NEW |
1 // Copyright 2009 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 |
11 // with the distribution. | 11 // with the distribution. |
(...skipping 21 matching lines...) Expand all Loading... |
33 public: | 33 public: |
34 static int GetNameCount(ExtensionConfiguration* that) { | 34 static int GetNameCount(ExtensionConfiguration* that) { |
35 return that->name_count_; | 35 return that->name_count_; |
36 } | 36 } |
37 | 37 |
38 static const char** GetNames(ExtensionConfiguration* that) { | 38 static const char** GetNames(ExtensionConfiguration* that) { |
39 return that->names_; | 39 return that->names_; |
40 } | 40 } |
41 | 41 |
42 // Packs additional parameters for the NewArguments function. |implicit_args| | 42 // Packs additional parameters for the NewArguments function. |implicit_args| |
43 // is a pointer to the last element of 3-elements array controlled by GC. | 43 // is a pointer to the last element of 4-elements array controlled by GC. |
44 static void PrepareArgumentsData(internal::Object** implicit_args, | 44 static void PrepareArgumentsData(internal::Object** implicit_args, |
| 45 internal::Isolate* isolate, |
45 internal::Object* data, | 46 internal::Object* data, |
46 internal::JSFunction* callee, | 47 internal::JSFunction* callee, |
47 internal::Object* holder) { | 48 internal::Object* holder) { |
48 implicit_args[v8::Arguments::kDataIndex] = data; | 49 implicit_args[v8::Arguments::kDataIndex] = data; |
49 implicit_args[v8::Arguments::kCalleeIndex] = callee; | 50 implicit_args[v8::Arguments::kCalleeIndex] = callee; |
50 implicit_args[v8::Arguments::kHolderIndex] = holder; | 51 implicit_args[v8::Arguments::kHolderIndex] = holder; |
| 52 implicit_args[v8::Arguments::kIsolateIndex] = |
| 53 reinterpret_cast<internal::Object*>(isolate); |
51 } | 54 } |
52 | 55 |
53 static v8::Arguments NewArguments(internal::Object** implicit_args, | 56 static v8::Arguments NewArguments(internal::Object** implicit_args, |
54 internal::Object** argv, int argc, | 57 internal::Object** argv, int argc, |
55 bool is_construct_call) { | 58 bool is_construct_call) { |
56 ASSERT(implicit_args[v8::Arguments::kCalleeIndex]->IsJSFunction()); | 59 ASSERT(implicit_args[v8::Arguments::kCalleeIndex]->IsJSFunction()); |
57 ASSERT(implicit_args[v8::Arguments::kHolderIndex]->IsHeapObject()); | 60 ASSERT(implicit_args[v8::Arguments::kHolderIndex]->IsHeapObject()); |
| 61 // The implicit isolate argument is not tagged and looks like a SMI. |
| 62 ASSERT(implicit_args[v8::Arguments::kIsolateIndex]->IsSmi()); |
58 | 63 |
59 return v8::Arguments(implicit_args, argv, argc, is_construct_call); | 64 return v8::Arguments(implicit_args, argv, argc, is_construct_call); |
60 } | 65 } |
61 | 66 |
62 // Introduce an alias for the handle scope data to allow non-friends | 67 // Introduce an alias for the handle scope data to allow non-friends |
63 // to access the HandleScope data. | 68 // to access the HandleScope data. |
64 typedef v8::HandleScope::Data HandleScopeData; | 69 typedef v8::HandleScope::Data HandleScopeData; |
65 | 70 |
66 #ifdef DEBUG | 71 #ifdef DEBUG |
67 static void ZapHandleRange(internal::Object** begin, internal::Object** end); | 72 static void ZapHandleRange(internal::Object** begin, internal::Object** end); |
68 #endif | 73 #endif |
69 }; | 74 }; |
70 | 75 |
71 } // namespace v8 | 76 } // namespace v8 |
72 | 77 |
73 #endif // V8_APIUTILS_H_ | 78 #endif // V8_APIUTILS_H_ |
OLD | NEW |