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

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

Issue 10546171: Fix packed-element.js test on ARM with no snap (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 6 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 | no next file » | 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 2860 matching lines...) Expand 10 before | Expand all | Expand 10 after
2871 // Load the global or builtins object from the current context. 2871 // Load the global or builtins object from the current context.
2872 ldr(scratch, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX))); 2872 ldr(scratch, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX)));
2873 ldr(scratch, FieldMemOperand(scratch, GlobalObject::kGlobalContextOffset)); 2873 ldr(scratch, FieldMemOperand(scratch, GlobalObject::kGlobalContextOffset));
2874 2874
2875 // Check that the function's map is the same as the expected cached map. 2875 // Check that the function's map is the same as the expected cached map.
2876 ldr(scratch, 2876 ldr(scratch,
2877 MemOperand(scratch, 2877 MemOperand(scratch,
2878 Context::SlotOffset(Context::JS_ARRAY_MAPS_INDEX))); 2878 Context::SlotOffset(Context::JS_ARRAY_MAPS_INDEX)));
2879 size_t offset = expected_kind * kPointerSize + 2879 size_t offset = expected_kind * kPointerSize +
2880 FixedArrayBase::kHeaderSize; 2880 FixedArrayBase::kHeaderSize;
2881 cmp(map_in_out, scratch); 2881 ldr(ip, FieldMemOperand(scratch, offset));
2882 cmp(map_in_out, ip);
2882 b(ne, no_map_match); 2883 b(ne, no_map_match);
2883 2884
2884 // Use the transitioned cached map. 2885 // Use the transitioned cached map.
2885 offset = transitioned_kind * kPointerSize + 2886 offset = transitioned_kind * kPointerSize +
2886 FixedArrayBase::kHeaderSize; 2887 FixedArrayBase::kHeaderSize;
2887 ldr(map_in_out, FieldMemOperand(scratch, offset)); 2888 ldr(map_in_out, FieldMemOperand(scratch, offset));
Michael Starzinger 2012/06/14 16:44:37 These three lines can be turned into a simple mov(
Michael Starzinger 2012/06/14 19:51:01 Actually, what I said is complete nonsense, the of
2888 } 2889 }
2889 2890
2890 2891
2891 void MacroAssembler::LoadInitialArrayMap( 2892 void MacroAssembler::LoadInitialArrayMap(
2892 Register function_in, Register scratch, 2893 Register function_in, Register scratch,
2893 Register map_out, bool can_have_holes) { 2894 Register map_out, bool can_have_holes) {
2894 ASSERT(!function_in.is(map_out)); 2895 ASSERT(!function_in.is(map_out));
2895 Label done; 2896 Label done;
2896 ldr(map_out, FieldMemOperand(function_in, 2897 ldr(map_out, FieldMemOperand(function_in,
2897 JSFunction::kPrototypeOrInitialMapOffset)); 2898 JSFunction::kPrototypeOrInitialMapOffset));
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
3787 void CodePatcher::EmitCondition(Condition cond) { 3788 void CodePatcher::EmitCondition(Condition cond) {
3788 Instr instr = Assembler::instr_at(masm_.pc_); 3789 Instr instr = Assembler::instr_at(masm_.pc_);
3789 instr = (instr & ~kCondMask) | cond; 3790 instr = (instr & ~kCondMask) | cond;
3790 masm_.emit(instr); 3791 masm_.emit(instr);
3791 } 3792 }
3792 3793
3793 3794
3794 } } // namespace v8::internal 3795 } } // namespace v8::internal
3795 3796
3796 #endif // V8_TARGET_ARCH_ARM 3797 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698