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

Side by Side Diff: src/arm/code-stubs-arm.h

Issue 1088993003: Replace OVERRIDE->override and FINAL->final since we now require C++11. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « include/v8config.h ('k') | src/arm/lithium-arm.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef V8_ARM_CODE_STUBS_ARM_H_ 5 #ifndef V8_ARM_CODE_STUBS_ARM_H_
6 #define V8_ARM_CODE_STUBS_ARM_H_ 6 #define V8_ARM_CODE_STUBS_ARM_H_
7 7
8 namespace v8 { 8 namespace v8 {
9 namespace internal { 9 namespace internal {
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 RecordWriteStub(uint32_t key, Isolate* isolate) 68 RecordWriteStub(uint32_t key, Isolate* isolate)
69 : PlatformCodeStub(key, isolate), regs_(object(), address(), value()) {} 69 : PlatformCodeStub(key, isolate), regs_(object(), address(), value()) {}
70 70
71 enum Mode { 71 enum Mode {
72 STORE_BUFFER_ONLY, 72 STORE_BUFFER_ONLY,
73 INCREMENTAL, 73 INCREMENTAL,
74 INCREMENTAL_COMPACTION 74 INCREMENTAL_COMPACTION
75 }; 75 };
76 76
77 bool SometimesSetsUpAFrame() OVERRIDE { return false; } 77 bool SometimesSetsUpAFrame() override { return false; }
78 78
79 static void PatchBranchIntoNop(MacroAssembler* masm, int pos) { 79 static void PatchBranchIntoNop(MacroAssembler* masm, int pos) {
80 masm->instr_at_put(pos, (masm->instr_at(pos) & ~B27) | (B24 | B20)); 80 masm->instr_at_put(pos, (masm->instr_at(pos) & ~B27) | (B24 | B20));
81 DCHECK(Assembler::IsTstImmediate(masm->instr_at(pos))); 81 DCHECK(Assembler::IsTstImmediate(masm->instr_at(pos)));
82 } 82 }
83 83
84 static void PatchNopIntoBranch(MacroAssembler* masm, int pos) { 84 static void PatchNopIntoBranch(MacroAssembler* masm, int pos) {
85 masm->instr_at_put(pos, (masm->instr_at(pos) & ~(B24 | B20)) | B27); 85 masm->instr_at_put(pos, (masm->instr_at(pos) & ~(B24 | B20)) | B27);
86 DCHECK(Assembler::IsBranch(masm->instr_at(pos))); 86 DCHECK(Assembler::IsBranch(masm->instr_at(pos)));
87 } 87 }
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 Register scratch1_; 190 Register scratch1_;
191 191
192 friend class RecordWriteStub; 192 friend class RecordWriteStub;
193 }; 193 };
194 194
195 enum OnNoNeedToInformIncrementalMarker { 195 enum OnNoNeedToInformIncrementalMarker {
196 kReturnOnNoNeedToInformIncrementalMarker, 196 kReturnOnNoNeedToInformIncrementalMarker,
197 kUpdateRememberedSetOnNoNeedToInformIncrementalMarker 197 kUpdateRememberedSetOnNoNeedToInformIncrementalMarker
198 }; 198 };
199 199
200 inline Major MajorKey() const FINAL { return RecordWrite; } 200 inline Major MajorKey() const final { return RecordWrite; }
201 201
202 void Generate(MacroAssembler* masm) OVERRIDE; 202 void Generate(MacroAssembler* masm) override;
203 void GenerateIncremental(MacroAssembler* masm, Mode mode); 203 void GenerateIncremental(MacroAssembler* masm, Mode mode);
204 void CheckNeedsToInformIncrementalMarker( 204 void CheckNeedsToInformIncrementalMarker(
205 MacroAssembler* masm, 205 MacroAssembler* masm,
206 OnNoNeedToInformIncrementalMarker on_no_need, 206 OnNoNeedToInformIncrementalMarker on_no_need,
207 Mode mode); 207 Mode mode);
208 void InformIncrementalMarker(MacroAssembler* masm); 208 void InformIncrementalMarker(MacroAssembler* masm);
209 209
210 void Activate(Code* code) OVERRIDE { 210 void Activate(Code* code) override {
211 code->GetHeap()->incremental_marking()->ActivateGeneratedStub(code); 211 code->GetHeap()->incremental_marking()->ActivateGeneratedStub(code);
212 } 212 }
213 213
214 Register object() const { 214 Register object() const {
215 return Register::from_code(ObjectBits::decode(minor_key_)); 215 return Register::from_code(ObjectBits::decode(minor_key_));
216 } 216 }
217 217
218 Register value() const { 218 Register value() const {
219 return Register::from_code(ValueBits::decode(minor_key_)); 219 return Register::from_code(ValueBits::decode(minor_key_));
220 } 220 }
(...skipping 27 matching lines...) Expand all
248 // in the presence of compacting GC (which can move code objects) we need to 248 // in the presence of compacting GC (which can move code objects) we need to
249 // keep the code which called into native pinned in the memory. Currently the 249 // keep the code which called into native pinned in the memory. Currently the
250 // simplest approach is to generate such stub early enough so it can never be 250 // simplest approach is to generate such stub early enough so it can never be
251 // moved by GC 251 // moved by GC
252 class DirectCEntryStub: public PlatformCodeStub { 252 class DirectCEntryStub: public PlatformCodeStub {
253 public: 253 public:
254 explicit DirectCEntryStub(Isolate* isolate) : PlatformCodeStub(isolate) {} 254 explicit DirectCEntryStub(Isolate* isolate) : PlatformCodeStub(isolate) {}
255 void GenerateCall(MacroAssembler* masm, Register target); 255 void GenerateCall(MacroAssembler* masm, Register target);
256 256
257 private: 257 private:
258 bool NeedsImmovableCode() OVERRIDE { return true; } 258 bool NeedsImmovableCode() override { return true; }
259 259
260 DEFINE_NULL_CALL_INTERFACE_DESCRIPTOR(); 260 DEFINE_NULL_CALL_INTERFACE_DESCRIPTOR();
261 DEFINE_PLATFORM_CODE_STUB(DirectCEntry, PlatformCodeStub); 261 DEFINE_PLATFORM_CODE_STUB(DirectCEntry, PlatformCodeStub);
262 }; 262 };
263 263
264 264
265 class NameDictionaryLookupStub: public PlatformCodeStub { 265 class NameDictionaryLookupStub: public PlatformCodeStub {
266 public: 266 public:
267 enum LookupMode { POSITIVE_LOOKUP, NEGATIVE_LOOKUP }; 267 enum LookupMode { POSITIVE_LOOKUP, NEGATIVE_LOOKUP };
268 268
(...skipping 11 matching lines...) Expand all
280 Register scratch0); 280 Register scratch0);
281 281
282 static void GeneratePositiveLookup(MacroAssembler* masm, 282 static void GeneratePositiveLookup(MacroAssembler* masm,
283 Label* miss, 283 Label* miss,
284 Label* done, 284 Label* done,
285 Register elements, 285 Register elements,
286 Register name, 286 Register name,
287 Register r0, 287 Register r0,
288 Register r1); 288 Register r1);
289 289
290 bool SometimesSetsUpAFrame() OVERRIDE { return false; } 290 bool SometimesSetsUpAFrame() override { return false; }
291 291
292 private: 292 private:
293 static const int kInlinedProbes = 4; 293 static const int kInlinedProbes = 4;
294 static const int kTotalProbes = 20; 294 static const int kTotalProbes = 20;
295 295
296 static const int kCapacityOffset = 296 static const int kCapacityOffset =
297 NameDictionary::kHeaderSize + 297 NameDictionary::kHeaderSize +
298 NameDictionary::kCapacityIndex * kPointerSize; 298 NameDictionary::kCapacityIndex * kPointerSize;
299 299
300 static const int kElementsStartOffset = 300 static const int kElementsStartOffset =
301 NameDictionary::kHeaderSize + 301 NameDictionary::kHeaderSize +
302 NameDictionary::kElementsStartIndex * kPointerSize; 302 NameDictionary::kElementsStartIndex * kPointerSize;
303 303
304 LookupMode mode() const { return LookupModeBits::decode(minor_key_); } 304 LookupMode mode() const { return LookupModeBits::decode(minor_key_); }
305 305
306 class LookupModeBits: public BitField<LookupMode, 0, 1> {}; 306 class LookupModeBits: public BitField<LookupMode, 0, 1> {};
307 307
308 DEFINE_NULL_CALL_INTERFACE_DESCRIPTOR(); 308 DEFINE_NULL_CALL_INTERFACE_DESCRIPTOR();
309 DEFINE_PLATFORM_CODE_STUB(NameDictionaryLookup, PlatformCodeStub); 309 DEFINE_PLATFORM_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
310 }; 310 };
311 311
312 } } // namespace v8::internal 312 } } // namespace v8::internal
313 313
314 #endif // V8_ARM_CODE_STUBS_ARM_H_ 314 #endif // V8_ARM_CODE_STUBS_ARM_H_
OLDNEW
« no previous file with comments | « include/v8config.h ('k') | src/arm/lithium-arm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698