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

Side by Side Diff: src/arm/code-stubs-arm.cc

Issue 7633014: Do not use deprecated ARM instructions in DirectCEntryStub::GenerateCall. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 years, 4 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/arm/deoptimizer-arm.cc » ('j') | src/arm/deoptimizer-arm.cc » ('J')
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 6301 matching lines...) Expand 10 before | Expand all | Expand 10 after
6312 __ ldr(pc, MemOperand(sp, 0)); 6312 __ ldr(pc, MemOperand(sp, 0));
6313 } 6313 }
6314 6314
6315 6315
6316 void DirectCEntryStub::GenerateCall(MacroAssembler* masm, 6316 void DirectCEntryStub::GenerateCall(MacroAssembler* masm,
6317 ExternalReference function) { 6317 ExternalReference function) {
6318 __ mov(lr, Operand(reinterpret_cast<intptr_t>(GetCode().location()), 6318 __ mov(lr, Operand(reinterpret_cast<intptr_t>(GetCode().location()),
6319 RelocInfo::CODE_TARGET)); 6319 RelocInfo::CODE_TARGET));
6320 __ mov(r2, Operand(function)); 6320 __ mov(r2, Operand(function));
6321 // Push return address (accessible to GC through exit frame pc). 6321 // Push return address (accessible to GC through exit frame pc).
6322 __ str(pc, MemOperand(sp, 0)); 6322 // Note that using pc with str is deprecated.
6323 __ add(ip, pc, Operand(4));
m.m.capewell 2011/08/12 11:50:54 Replace 4 with kInstrSize, and assert on the size
6324 __ str(ip, MemOperand(sp, 0));
6323 __ Jump(r2); // Call the api function. 6325 __ Jump(r2); // Call the api function.
6324 } 6326 }
6325 6327
6326 6328
6327 void DirectCEntryStub::GenerateCall(MacroAssembler* masm, 6329 void DirectCEntryStub::GenerateCall(MacroAssembler* masm,
6328 Register target) { 6330 Register target) {
6329 __ mov(lr, Operand(reinterpret_cast<intptr_t>(GetCode().location()), 6331 __ mov(lr, Operand(reinterpret_cast<intptr_t>(GetCode().location()),
6330 RelocInfo::CODE_TARGET)); 6332 RelocInfo::CODE_TARGET));
6331 // Push return address (accessible to GC through exit frame pc). 6333 // Push return address (accessible to GC through exit frame pc).
6332 __ str(pc, MemOperand(sp, 0)); 6334 // Note that using pc with str is deprecated.
6335 __ add(ip, pc, Operand(4));
m.m.capewell 2011/08/12 11:50:54 As above.
6336 __ str(ip, MemOperand(sp, 0));
6333 __ Jump(target); // Call the C++ function. 6337 __ Jump(target); // Call the C++ function.
6334 } 6338 }
6335 6339
6336 6340
6337 MaybeObject* StringDictionaryLookupStub::GenerateNegativeLookup( 6341 MaybeObject* StringDictionaryLookupStub::GenerateNegativeLookup(
6338 MacroAssembler* masm, 6342 MacroAssembler* masm,
6339 Label* miss, 6343 Label* miss,
6340 Label* done, 6344 Label* done,
6341 Register receiver, 6345 Register receiver,
6342 Register properties, 6346 Register properties,
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
6565 __ mov(result, Operand(0)); 6569 __ mov(result, Operand(0));
6566 __ Ret(); 6570 __ Ret();
6567 } 6571 }
6568 6572
6569 6573
6570 #undef __ 6574 #undef __
6571 6575
6572 } } // namespace v8::internal 6576 } } // namespace v8::internal
6573 6577
6574 #endif // V8_TARGET_ARCH_ARM 6578 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/arm/deoptimizer-arm.cc » ('j') | src/arm/deoptimizer-arm.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698