Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(849)

Side by Side Diff: runtime/vm/thread.cc

Issue 1227733002: VM: Load common VM constants from Thread on ARM and MIPS. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: added back assertion Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « runtime/vm/assembler_mips.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2015, 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/thread.h" 5 #include "vm/thread.h"
6 6
7 #include "vm/isolate.h" 7 #include "vm/isolate.h"
8 #include "vm/object.h" 8 #include "vm/object.h"
9 #include "vm/os_thread.h" 9 #include "vm/os_thread.h"
10 #include "vm/profiler.h" 10 #include "vm/profiler.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } 63 }
64 SetCurrent(NULL); 64 SetCurrent(NULL);
65 } 65 }
66 #endif 66 #endif
67 67
68 68
69 Thread::Thread(bool init_vm_constants) 69 Thread::Thread(bool init_vm_constants)
70 : isolate_(NULL), 70 : isolate_(NULL),
71 store_buffer_block_(NULL) { 71 store_buffer_block_(NULL) {
72 #define DEFAULT_INIT(type_name, member_name, init_expr, default_init_value) \ 72 #define DEFAULT_INIT(type_name, member_name, init_expr, default_init_value) \
73 member_name = default_init_value; 73 member_name = default_init_value;
74 CACHED_CONSTANTS_LIST(DEFAULT_INIT) 74 CACHED_CONSTANTS_LIST(DEFAULT_INIT)
75 #undef DEFAULT_INIT 75 #undef DEFAULT_INIT
76 if (init_vm_constants) { 76 if (init_vm_constants) {
77 InitVMConstants(); 77 InitVMConstants();
78 } 78 }
79 } 79 }
80 80
81 81
82 void Thread::InitVMConstants() { 82 void Thread::InitVMConstants() {
83 #define ASSERT_VM_HEAP(type_name, member_name, init_expr, default_init_value) \
84 ASSERT((init_expr)->IsOldObject());
85 CACHED_VM_OBJECTS_LIST(ASSERT_VM_HEAP)
86 #undef ASSERT_VM_HEAP
87
83 #define INIT_VALUE(type_name, member_name, init_expr, default_init_value) \ 88 #define INIT_VALUE(type_name, member_name, init_expr, default_init_value) \
84 ASSERT(member_name == default_init_value); \ 89 ASSERT(member_name == default_init_value); \
85 member_name = init_expr; 90 member_name = (init_expr);
86 CACHED_CONSTANTS_LIST(INIT_VALUE) 91 CACHED_CONSTANTS_LIST(INIT_VALUE)
87 #undef INIT_VALUE 92 #undef INIT_VALUE
88 } 93 }
89 94
90 95
91 void Thread::EnterIsolate(Isolate* isolate) { 96 void Thread::EnterIsolate(Isolate* isolate) {
92 Thread* thread = Thread::Current(); 97 Thread* thread = Thread::Current();
93 ASSERT(thread != NULL); 98 ASSERT(thread != NULL);
94 ASSERT(thread->isolate() == NULL); 99 ASSERT(thread->isolate() == NULL);
95 ASSERT(isolate->mutator_thread() == NULL); 100 ASSERT(isolate->mutator_thread() == NULL);
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 #define CHECK_OBJECT(type_name, member_name, expr, default_init_value) \ 213 #define CHECK_OBJECT(type_name, member_name, expr, default_init_value) \
209 if (object.raw() == expr) return true; 214 if (object.raw() == expr) return true;
210 CACHED_VM_OBJECTS_LIST(CHECK_OBJECT) 215 CACHED_VM_OBJECTS_LIST(CHECK_OBJECT)
211 #undef CHECK_OBJECT 216 #undef CHECK_OBJECT
212 return false; 217 return false;
213 } 218 }
214 219
215 220
216 intptr_t Thread::OffsetFromThread(const Object& object) { 221 intptr_t Thread::OffsetFromThread(const Object& object) {
217 #define COMPUTE_OFFSET(type_name, member_name, expr, default_init_value) \ 222 #define COMPUTE_OFFSET(type_name, member_name, expr, default_init_value) \
223 ASSERT((expr)->IsVMHeapObject()); \
218 if (object.raw() == expr) return Thread::member_name##offset(); 224 if (object.raw() == expr) return Thread::member_name##offset();
219 CACHED_VM_OBJECTS_LIST(COMPUTE_OFFSET) 225 CACHED_VM_OBJECTS_LIST(COMPUTE_OFFSET)
220 #undef COMPUTE_OFFSET 226 #undef COMPUTE_OFFSET
221 UNREACHABLE(); 227 UNREACHABLE();
222 return -1; 228 return -1;
223 } 229 }
224 230
225 } // namespace dart 231 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/assembler_mips.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698