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

Side by Side Diff: src/arm/stub-cache-arm.cc

Issue 7172030: Revert "Merge arguments branch to bleeding merge." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 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 | « src/arm/lithium-codegen-arm.cc ('k') | src/ast.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 3411 matching lines...) Expand 10 before | Expand all | Expand 10 after
3422 case JSObject::EXTERNAL_UNSIGNED_SHORT_ELEMENTS: 3422 case JSObject::EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
3423 case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS: 3423 case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS:
3424 case JSObject::EXTERNAL_PIXEL_ELEMENTS: 3424 case JSObject::EXTERNAL_PIXEL_ELEMENTS:
3425 return false; 3425 return false;
3426 3426
3427 case JSObject::EXTERNAL_FLOAT_ELEMENTS: 3427 case JSObject::EXTERNAL_FLOAT_ELEMENTS:
3428 case JSObject::EXTERNAL_DOUBLE_ELEMENTS: 3428 case JSObject::EXTERNAL_DOUBLE_ELEMENTS:
3429 case JSObject::FAST_ELEMENTS: 3429 case JSObject::FAST_ELEMENTS:
3430 case JSObject::FAST_DOUBLE_ELEMENTS: 3430 case JSObject::FAST_DOUBLE_ELEMENTS:
3431 case JSObject::DICTIONARY_ELEMENTS: 3431 case JSObject::DICTIONARY_ELEMENTS:
3432 case JSObject::NON_STRICT_ARGUMENTS_ELEMENTS:
3433 UNREACHABLE(); 3432 UNREACHABLE();
3434 return false; 3433 return false;
3435 } 3434 }
3436 return false; 3435 return false;
3437 } 3436 }
3438 3437
3439 3438
3440 void KeyedLoadStubCompiler::GenerateLoadExternalArray( 3439 void KeyedLoadStubCompiler::GenerateLoadExternalArray(
3441 MacroAssembler* masm, 3440 MacroAssembler* masm,
3442 JSObject::ElementsKind elements_kind) { 3441 JSObject::ElementsKind elements_kind) {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
3508 } else { 3507 } else {
3509 __ add(r4, r3, Operand(key, LSL, 2)); 3508 __ add(r4, r3, Operand(key, LSL, 2));
3510 // r4: pointer to the beginning of the double we want to load. 3509 // r4: pointer to the beginning of the double we want to load.
3511 __ ldr(r2, MemOperand(r4, 0)); 3510 __ ldr(r2, MemOperand(r4, 0));
3512 __ ldr(r3, MemOperand(r4, Register::kSizeInBytes)); 3511 __ ldr(r3, MemOperand(r4, Register::kSizeInBytes));
3513 } 3512 }
3514 break; 3513 break;
3515 case JSObject::FAST_ELEMENTS: 3514 case JSObject::FAST_ELEMENTS:
3516 case JSObject::FAST_DOUBLE_ELEMENTS: 3515 case JSObject::FAST_DOUBLE_ELEMENTS:
3517 case JSObject::DICTIONARY_ELEMENTS: 3516 case JSObject::DICTIONARY_ELEMENTS:
3518 case JSObject::NON_STRICT_ARGUMENTS_ELEMENTS:
3519 UNREACHABLE(); 3517 UNREACHABLE();
3520 break; 3518 break;
3521 } 3519 }
3522 3520
3523 // For integer array types: 3521 // For integer array types:
3524 // r2: value 3522 // r2: value
3525 // For float array type: 3523 // For float array type:
3526 // s0: value (if VFP3 is supported) 3524 // s0: value (if VFP3 is supported)
3527 // r2: value (if VFP3 is not supported) 3525 // r2: value (if VFP3 is not supported)
3528 // For double array type: 3526 // For double array type:
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
3850 CpuFeatures::Scope scope(VFP3); 3848 CpuFeatures::Scope scope(VFP3);
3851 __ vstr(d0, r3, 0); 3849 __ vstr(d0, r3, 0);
3852 } else { 3850 } else {
3853 __ str(r6, MemOperand(r3, 0)); 3851 __ str(r6, MemOperand(r3, 0));
3854 __ str(r7, MemOperand(r3, Register::kSizeInBytes)); 3852 __ str(r7, MemOperand(r3, Register::kSizeInBytes));
3855 } 3853 }
3856 break; 3854 break;
3857 case JSObject::FAST_ELEMENTS: 3855 case JSObject::FAST_ELEMENTS:
3858 case JSObject::FAST_DOUBLE_ELEMENTS: 3856 case JSObject::FAST_DOUBLE_ELEMENTS:
3859 case JSObject::DICTIONARY_ELEMENTS: 3857 case JSObject::DICTIONARY_ELEMENTS:
3860 case JSObject::NON_STRICT_ARGUMENTS_ELEMENTS:
3861 UNREACHABLE(); 3858 UNREACHABLE();
3862 break; 3859 break;
3863 } 3860 }
3864 3861
3865 // Entry registers are intact, r0 holds the value which is the return value. 3862 // Entry registers are intact, r0 holds the value which is the return value.
3866 __ Ret(); 3863 __ Ret();
3867 3864
3868 if (elements_kind != JSObject::EXTERNAL_PIXEL_ELEMENTS) { 3865 if (elements_kind != JSObject::EXTERNAL_PIXEL_ELEMENTS) {
3869 // r3: external array. 3866 // r3: external array.
3870 // r4: index (integer). 3867 // r4: index (integer).
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
3915 case JSObject::EXTERNAL_INT_ELEMENTS: 3912 case JSObject::EXTERNAL_INT_ELEMENTS:
3916 case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS: 3913 case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS:
3917 __ str(r5, MemOperand(r3, r4, LSL, 2)); 3914 __ str(r5, MemOperand(r3, r4, LSL, 2));
3918 break; 3915 break;
3919 case JSObject::EXTERNAL_PIXEL_ELEMENTS: 3916 case JSObject::EXTERNAL_PIXEL_ELEMENTS:
3920 case JSObject::EXTERNAL_FLOAT_ELEMENTS: 3917 case JSObject::EXTERNAL_FLOAT_ELEMENTS:
3921 case JSObject::EXTERNAL_DOUBLE_ELEMENTS: 3918 case JSObject::EXTERNAL_DOUBLE_ELEMENTS:
3922 case JSObject::FAST_ELEMENTS: 3919 case JSObject::FAST_ELEMENTS:
3923 case JSObject::FAST_DOUBLE_ELEMENTS: 3920 case JSObject::FAST_DOUBLE_ELEMENTS:
3924 case JSObject::DICTIONARY_ELEMENTS: 3921 case JSObject::DICTIONARY_ELEMENTS:
3925 case JSObject::NON_STRICT_ARGUMENTS_ELEMENTS:
3926 UNREACHABLE(); 3922 UNREACHABLE();
3927 break; 3923 break;
3928 } 3924 }
3929 } 3925 }
3930 3926
3931 // Entry registers are intact, r0 holds the value which is the return 3927 // Entry registers are intact, r0 holds the value which is the return
3932 // value. 3928 // value.
3933 __ Ret(); 3929 __ Ret();
3934 } else { 3930 } else {
3935 // VFP3 is not available do manual conversions. 3931 // VFP3 is not available do manual conversions.
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
4054 case JSObject::EXTERNAL_INT_ELEMENTS: 4050 case JSObject::EXTERNAL_INT_ELEMENTS:
4055 case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS: 4051 case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS:
4056 __ str(r5, MemOperand(r3, r4, LSL, 2)); 4052 __ str(r5, MemOperand(r3, r4, LSL, 2));
4057 break; 4053 break;
4058 case JSObject::EXTERNAL_PIXEL_ELEMENTS: 4054 case JSObject::EXTERNAL_PIXEL_ELEMENTS:
4059 case JSObject::EXTERNAL_FLOAT_ELEMENTS: 4055 case JSObject::EXTERNAL_FLOAT_ELEMENTS:
4060 case JSObject::EXTERNAL_DOUBLE_ELEMENTS: 4056 case JSObject::EXTERNAL_DOUBLE_ELEMENTS:
4061 case JSObject::FAST_ELEMENTS: 4057 case JSObject::FAST_ELEMENTS:
4062 case JSObject::FAST_DOUBLE_ELEMENTS: 4058 case JSObject::FAST_DOUBLE_ELEMENTS:
4063 case JSObject::DICTIONARY_ELEMENTS: 4059 case JSObject::DICTIONARY_ELEMENTS:
4064 case JSObject::NON_STRICT_ARGUMENTS_ELEMENTS:
4065 UNREACHABLE(); 4060 UNREACHABLE();
4066 break; 4061 break;
4067 } 4062 }
4068 } 4063 }
4069 } 4064 }
4070 } 4065 }
4071 4066
4072 // Slow case, key and receiver still in r0 and r1. 4067 // Slow case, key and receiver still in r0 and r1.
4073 __ bind(&slow); 4068 __ bind(&slow);
4074 __ IncrementCounter( 4069 __ IncrementCounter(
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
4201 masm->isolate()->builtins()->KeyedStoreIC_MissForceGeneric(); 4196 masm->isolate()->builtins()->KeyedStoreIC_MissForceGeneric();
4202 __ Jump(ic, RelocInfo::CODE_TARGET); 4197 __ Jump(ic, RelocInfo::CODE_TARGET);
4203 } 4198 }
4204 4199
4205 4200
4206 #undef __ 4201 #undef __
4207 4202
4208 } } // namespace v8::internal 4203 } } // namespace v8::internal
4209 4204
4210 #endif // V8_TARGET_ARCH_ARM 4205 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/lithium-codegen-arm.cc ('k') | src/ast.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698