| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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 22 matching lines...) Expand all Loading... |
| 33 #include "counters.h" | 33 #include "counters.h" |
| 34 #include "isolate.h" | 34 #include "isolate.h" |
| 35 #include "utils.h" | 35 #include "utils.h" |
| 36 #include "v8-counters.h" | 36 #include "v8-counters.h" |
| 37 | 37 |
| 38 namespace v8 { | 38 namespace v8 { |
| 39 namespace internal { | 39 namespace internal { |
| 40 | 40 |
| 41 | 41 |
| 42 inline void* Zone::New(int size) { | 42 inline void* Zone::New(int size) { |
| 43 ASSERT(ZoneScope::nesting() > 0); | 43 ASSERT(scope_nesting_ > 0); |
| 44 // Round up the requested size to fit the alignment. | 44 // Round up the requested size to fit the alignment. |
| 45 size = RoundUp(size, kAlignment); | 45 size = RoundUp(size, kAlignment); |
| 46 | 46 |
| 47 // If the allocation size is divisible by 8 then we return an 8-byte aligned | 47 // If the allocation size is divisible by 8 then we return an 8-byte aligned |
| 48 // address. | 48 // address. |
| 49 if (kPointerSize == 4 && kAlignment == 4) { | 49 if (kPointerSize == 4 && kAlignment == 4) { |
| 50 position_ += ((~size) & 4) & (reinterpret_cast<intptr_t>(position_) & 4); | 50 position_ += ((~size) & 4) & (reinterpret_cast<intptr_t>(position_) & 4); |
| 51 } else { | 51 } else { |
| 52 ASSERT(kAlignment >= kPointerSize); | 52 ASSERT(kAlignment >= kPointerSize); |
| 53 } | 53 } |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 return zone_->New(static_cast<int>(size)); | 103 return zone_->New(static_cast<int>(size)); |
| 104 } | 104 } |
| 105 | 105 |
| 106 | 106 |
| 107 template <typename T> | 107 template <typename T> |
| 108 void* ZoneList<T>::operator new(size_t size, Zone* zone) { | 108 void* ZoneList<T>::operator new(size_t size, Zone* zone) { |
| 109 return zone->New(static_cast<int>(size)); | 109 return zone->New(static_cast<int>(size)); |
| 110 } | 110 } |
| 111 | 111 |
| 112 | 112 |
| 113 ZoneScope::ZoneScope(Isolate* isolate, ZoneScopeMode mode) | 113 ZoneScope::ZoneScope(Zone* zone, ZoneScopeMode mode) |
| 114 : isolate_(isolate), mode_(mode) { | 114 : zone_(zone), mode_(mode) { |
| 115 isolate_->zone()->scope_nesting_++; | 115 zone_->scope_nesting_++; |
| 116 } | 116 } |
| 117 | 117 |
| 118 | 118 |
| 119 bool ZoneScope::ShouldDeleteOnExit() { | 119 bool ZoneScope::ShouldDeleteOnExit() { |
| 120 return isolate_->zone()->scope_nesting_ == 1 && mode_ == DELETE_ON_EXIT; | 120 return zone_->scope_nesting_ == 1 && mode_ == DELETE_ON_EXIT; |
| 121 } | 121 } |
| 122 | 122 |
| 123 | 123 |
| 124 int ZoneScope::nesting() { | |
| 125 return Isolate::Current()->zone()->scope_nesting_; | |
| 126 } | |
| 127 | |
| 128 | |
| 129 } } // namespace v8::internal | 124 } } // namespace v8::internal |
| 130 | 125 |
| 131 #endif // V8_ZONE_INL_H_ | 126 #endif // V8_ZONE_INL_H_ |
| OLD | NEW |