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

Side by Side Diff: src/arm/frames-arm.cc

Issue 335027: Reverted 3130-3131 since they don't work on mac. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 years, 1 month 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/arm/frames-arm.h ('k') | src/arm/macro-assembler-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 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 Object* marker = Memory::Object_at(state->fp + offset); 47 Object* marker = Memory::Object_at(state->fp + offset);
48 if (!marker->IsSmi()) return JAVA_SCRIPT; 48 if (!marker->IsSmi()) return JAVA_SCRIPT;
49 return static_cast<StackFrame::Type>(Smi::cast(marker)->value()); 49 return static_cast<StackFrame::Type>(Smi::cast(marker)->value());
50 } 50 }
51 51
52 52
53 StackFrame::Type ExitFrame::GetStateForFramePointer(Address fp, State* state) { 53 StackFrame::Type ExitFrame::GetStateForFramePointer(Address fp, State* state) {
54 if (fp == 0) return NONE; 54 if (fp == 0) return NONE;
55 // Compute frame type and stack pointer. 55 // Compute frame type and stack pointer.
56 Address sp = fp + ExitFrameConstants::kSPDisplacement; 56 Address sp = fp + ExitFrameConstants::kSPDisplacement;
57 const int offset = ExitFrameConstants::kCodeOffset; 57 Type type;
58 Object* code = Memory::Object_at(fp + offset); 58 if (Memory::Address_at(fp + ExitFrameConstants::kDebugMarkOffset) != 0) {
59 bool is_debug_exit = code->IsSmi(); 59 type = EXIT_DEBUG;
60 if (is_debug_exit)
61 sp -= kNumJSCallerSaved * kPointerSize; 60 sp -= kNumJSCallerSaved * kPointerSize;
61 } else {
62 type = EXIT;
63 }
62 // Fill in the state. 64 // Fill in the state.
63 state->sp = sp; 65 state->sp = sp;
64 state->fp = fp; 66 state->fp = fp;
65 state->pc_address = reinterpret_cast<Address*>(sp - 1 * kPointerSize); 67 state->pc_address = reinterpret_cast<Address*>(sp - 1 * kPointerSize);
66 return EXIT; 68 return type;
67 } 69 }
68 70
69 71
70 void ExitFrame::Iterate(ObjectVisitor* v) const { 72 void ExitFrame::Iterate(ObjectVisitor* v) const {
71 // Do nothing 73 // Do nothing
72 } 74 }
73 75
74 76
75 int JavaScriptFrame::GetProvidedParametersCount() const { 77 int JavaScriptFrame::GetProvidedParametersCount() const {
76 return ComputeParametersCount(); 78 return ComputeParametersCount();
(...skipping 30 matching lines...) Expand all
107 109
108 110
109 Address InternalFrame::GetCallerStackPointer() const { 111 Address InternalFrame::GetCallerStackPointer() const {
110 // Internal frames have no arguments. The stack pointer of the 112 // Internal frames have no arguments. The stack pointer of the
111 // caller is at a fixed offset from the frame pointer. 113 // caller is at a fixed offset from the frame pointer.
112 return fp() + StandardFrameConstants::kCallerSPOffset; 114 return fp() + StandardFrameConstants::kCallerSPOffset;
113 } 115 }
114 116
115 117
116 } } // namespace v8::internal 118 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/arm/frames-arm.h ('k') | src/arm/macro-assembler-arm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698