| 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 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 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 AssertNoZoneAllocation::AssertNoZoneAllocation() | |
| 43 : prev_(Isolate::Current()->zone_allow_allocation()) { | |
| 44 Isolate::Current()->set_zone_allow_allocation(false); | |
| 45 } | |
| 46 | |
| 47 | |
| 48 AssertNoZoneAllocation::~AssertNoZoneAllocation() { | |
| 49 Isolate::Current()->set_zone_allow_allocation(prev_); | |
| 50 } | |
| 51 | |
| 52 | |
| 53 inline void* Zone::New(int size) { | 42 inline void* Zone::New(int size) { |
| 54 ASSERT(Isolate::Current()->zone_allow_allocation()); | |
| 55 ASSERT(ZoneScope::nesting() > 0); | 43 ASSERT(ZoneScope::nesting() > 0); |
| 56 // Round up the requested size to fit the alignment. | 44 // Round up the requested size to fit the alignment. |
| 57 size = RoundUp(size, kAlignment); | 45 size = RoundUp(size, kAlignment); |
| 58 | 46 |
| 59 // 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 |
| 60 // address. | 48 // address. |
| 61 if (kPointerSize == 4 && kAlignment == 4) { | 49 if (kPointerSize == 4 && kAlignment == 4) { |
| 62 position_ += ((~size) & 4) & (reinterpret_cast<intptr_t>(position_) & 4); | 50 position_ += ((~size) & 4) & (reinterpret_cast<intptr_t>(position_) & 4); |
| 63 } else { | 51 } else { |
| 64 ASSERT(kAlignment >= kPointerSize); | 52 ASSERT(kAlignment >= kPointerSize); |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 135 |
| 148 | 136 |
| 149 int ZoneScope::nesting() { | 137 int ZoneScope::nesting() { |
| 150 return Isolate::Current()->zone()->scope_nesting_; | 138 return Isolate::Current()->zone()->scope_nesting_; |
| 151 } | 139 } |
| 152 | 140 |
| 153 | 141 |
| 154 } } // namespace v8::internal | 142 } } // namespace v8::internal |
| 155 | 143 |
| 156 #endif // V8_ZONE_INL_H_ | 144 #endif // V8_ZONE_INL_H_ |
| OLD | NEW |