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

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

Issue 6580026: Fix presubmit error. (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
« 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 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 2162 matching lines...) Expand 10 before | Expand all | Expand 10 after
2173 // We should not have found a 'with' context by walking the context chain 2173 // We should not have found a 'with' context by walking the context chain
2174 // (i.e., the static scope chain and runtime context chain do not agree). 2174 // (i.e., the static scope chain and runtime context chain do not agree).
2175 // A variable occurring in such a scope should have slot type LOOKUP and 2175 // A variable occurring in such a scope should have slot type LOOKUP and
2176 // not CONTEXT. 2176 // not CONTEXT.
2177 if (FLAG_debug_code) { 2177 if (FLAG_debug_code) {
2178 ldr(ip, MemOperand(dst, Context::SlotOffset(Context::FCONTEXT_INDEX))); 2178 ldr(ip, MemOperand(dst, Context::SlotOffset(Context::FCONTEXT_INDEX)));
2179 cmp(dst, ip); 2179 cmp(dst, ip);
2180 Check(eq, "Yo dawg, I heard you liked function contexts " 2180 Check(eq, "Yo dawg, I heard you liked function contexts "
2181 "so I put function contexts in all your contexts"); 2181 "so I put function contexts in all your contexts");
2182 } 2182 }
2183
2184 } 2183 }
2185 2184
2186 2185
2187 void MacroAssembler::LoadGlobalFunction(int index, Register function) { 2186 void MacroAssembler::LoadGlobalFunction(int index, Register function) {
2188 // Load the global or builtins object from the current context. 2187 // Load the global or builtins object from the current context.
2189 ldr(function, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX))); 2188 ldr(function, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX)));
2190 // Load the global context from the global or builtins object. 2189 // Load the global context from the global or builtins object.
2191 ldr(function, FieldMemOperand(function, 2190 ldr(function, FieldMemOperand(function,
2192 GlobalObject::kGlobalContextOffset)); 2191 GlobalObject::kGlobalContextOffset));
2193 // Load the function from the global context. 2192 // Load the function from the global context.
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
2570 void CodePatcher::EmitCondition(Condition cond) { 2569 void CodePatcher::EmitCondition(Condition cond) {
2571 Instr instr = Assembler::instr_at(masm_.pc_); 2570 Instr instr = Assembler::instr_at(masm_.pc_);
2572 instr = (instr & ~kCondMask) | cond; 2571 instr = (instr & ~kCondMask) | cond;
2573 masm_.emit(instr); 2572 masm_.emit(instr);
2574 } 2573 }
2575 2574
2576 2575
2577 } } // namespace v8::internal 2576 } } // namespace v8::internal
2578 2577
2579 #endif // V8_TARGET_ARCH_ARM 2578 #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