OLD | NEW |
1 // Copyright 2010 the V8 project authors. All rights reserved. | 1 // Copyright 2010 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 UNREACHABLE(); | 56 UNREACHABLE(); |
57 return NULL; | 57 return NULL; |
58 } | 58 } |
59 } | 59 } |
60 | 60 |
61 | 61 |
62 VMState::VMState(Isolate* isolate, StateTag tag) | 62 VMState::VMState(Isolate* isolate, StateTag tag) |
63 : isolate_(isolate), previous_tag_(isolate->current_vm_state()) { | 63 : isolate_(isolate), previous_tag_(isolate->current_vm_state()) { |
64 #ifdef ENABLE_LOGGING_AND_PROFILING | 64 #ifdef ENABLE_LOGGING_AND_PROFILING |
65 if (FLAG_log_state_changes) { | 65 if (FLAG_log_state_changes) { |
66 LOG(UncheckedStringEvent("Entering", StateToString(tag))); | 66 LOG(isolate, UncheckedStringEvent("Entering", StateToString(tag))); |
67 LOG(UncheckedStringEvent("From", StateToString(previous_tag_))); | 67 LOG(isolate, UncheckedStringEvent("From", StateToString(previous_tag_))); |
68 } | 68 } |
69 #endif | 69 #endif |
70 | 70 |
71 isolate_->SetCurrentVMState(tag); | 71 isolate_->SetCurrentVMState(tag); |
72 | 72 |
73 #ifdef ENABLE_HEAP_PROTECTION | 73 #ifdef ENABLE_HEAP_PROTECTION |
74 if (FLAG_protect_heap) { | 74 if (FLAG_protect_heap) { |
75 if (tag == EXTERNAL) { | 75 if (tag == EXTERNAL) { |
76 // We are leaving V8. | 76 // We are leaving V8. |
77 ASSERT(previous_tag_ != EXTERNAL); | 77 ASSERT(previous_tag_ != EXTERNAL); |
78 isolate_->heap()->Protect(); | 78 isolate_->heap()->Protect(); |
79 } else if (previous_tag_ = EXTERNAL) { | 79 } else if (previous_tag_ = EXTERNAL) { |
80 // We are entering V8. | 80 // We are entering V8. |
81 isolate_->heap()->Unprotect(); | 81 isolate_->heap()->Unprotect(); |
82 } | 82 } |
83 } | 83 } |
84 #endif | 84 #endif |
85 } | 85 } |
86 | 86 |
87 | 87 |
88 VMState::~VMState() { | 88 VMState::~VMState() { |
89 #ifdef ENABLE_LOGGING_AND_PROFILING | 89 #ifdef ENABLE_LOGGING_AND_PROFILING |
90 if (FLAG_log_state_changes) { | 90 if (FLAG_log_state_changes) { |
91 LOG(UncheckedStringEvent("Leaving", | 91 LOG(isolate_, |
92 StateToString(isolate_->current_vm_state()))); | 92 UncheckedStringEvent("Leaving", |
93 LOG(UncheckedStringEvent("To", StateToString(previous_tag_))); | 93 StateToString(isolate_->current_vm_state()))); |
| 94 LOG(isolate_, |
| 95 UncheckedStringEvent("To", StateToString(previous_tag_))); |
94 } | 96 } |
95 #endif // ENABLE_LOGGING_AND_PROFILING | 97 #endif // ENABLE_LOGGING_AND_PROFILING |
96 | 98 |
97 #ifdef ENABLE_HEAP_PROTECTION | 99 #ifdef ENABLE_HEAP_PROTECTION |
98 StateTag tag = isolate_->current_vm_state(); | 100 StateTag tag = isolate_->current_vm_state(); |
99 #endif | 101 #endif |
100 | 102 |
101 isolate_->SetCurrentVMState(previous_tag_); | 103 isolate_->SetCurrentVMState(previous_tag_); |
102 | 104 |
103 #ifdef ENABLE_HEAP_PROTECTION | 105 #ifdef ENABLE_HEAP_PROTECTION |
(...skipping 23 matching lines...) Expand all Loading... |
127 ExternalCallbackScope::~ExternalCallbackScope() { | 129 ExternalCallbackScope::~ExternalCallbackScope() { |
128 isolate_->set_external_callback(previous_callback_); | 130 isolate_->set_external_callback(previous_callback_); |
129 } | 131 } |
130 | 132 |
131 #endif // ENABLE_LOGGING_AND_PROFILING | 133 #endif // ENABLE_LOGGING_AND_PROFILING |
132 | 134 |
133 | 135 |
134 } } // namespace v8::internal | 136 } } // namespace v8::internal |
135 | 137 |
136 #endif // V8_VM_STATE_INL_H_ | 138 #endif // V8_VM_STATE_INL_H_ |
OLD | NEW |