OLD | NEW |
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, 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/verifier.h" | 5 #include "vm/verifier.h" |
6 | 6 |
7 #include "platform/assert.h" | 7 #include "platform/assert.h" |
8 #include "vm/dart.h" | 8 #include "vm/dart.h" |
9 #include "vm/dart_api_state.h" | 9 #include "vm/dart_api_state.h" |
10 #include "vm/freelist.h" | 10 #include "vm/freelist.h" |
11 #include "vm/heap.h" | 11 #include "vm/heap.h" |
12 #include "vm/isolate.h" | 12 #include "vm/isolate.h" |
13 #include "vm/object.h" | 13 #include "vm/object.h" |
14 #include "vm/object_set.h" | 14 #include "vm/object_set.h" |
15 #include "vm/raw_object.h" | 15 #include "vm/raw_object.h" |
16 #include "vm/stack_frame.h" | 16 #include "vm/stack_frame.h" |
17 | 17 |
18 namespace dart { | 18 namespace dart { |
19 | 19 |
20 DEFINE_FLAG(bool, verify_on_transition, false, "Verify on dart <==> VM."); | 20 DEFINE_FLAG(bool, verify_on_transition, false, "Verify on dart <==> VM."); |
21 | 21 |
22 | 22 |
23 void VerifyObjectVisitor::VisitObject(RawObject* raw_obj) { | 23 void VerifyObjectVisitor::VisitObject(RawObject* raw_obj) { |
24 if (raw_obj->IsHeapObject()) { | 24 if (raw_obj->IsHeapObject()) { |
25 switch (mark_expectation_) { | 25 uword raw_addr = RawObject::ToAddr(raw_obj); |
26 case kForbidMarked: | 26 if (raw_obj->IsFreeListElement()) { |
27 if (raw_obj->IsMarked()) { | 27 if (raw_obj->IsMarked()) { |
28 uword raw_addr = RawObject::ToAddr(raw_obj); | 28 FATAL1("Marked free list element encountered %#" Px "\n", raw_addr); |
29 FATAL1("Marked object encountered %#" Px "\n", raw_addr); | |
30 } | 29 } |
31 break; | 30 } else { |
32 case kAllowMarked: | 31 switch (mark_expectation_) { |
33 break; | 32 case kForbidMarked: |
34 case kRequireMarked: | 33 if (raw_obj->IsMarked()) { |
35 if (!raw_obj->IsMarked()) { | 34 FATAL1("Marked object encountered %#" Px "\n", raw_addr); |
36 uword raw_addr = RawObject::ToAddr(raw_obj); | 35 } |
37 FATAL1("Unmarked object encountered %#" Px "\n", raw_addr); | 36 break; |
| 37 case kAllowMarked: |
| 38 break; |
| 39 case kRequireMarked: |
| 40 if (!raw_obj->IsMarked()) { |
| 41 FATAL1("Unmarked object encountered %#" Px "\n", raw_addr); |
| 42 } |
| 43 break; |
38 } | 44 } |
39 break; | |
40 } | 45 } |
41 } | 46 } |
42 allocated_set_->Add(raw_obj); | 47 allocated_set_->Add(raw_obj); |
43 raw_obj->Validate(isolate()); | 48 raw_obj->Validate(isolate()); |
44 } | 49 } |
45 | 50 |
46 | 51 |
47 void VerifyPointersVisitor::VisitPointers(RawObject** first, RawObject** last) { | 52 void VerifyPointersVisitor::VisitPointers(RawObject** first, RawObject** last) { |
48 for (RawObject** current = first; current <= last; current++) { | 53 for (RawObject** current = first; current <= last; current++) { |
49 VerifiedMemory::Verify(reinterpret_cast<uword>(current), kWordSize); | 54 VerifiedMemory::Verify(reinterpret_cast<uword>(current), kWordSize); |
(...skipping 27 matching lines...) Expand all Loading... |
77 false, // skip prologue weak handles | 82 false, // skip prologue weak handles |
78 StackFrameIterator::kValidateFrames); | 83 StackFrameIterator::kValidateFrames); |
79 VerifyWeakPointersVisitor weak_visitor(&visitor); | 84 VerifyWeakPointersVisitor weak_visitor(&visitor); |
80 // Visit weak handles and prologue weak handles. | 85 // Visit weak handles and prologue weak handles. |
81 isolate->VisitWeakPersistentHandles(&weak_visitor, | 86 isolate->VisitWeakPersistentHandles(&weak_visitor, |
82 true); // visit prologue weak handles | 87 true); // visit prologue weak handles |
83 delete allocated_set; | 88 delete allocated_set; |
84 } | 89 } |
85 | 90 |
86 } // namespace dart | 91 } // namespace dart |
OLD | NEW |