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

Side by Side Diff: src/frames.cc

Issue 23708030: Get rid of most uses of 'Temporary macro' HEAP (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: nits Created 7 years, 3 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/extensions/gc-extension.cc ('k') | src/heap.cc » ('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 // 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 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 482
483 return (alignment_state == kAlignmentPaddingPushed) ? 483 return (alignment_state == kAlignmentPaddingPushed) ?
484 (fp() + kPointerSize) : fp(); 484 (fp() + kPointerSize) : fp();
485 #else 485 #else
486 return fp(); 486 return fp();
487 #endif 487 #endif
488 } 488 }
489 489
490 490
491 Code* EntryFrame::unchecked_code() const { 491 Code* EntryFrame::unchecked_code() const {
492 return HEAP->js_entry_code(); 492 return isolate()->heap()->js_entry_code();
493 } 493 }
494 494
495 495
496 void EntryFrame::ComputeCallerState(State* state) const { 496 void EntryFrame::ComputeCallerState(State* state) const {
497 GetCallerState(state); 497 GetCallerState(state);
498 } 498 }
499 499
500 500
501 void EntryFrame::SetCallerFp(Address caller_fp) { 501 void EntryFrame::SetCallerFp(Address caller_fp) {
502 const int offset = EntryFrameConstants::kCallerFPOffset; 502 const int offset = EntryFrameConstants::kCallerFPOffset;
503 Memory::Address_at(this->fp() + offset) = caller_fp; 503 Memory::Address_at(this->fp() + offset) = caller_fp;
504 } 504 }
505 505
506 506
507 StackFrame::Type EntryFrame::GetCallerState(State* state) const { 507 StackFrame::Type EntryFrame::GetCallerState(State* state) const {
508 const int offset = EntryFrameConstants::kCallerFPOffset; 508 const int offset = EntryFrameConstants::kCallerFPOffset;
509 Address fp = Memory::Address_at(this->fp() + offset); 509 Address fp = Memory::Address_at(this->fp() + offset);
510 return ExitFrame::GetStateForFramePointer(fp, state); 510 return ExitFrame::GetStateForFramePointer(fp, state);
511 } 511 }
512 512
513 513
514 Code* EntryConstructFrame::unchecked_code() const { 514 Code* EntryConstructFrame::unchecked_code() const {
515 return HEAP->js_construct_entry_code(); 515 return isolate()->heap()->js_construct_entry_code();
516 } 516 }
517 517
518 518
519 Object*& ExitFrame::code_slot() const { 519 Object*& ExitFrame::code_slot() const {
520 const int offset = ExitFrameConstants::kCodeOffset; 520 const int offset = ExitFrameConstants::kCodeOffset;
521 return Memory::Object_at(fp() + offset); 521 return Memory::Object_at(fp() + offset);
522 } 522 }
523 523
524 524
525 Code* ExitFrame::unchecked_code() const { 525 Code* ExitFrame::unchecked_code() const {
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1627 ZoneList<StackFrame*> list(10, zone); 1627 ZoneList<StackFrame*> list(10, zone);
1628 for (StackFrameIterator it(isolate); !it.done(); it.Advance()) { 1628 for (StackFrameIterator it(isolate); !it.done(); it.Advance()) {
1629 StackFrame* frame = AllocateFrameCopy(it.frame(), zone); 1629 StackFrame* frame = AllocateFrameCopy(it.frame(), zone);
1630 list.Add(frame, zone); 1630 list.Add(frame, zone);
1631 } 1631 }
1632 return list.ToVector(); 1632 return list.ToVector();
1633 } 1633 }
1634 1634
1635 1635
1636 } } // namespace v8::internal 1636 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/extensions/gc-extension.cc ('k') | src/heap.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698