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

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

Issue 7351015: Merge r8623 to the 3.3 branch (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.3/
Patch Set: '' Created 9 years, 5 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/arm/lithium-codegen-arm.cc ('k') | src/version.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 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 } 1312 }
1313 1313
1314 1314
1315 void LCodeGen::DoArithmeticT(LArithmeticT* instr) { 1315 void LCodeGen::DoArithmeticT(LArithmeticT* instr) {
1316 ASSERT(ToRegister(instr->InputAt(0)).is(edx)); 1316 ASSERT(ToRegister(instr->InputAt(0)).is(edx));
1317 ASSERT(ToRegister(instr->InputAt(1)).is(eax)); 1317 ASSERT(ToRegister(instr->InputAt(1)).is(eax));
1318 ASSERT(ToRegister(instr->result()).is(eax)); 1318 ASSERT(ToRegister(instr->result()).is(eax));
1319 1319
1320 BinaryOpStub stub(instr->op(), NO_OVERWRITE); 1320 BinaryOpStub stub(instr->op(), NO_OVERWRITE);
1321 CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr, RESTORE_CONTEXT); 1321 CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr, RESTORE_CONTEXT);
1322 __ nop(); // Signals no inlined code.
1322 } 1323 }
1323 1324
1324 1325
1325 int LCodeGen::GetNextEmittedBlock(int block) { 1326 int LCodeGen::GetNextEmittedBlock(int block) {
1326 for (int i = block + 1; i < graph()->blocks()->length(); ++i) { 1327 for (int i = block + 1; i < graph()->blocks()->length(); ++i) {
1327 LLabel* label = chunk_->GetLabel(i); 1328 LLabel* label = chunk_->GetLabel(i);
1328 if (!label->HasReplacement()) return i; 1329 if (!label->HasReplacement()) return i;
1329 } 1330 }
1330 return -1; 1331 return -1;
1331 } 1332 }
(...skipping 3136 matching lines...) Expand 10 before | Expand all | Expand 10 after
4468 __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset)); 4469 __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
4469 __ InvokeBuiltin(Builtins::IN, CALL_FUNCTION, safepoint_generator); 4470 __ InvokeBuiltin(Builtins::IN, CALL_FUNCTION, safepoint_generator);
4470 } 4471 }
4471 4472
4472 4473
4473 #undef __ 4474 #undef __
4474 4475
4475 } } // namespace v8::internal 4476 } } // namespace v8::internal
4476 4477
4477 #endif // V8_TARGET_ARCH_IA32 4478 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/arm/lithium-codegen-arm.cc ('k') | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698