From 0133965d1b87a3d8b4c36b0df4136daec0fa2546 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Mon, 30 Apr 2012 17:06:13 +0000 Subject: [PATCH] Fix mistakes in r11472 TBR=vegorov@chromium.org Review URL: https://chromiumcodereview.appspot.com/10274008 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11473 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/ia32/stub-cache-ia32.cc | 1 + src/x64/stub-cache-x64.cc | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc index 2629984..734b89b 100644 --- a/src/ia32/stub-cache-ia32.cc +++ b/src/ia32/stub-cache-ia32.cc @@ -3644,6 +3644,7 @@ void KeyedStoreStubCompiler::GenerateStoreExternalArray( case EXTERNAL_INT_ELEMENTS: case EXTERNAL_UNSIGNED_INT_ELEMENTS: __ mov(Operand(edi, ecx, times_2, 0), ebx); + break; default: UNREACHABLE(); break; diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc index e375e5b..05b7673 100644 --- a/src/x64/stub-cache-x64.cc +++ b/src/x64/stub-cache-x64.cc @@ -3403,9 +3403,9 @@ void KeyedStoreStubCompiler::GenerateStoreExternalArray( // behavior. // Fast path: use machine instruction to convert to int64. If that // fails (out-of-range), go into the runtime. - __ cvttsd2siq(rdx, xmm0); + __ cvttsd2siq(r8, xmm0); __ Set(kScratchRegister, V8_UINT64_C(0x8000000000000000)); - __ cmpq(rdx, kScratchRegister); + __ cmpq(r8, kScratchRegister); __ j(equal, &slow); // rdx: value (converted to an untagged integer) @@ -3414,15 +3414,15 @@ void KeyedStoreStubCompiler::GenerateStoreExternalArray( switch (elements_kind) { case EXTERNAL_BYTE_ELEMENTS: case EXTERNAL_UNSIGNED_BYTE_ELEMENTS: - __ movb(Operand(rbx, rdi, times_1, 0), rdx); + __ movb(Operand(rbx, rdi, times_1, 0), r8); break; case EXTERNAL_SHORT_ELEMENTS: case EXTERNAL_UNSIGNED_SHORT_ELEMENTS: - __ movw(Operand(rbx, rdi, times_2, 0), rdx); + __ movw(Operand(rbx, rdi, times_2, 0), r8); break; case EXTERNAL_INT_ELEMENTS: case EXTERNAL_UNSIGNED_INT_ELEMENTS: - __ movl(Operand(rbx, rdi, times_4, 0), rdx); + __ movl(Operand(rbx, rdi, times_4, 0), r8); break; case EXTERNAL_PIXEL_ELEMENTS: case EXTERNAL_FLOAT_ELEMENTS: -- 2.7.4