Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 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 976 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 987 // in JS or not. | 987 // in JS or not. |
| 988 ASSERT((current_state == JS) == (state == JS)); | 988 ASSERT((current_state == JS) == (state == JS)); |
| 989 } | 989 } |
| 990 } | 990 } |
| 991 thread_local_top_.current_vm_state_ = state; | 991 thread_local_top_.current_vm_state_ = state; |
| 992 } | 992 } |
| 993 #endif | 993 #endif |
| 994 | 994 |
| 995 void ResetEagerOptimizingData(); | 995 void ResetEagerOptimizingData(); |
| 996 | 996 |
| 997 void SetData(void* data) { | |
|
Mads Ager (chromium)
2011/05/18 05:28:28
I would make these one-liners:
void SetData(void*
| |
| 998 embedder_data_ = data; | |
| 999 } | |
| 1000 void* GetData() { | |
| 1001 return embedder_data_; | |
| 1002 } | |
| 1003 | |
| 997 private: | 1004 private: |
| 998 Isolate(); | 1005 Isolate(); |
| 999 | 1006 |
| 1000 // The per-process lock should be acquired before the ThreadDataTable is | 1007 // The per-process lock should be acquired before the ThreadDataTable is |
| 1001 // modified. | 1008 // modified. |
| 1002 class ThreadDataTable { | 1009 class ThreadDataTable { |
| 1003 public: | 1010 public: |
| 1004 ThreadDataTable(); | 1011 ThreadDataTable(); |
| 1005 ~ThreadDataTable(); | 1012 ~ThreadDataTable(); |
| 1006 | 1013 |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1149 unibrow::Mapping<unibrow::CanonicalizationRange> jsregexp_canonrange_; | 1156 unibrow::Mapping<unibrow::CanonicalizationRange> jsregexp_canonrange_; |
| 1150 StringInputBuffer objects_string_compare_buffer_a_; | 1157 StringInputBuffer objects_string_compare_buffer_a_; |
| 1151 StringInputBuffer objects_string_compare_buffer_b_; | 1158 StringInputBuffer objects_string_compare_buffer_b_; |
| 1152 StaticResource<StringInputBuffer> objects_string_input_buffer_; | 1159 StaticResource<StringInputBuffer> objects_string_input_buffer_; |
| 1153 unibrow::Mapping<unibrow::Ecma262Canonicalize> | 1160 unibrow::Mapping<unibrow::Ecma262Canonicalize> |
| 1154 regexp_macro_assembler_canonicalize_; | 1161 regexp_macro_assembler_canonicalize_; |
| 1155 RegExpStack* regexp_stack_; | 1162 RegExpStack* regexp_stack_; |
| 1156 unibrow::Mapping<unibrow::Ecma262Canonicalize> interp_canonicalize_mapping_; | 1163 unibrow::Mapping<unibrow::Ecma262Canonicalize> interp_canonicalize_mapping_; |
| 1157 ZoneObjectList frame_element_constant_list_; | 1164 ZoneObjectList frame_element_constant_list_; |
| 1158 ZoneObjectList result_constant_list_; | 1165 ZoneObjectList result_constant_list_; |
| 1166 void* embedder_data_; | |
| 1159 | 1167 |
| 1160 #if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \ | 1168 #if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \ |
| 1161 defined(V8_TARGET_ARCH_MIPS) && !defined(__mips__) | 1169 defined(V8_TARGET_ARCH_MIPS) && !defined(__mips__) |
| 1162 bool simulator_initialized_; | 1170 bool simulator_initialized_; |
| 1163 HashMap* simulator_i_cache_; | 1171 HashMap* simulator_i_cache_; |
| 1164 Redirection* simulator_redirection_; | 1172 Redirection* simulator_redirection_; |
| 1165 #endif | 1173 #endif |
| 1166 | 1174 |
| 1167 #ifdef DEBUG | 1175 #ifdef DEBUG |
| 1168 // A static array of histogram info for each type. | 1176 // A static array of histogram info for each type. |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1383 | 1391 |
| 1384 } } // namespace v8::internal | 1392 } } // namespace v8::internal |
| 1385 | 1393 |
| 1386 // TODO(isolates): Get rid of these -inl.h includes and place them only where | 1394 // TODO(isolates): Get rid of these -inl.h includes and place them only where |
| 1387 // they're needed. | 1395 // they're needed. |
| 1388 #include "allocation-inl.h" | 1396 #include "allocation-inl.h" |
| 1389 #include "zone-inl.h" | 1397 #include "zone-inl.h" |
| 1390 #include "frames-inl.h" | 1398 #include "frames-inl.h" |
| 1391 | 1399 |
| 1392 #endif // V8_ISOLATE_H_ | 1400 #endif // V8_ISOLATE_H_ |
| OLD | NEW |