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

Side by Side Diff: src/arm/macro-assembler-arm.cc

Issue 9139051: Cosmetic changes ("set up" is a verb, "setup" is a noun). (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 8 years, 11 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/macro-assembler-arm.h ('k') | src/arm/simulator-arm.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 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 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 // r2: preserved 810 // r2: preserved
811 811
812 // Drop the execution stack down to the frame pointer and restore 812 // Drop the execution stack down to the frame pointer and restore
813 // the caller frame pointer and return address. 813 // the caller frame pointer and return address.
814 mov(sp, fp); 814 mov(sp, fp);
815 ldm(ia_w, sp, fp.bit() | lr.bit()); 815 ldm(ia_w, sp, fp.bit() | lr.bit());
816 } 816 }
817 817
818 818
819 void MacroAssembler::EnterExitFrame(bool save_doubles, int stack_space) { 819 void MacroAssembler::EnterExitFrame(bool save_doubles, int stack_space) {
820 // Setup the frame structure on the stack. 820 // Set up the frame structure on the stack.
821 ASSERT_EQ(2 * kPointerSize, ExitFrameConstants::kCallerSPDisplacement); 821 ASSERT_EQ(2 * kPointerSize, ExitFrameConstants::kCallerSPDisplacement);
822 ASSERT_EQ(1 * kPointerSize, ExitFrameConstants::kCallerPCOffset); 822 ASSERT_EQ(1 * kPointerSize, ExitFrameConstants::kCallerPCOffset);
823 ASSERT_EQ(0 * kPointerSize, ExitFrameConstants::kCallerFPOffset); 823 ASSERT_EQ(0 * kPointerSize, ExitFrameConstants::kCallerFPOffset);
824 Push(lr, fp); 824 Push(lr, fp);
825 mov(fp, Operand(sp)); // Setup new frame pointer. 825 mov(fp, Operand(sp)); // Set up new frame pointer.
826 // Reserve room for saved entry sp and code object. 826 // Reserve room for saved entry sp and code object.
827 sub(sp, sp, Operand(2 * kPointerSize)); 827 sub(sp, sp, Operand(2 * kPointerSize));
828 if (emit_debug_code()) { 828 if (emit_debug_code()) {
829 mov(ip, Operand(0)); 829 mov(ip, Operand(0));
830 str(ip, MemOperand(fp, ExitFrameConstants::kSPOffset)); 830 str(ip, MemOperand(fp, ExitFrameConstants::kSPOffset));
831 } 831 }
832 mov(ip, Operand(CodeObject())); 832 mov(ip, Operand(CodeObject()));
833 str(ip, MemOperand(fp, ExitFrameConstants::kCodeOffset)); 833 str(ip, MemOperand(fp, ExitFrameConstants::kCodeOffset));
834 834
835 // Save the frame pointer and the context in top. 835 // Save the frame pointer and the context in top.
(...skipping 2830 matching lines...) Expand 10 before | Expand all | Expand 10 after
3666 void CodePatcher::EmitCondition(Condition cond) { 3666 void CodePatcher::EmitCondition(Condition cond) {
3667 Instr instr = Assembler::instr_at(masm_.pc_); 3667 Instr instr = Assembler::instr_at(masm_.pc_);
3668 instr = (instr & ~kCondMask) | cond; 3668 instr = (instr & ~kCondMask) | cond;
3669 masm_.emit(instr); 3669 masm_.emit(instr);
3670 } 3670 }
3671 3671
3672 3672
3673 } } // namespace v8::internal 3673 } } // namespace v8::internal
3674 3674
3675 #endif // V8_TARGET_ARCH_ARM 3675 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/macro-assembler-arm.h ('k') | src/arm/simulator-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698