diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 12:02:55 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-03 12:05:35 +0100 |
| commit | f7060e27768c550ace7ec48ad8c093466db52dfa (patch) | |
| tree | 43a297e3fcc3fd81c7637fcbe8b31b3d02fd337d /src/arm/builtins-arm.cc | |
| parent | f4f2cc060fdf724f592c425cced19bc9a3fc7e40 (diff) | |
| download | android_external_v8-f7060e27768c550ace7ec48ad8c093466db52dfa.tar.gz android_external_v8-f7060e27768c550ace7ec48ad8c093466db52dfa.tar.bz2 android_external_v8-f7060e27768c550ace7ec48ad8c093466db52dfa.zip | |
Update V8 to r4730 as required by WebKit r60469
Diffstat (limited to 'src/arm/builtins-arm.cc')
| -rw-r--r-- | src/arm/builtins-arm.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc index 5718cb3c..1f776562 100644 --- a/src/arm/builtins-arm.cc +++ b/src/arm/builtins-arm.cc @@ -27,6 +27,8 @@ #include "v8.h" +#if defined(V8_TARGET_ARCH_ARM) + #include "codegen-inl.h" #include "debug.h" #include "runtime.h" @@ -130,7 +132,7 @@ static void AllocateEmptyJSArray(MacroAssembler* masm, // of the JSArray. // result: JSObject // scratch2: start of next object - __ lea(scratch1, MemOperand(result, JSArray::kSize)); + __ add(scratch1, result, Operand(JSArray::kSize)); __ str(scratch1, FieldMemOperand(result, JSArray::kElementsOffset)); // Clear the heap tag on the elements array. @@ -1311,3 +1313,5 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) { #undef __ } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_ARM |