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

Side by Side Diff: src/vm-state-inl.h

Issue 7324051: Remove heap protection support. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « src/spaces-inl.h ('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 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(isolate, UncheckedStringEvent("Entering", StateToString(tag))); 66 LOG(isolate, UncheckedStringEvent("Entering", StateToString(tag)));
67 LOG(isolate, 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
73 #ifdef ENABLE_HEAP_PROTECTION
74 if (FLAG_protect_heap) {
75 if (tag == EXTERNAL) {
76 // We are leaving V8.
77 ASSERT(previous_tag_ != EXTERNAL);
78 isolate_->heap()->Protect();
79 } else if (previous_tag_ = EXTERNAL) {
80 // We are entering V8.
81 isolate_->heap()->Unprotect();
82 }
83 }
84 #endif
85 } 72 }
86 73
87 74
88 VMState::~VMState() { 75 VMState::~VMState() {
89 #ifdef ENABLE_LOGGING_AND_PROFILING 76 #ifdef ENABLE_LOGGING_AND_PROFILING
90 if (FLAG_log_state_changes) { 77 if (FLAG_log_state_changes) {
91 LOG(isolate_, 78 LOG(isolate_,
92 UncheckedStringEvent("Leaving", 79 UncheckedStringEvent("Leaving",
93 StateToString(isolate_->current_vm_state()))); 80 StateToString(isolate_->current_vm_state())));
94 LOG(isolate_, 81 LOG(isolate_,
95 UncheckedStringEvent("To", StateToString(previous_tag_))); 82 UncheckedStringEvent("To", StateToString(previous_tag_)));
96 } 83 }
97 #endif // ENABLE_LOGGING_AND_PROFILING 84 #endif // ENABLE_LOGGING_AND_PROFILING
98 85
99 #ifdef ENABLE_HEAP_PROTECTION
100 StateTag tag = isolate_->current_vm_state();
101 #endif
102
103 isolate_->SetCurrentVMState(previous_tag_); 86 isolate_->SetCurrentVMState(previous_tag_);
104
105 #ifdef ENABLE_HEAP_PROTECTION
106 if (FLAG_protect_heap) {
107 if (tag == EXTERNAL) {
108 // We are reentering V8.
109 ASSERT(previous_tag_ != EXTERNAL);
110 isolate_->heap()->Unprotect();
111 } else if (previous_tag_ == EXTERNAL) {
112 // We are leaving V8.
113 isolate_->heap()->Protect();
114 }
115 }
116 #endif // ENABLE_HEAP_PROTECTION
117 } 87 }
118 88
119 #endif // ENABLE_VMSTATE_TRACKING 89 #endif // ENABLE_VMSTATE_TRACKING
120 90
121 91
122 #ifdef ENABLE_LOGGING_AND_PROFILING 92 #ifdef ENABLE_LOGGING_AND_PROFILING
123 93
124 ExternalCallbackScope::ExternalCallbackScope(Isolate* isolate, Address callback) 94 ExternalCallbackScope::ExternalCallbackScope(Isolate* isolate, Address callback)
125 : isolate_(isolate), previous_callback_(isolate->external_callback()) { 95 : isolate_(isolate), previous_callback_(isolate->external_callback()) {
126 isolate_->set_external_callback(callback); 96 isolate_->set_external_callback(callback);
127 } 97 }
128 98
129 ExternalCallbackScope::~ExternalCallbackScope() { 99 ExternalCallbackScope::~ExternalCallbackScope() {
130 isolate_->set_external_callback(previous_callback_); 100 isolate_->set_external_callback(previous_callback_);
131 } 101 }
132 102
133 #endif // ENABLE_LOGGING_AND_PROFILING 103 #endif // ENABLE_LOGGING_AND_PROFILING
134 104
135 105
136 } } // namespace v8::internal 106 } } // namespace v8::internal
137 107
138 #endif // V8_VM_STATE_INL_H_ 108 #endif // V8_VM_STATE_INL_H_
OLDNEW
« no previous file with comments | « src/spaces-inl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698