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

Side by Side Diff: src/frames.cc

Issue 14651004: Revert "frames.h/cc cleanup" (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: rebase Created 7 years, 7 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/frames.h ('k') | no next file » | 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 handler_ = StackHandler::FromAddress( 161 handler_ = StackHandler::FromAddress(
162 Isolate::handler(thread_)); 162 Isolate::handler(thread_));
163 } else { 163 } else {
164 ASSERT(fp_ != NULL); 164 ASSERT(fp_ != NULL);
165 state.fp = fp_; 165 state.fp = fp_;
166 state.sp = sp_; 166 state.sp = sp_;
167 state.pc_address = ResolveReturnAddressLocation( 167 state.pc_address = ResolveReturnAddressLocation(
168 reinterpret_cast<Address*>(StandardFrame::ComputePCAddress(fp_))); 168 reinterpret_cast<Address*>(StandardFrame::ComputePCAddress(fp_)));
169 type = StackFrame::ComputeType(isolate(), &state); 169 type = StackFrame::ComputeType(isolate(), &state);
170 } 170 }
171 if (SingletonFor(type) == NULL) return;
171 frame_ = SingletonFor(type, &state); 172 frame_ = SingletonFor(type, &state);
172 } 173 }
173 174
174 175
175 StackFrame* StackFrameIterator::SingletonFor(StackFrame::Type type, 176 StackFrame* StackFrameIterator::SingletonFor(StackFrame::Type type,
176 StackFrame::State* state) { 177 StackFrame::State* state) {
177 if (type == StackFrame::NONE) return NULL; 178 if (type == StackFrame::NONE) return NULL;
178 StackFrame* result = SingletonFor(type); 179 StackFrame* result = SingletonFor(type);
179 ASSERT(result != NULL); 180 ASSERT(result != NULL);
180 result->state_ = *state; 181 result->state_ = *state;
(...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 ZoneList<StackFrame*> list(10, zone); 1494 ZoneList<StackFrame*> list(10, zone);
1494 for (StackFrameIterator it(isolate); !it.done(); it.Advance()) { 1495 for (StackFrameIterator it(isolate); !it.done(); it.Advance()) {
1495 StackFrame* frame = AllocateFrameCopy(it.frame(), zone); 1496 StackFrame* frame = AllocateFrameCopy(it.frame(), zone);
1496 list.Add(frame, zone); 1497 list.Add(frame, zone);
1497 } 1498 }
1498 return list.ToVector(); 1499 return list.ToVector();
1499 } 1500 }
1500 1501
1501 1502
1502 } } // namespace v8::internal 1503 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/frames.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698