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

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

Issue 6880321: Removed InvokeJSFlags enum, we already have InvokeFlag for the same purpose. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 7 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/mips/macro-assembler-mips.h » ('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 2295 matching lines...) Expand 10 before | Expand all | Expand 10 after
2306 // Thumb mode builtin. 2306 // Thumb mode builtin.
2307 ASSERT((reinterpret_cast<intptr_t>(builtin.address()) & 1) == 1); 2307 ASSERT((reinterpret_cast<intptr_t>(builtin.address()) & 1) == 1);
2308 #endif 2308 #endif
2309 mov(r1, Operand(builtin)); 2309 mov(r1, Operand(builtin));
2310 CEntryStub stub(1); 2310 CEntryStub stub(1);
2311 return TryTailCallStub(&stub); 2311 return TryTailCallStub(&stub);
2312 } 2312 }
2313 2313
2314 2314
2315 void MacroAssembler::InvokeBuiltin(Builtins::JavaScript id, 2315 void MacroAssembler::InvokeBuiltin(Builtins::JavaScript id,
2316 InvokeJSFlags flags, 2316 InvokeFlag flag,
2317 CallWrapper* call_wrapper) { 2317 CallWrapper* call_wrapper) {
2318 GetBuiltinEntry(r2, id); 2318 GetBuiltinEntry(r2, id);
2319 if (flags == CALL_JS) { 2319 if (flag == CALL_FUNCTION) {
2320 if (call_wrapper != NULL) call_wrapper->BeforeCall(CallSize(r2)); 2320 if (call_wrapper != NULL) call_wrapper->BeforeCall(CallSize(r2));
2321 Call(r2); 2321 Call(r2);
2322 if (call_wrapper != NULL) call_wrapper->AfterCall(); 2322 if (call_wrapper != NULL) call_wrapper->AfterCall();
2323 } else { 2323 } else {
2324 ASSERT(flags == JUMP_JS); 2324 ASSERT(flag == JUMP_FUNCTION);
2325 Jump(r2); 2325 Jump(r2);
2326 } 2326 }
2327 } 2327 }
2328 2328
2329 2329
2330 void MacroAssembler::GetBuiltinFunction(Register target, 2330 void MacroAssembler::GetBuiltinFunction(Register target,
2331 Builtins::JavaScript id) { 2331 Builtins::JavaScript id) {
2332 // Load the builtins object into target register. 2332 // Load the builtins object into target register.
2333 ldr(target, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX))); 2333 ldr(target, MemOperand(cp, Context::SlotOffset(Context::GLOBAL_INDEX)));
2334 ldr(target, FieldMemOperand(target, GlobalObject::kBuiltinsOffset)); 2334 ldr(target, FieldMemOperand(target, GlobalObject::kBuiltinsOffset));
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
3054 void CodePatcher::EmitCondition(Condition cond) { 3054 void CodePatcher::EmitCondition(Condition cond) {
3055 Instr instr = Assembler::instr_at(masm_.pc_); 3055 Instr instr = Assembler::instr_at(masm_.pc_);
3056 instr = (instr & ~kCondMask) | cond; 3056 instr = (instr & ~kCondMask) | cond;
3057 masm_.emit(instr); 3057 masm_.emit(instr);
3058 } 3058 }
3059 3059
3060 3060
3061 } } // namespace v8::internal 3061 } } // namespace v8::internal
3062 3062
3063 #endif // V8_TARGET_ARCH_ARM 3063 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/macro-assembler-arm.h ('k') | src/mips/macro-assembler-mips.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698