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

Side by Side Diff: src/ia32/lithium-codegen-ia32.cc

Issue 6246106: Restore context after LApplyArguments.... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 years, 10 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
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 2124 matching lines...) Expand 10 before | Expand all | Expand 10 after
2135 LPointerMap* pointers = instr->pointer_map(); 2135 LPointerMap* pointers = instr->pointer_map();
2136 LEnvironment* env = instr->deoptimization_environment(); 2136 LEnvironment* env = instr->deoptimization_environment();
2137 RecordPosition(pointers->position()); 2137 RecordPosition(pointers->position());
2138 RegisterEnvironmentForDeoptimization(env); 2138 RegisterEnvironmentForDeoptimization(env);
2139 SafepointGenerator safepoint_generator(this, 2139 SafepointGenerator safepoint_generator(this,
2140 pointers, 2140 pointers,
2141 env->deoptimization_index()); 2141 env->deoptimization_index());
2142 ASSERT(receiver.is(eax)); 2142 ASSERT(receiver.is(eax));
2143 v8::internal::ParameterCount actual(eax); 2143 v8::internal::ParameterCount actual(eax);
2144 __ InvokeFunction(edi, actual, CALL_FUNCTION, &safepoint_generator); 2144 __ InvokeFunction(edi, actual, CALL_FUNCTION, &safepoint_generator);
2145
2146 // Restore context.
2147 __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
2145 } 2148 }
2146 2149
2147 2150
2148 void LCodeGen::DoPushArgument(LPushArgument* instr) { 2151 void LCodeGen::DoPushArgument(LPushArgument* instr) {
2149 LOperand* argument = instr->InputAt(0); 2152 LOperand* argument = instr->InputAt(0);
2150 if (argument->IsConstantOperand()) { 2153 if (argument->IsConstantOperand()) {
2151 __ push(ToImmediate(argument)); 2154 __ push(ToImmediate(argument));
2152 } else { 2155 } else {
2153 __ push(ToOperand(argument)); 2156 __ push(ToOperand(argument));
2154 } 2157 }
(...skipping 1453 matching lines...) Expand 10 before | Expand all | Expand 10 after
3608 ASSERT(osr_pc_offset_ == -1); 3611 ASSERT(osr_pc_offset_ == -1);
3609 osr_pc_offset_ = masm()->pc_offset(); 3612 osr_pc_offset_ = masm()->pc_offset();
3610 } 3613 }
3611 3614
3612 3615
3613 #undef __ 3616 #undef __
3614 3617
3615 } } // namespace v8::internal 3618 } } // namespace v8::internal
3616 3619
3617 #endif // V8_TARGET_ARCH_IA32 3620 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « no previous file | test/mjsunit/regress/regress-1099.js » ('j') | test/mjsunit/regress/regress-1099.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698