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

Side by Side Diff: src/deoptimizer.h

Issue 9716028: Merge r11075 from bleeding_edge to 3.8 branch: Revert dynamic frame alignment. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.8/
Patch Set: Created 8 years, 9 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 | « no previous file | src/deoptimizer.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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 static int GetOutputInfo(DeoptimizationOutputData* data, 213 static int GetOutputInfo(DeoptimizationOutputData* data,
214 unsigned node_id, 214 unsigned node_id,
215 SharedFunctionInfo* shared); 215 SharedFunctionInfo* shared);
216 216
217 // Code generation support. 217 // Code generation support.
218 static int input_offset() { return OFFSET_OF(Deoptimizer, input_); } 218 static int input_offset() { return OFFSET_OF(Deoptimizer, input_); }
219 static int output_count_offset() { 219 static int output_count_offset() {
220 return OFFSET_OF(Deoptimizer, output_count_); 220 return OFFSET_OF(Deoptimizer, output_count_);
221 } 221 }
222 static int output_offset() { return OFFSET_OF(Deoptimizer, output_); } 222 static int output_offset() { return OFFSET_OF(Deoptimizer, output_); }
223 static int frame_alignment_marker_offset() {
224 return OFFSET_OF(Deoptimizer, frame_alignment_marker_); }
225 static int has_alignment_padding_offset() {
226 return OFFSET_OF(Deoptimizer, has_alignment_padding_);
227 }
228 223
229 static int GetDeoptimizedCodeCount(Isolate* isolate); 224 static int GetDeoptimizedCodeCount(Isolate* isolate);
230 225
231 static const int kNotDeoptimizationEntry = -1; 226 static const int kNotDeoptimizationEntry = -1;
232 227
233 // Generators for the deoptimization entry code. 228 // Generators for the deoptimization entry code.
234 class EntryGenerator BASE_EMBEDDED { 229 class EntryGenerator BASE_EMBEDDED {
235 public: 230 public:
236 EntryGenerator(MacroAssembler* masm, BailoutType type) 231 EntryGenerator(MacroAssembler* masm, BailoutType type)
237 : masm_(masm), type_(type) { } 232 : masm_(masm), type_(type) { }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 327
333 // Input frame description. 328 // Input frame description.
334 FrameDescription* input_; 329 FrameDescription* input_;
335 // Number of output frames. 330 // Number of output frames.
336 int output_count_; 331 int output_count_;
337 // Number of output js frames. 332 // Number of output js frames.
338 int jsframe_count_; 333 int jsframe_count_;
339 // Array of output frame descriptions. 334 // Array of output frame descriptions.
340 FrameDescription** output_; 335 FrameDescription** output_;
341 336
342 // Frames can be dynamically padded on ia32 to align untagged doubles.
343 Object* frame_alignment_marker_;
344 intptr_t has_alignment_padding_;
345
346 List<HeapNumberMaterializationDescriptor> deferred_heap_numbers_; 337 List<HeapNumberMaterializationDescriptor> deferred_heap_numbers_;
347 338
348 static const int table_entry_size_; 339 static const int table_entry_size_;
349 340
350 friend class FrameDescription; 341 friend class FrameDescription;
351 friend class DeoptimizingCodeListNode; 342 friend class DeoptimizingCodeListNode;
352 friend class DeoptimizedFrameInfo; 343 friend class DeoptimizedFrameInfo;
353 }; 344 };
354 345
355 346
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 Object** parameters_; 764 Object** parameters_;
774 Object** expression_stack_; 765 Object** expression_stack_;
775 766
776 friend class Deoptimizer; 767 friend class Deoptimizer;
777 }; 768 };
778 #endif 769 #endif
779 770
780 } } // namespace v8::internal 771 } } // namespace v8::internal
781 772
782 #endif // V8_DEOPTIMIZER_H_ 773 #endif // V8_DEOPTIMIZER_H_
OLDNEW
« no previous file with comments | « no previous file | src/deoptimizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698