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

Side by Side Diff: src/deoptimizer.h

Issue 7860035: Merge bleeding edge up to 9192 into the GC branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/gc
Patch Set: Created 9 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/date.js ('k') | src/dtoa.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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 public: 330 public:
331 FrameDescription(uint32_t frame_size, 331 FrameDescription(uint32_t frame_size,
332 JSFunction* function); 332 JSFunction* function);
333 333
334 void* operator new(size_t size, uint32_t frame_size) { 334 void* operator new(size_t size, uint32_t frame_size) {
335 // Subtracts kPointerSize, as the member frame_content_ already supplies 335 // Subtracts kPointerSize, as the member frame_content_ already supplies
336 // the first element of the area to store the frame. 336 // the first element of the area to store the frame.
337 return malloc(size + frame_size - kPointerSize); 337 return malloc(size + frame_size - kPointerSize);
338 } 338 }
339 339
340 void operator delete(void* pointer, uint32_t frame_size) {
341 free(pointer);
342 }
343
340 void operator delete(void* description) { 344 void operator delete(void* description) {
341 free(description); 345 free(description);
342 } 346 }
343 347
344 uint32_t GetFrameSize() const { 348 uint32_t GetFrameSize() const {
345 ASSERT(static_cast<uint32_t>(frame_size_) == frame_size_); 349 ASSERT(static_cast<uint32_t>(frame_size_) == frame_size_);
346 return static_cast<uint32_t>(frame_size_); 350 return static_cast<uint32_t>(frame_size_);
347 } 351 }
348 352
349 JSFunction* GetFunction() const { return function_; } 353 JSFunction* GetFunction() const { return function_; }
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 Object** parameters_; 718 Object** parameters_;
715 Object** expression_stack_; 719 Object** expression_stack_;
716 720
717 friend class Deoptimizer; 721 friend class Deoptimizer;
718 }; 722 };
719 #endif 723 #endif
720 724
721 } } // namespace v8::internal 725 } } // namespace v8::internal
722 726
723 #endif // V8_DEOPTIMIZER_H_ 727 #endif // V8_DEOPTIMIZER_H_
OLDNEW
« no previous file with comments | « src/date.js ('k') | src/dtoa.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698