diff options
author | Feng Qian <fqian@google.com> | 2009-04-17 10:56:30 -0700 |
---|---|---|
committer | Feng Qian <fqian@google.com> | 2009-04-17 10:56:30 -0700 |
commit | 9d6c0fe1a576c623a6db3b95e0460519f984da64 (patch) | |
tree | b7eb0f703cb467f01b29b67633532072c34536cf /v8/src/ic-arm.cc | |
parent | e62a68bd8f6c9cb81ff8757c55d64ae13a277eab (diff) | |
download | external_webkit-9d6c0fe1a576c623a6db3b95e0460519f984da64.zip external_webkit-9d6c0fe1a576c623a6db3b95e0460519f984da64.tar.gz external_webkit-9d6c0fe1a576c623a6db3b95e0460519f984da64.tar.bz2 |
Update v8 source to bleeding_edge 1738.
Git thinks bug-269.js and func-name-inferrer.cc are similar because both has copyright info and small code size.
Diffstat (limited to 'v8/src/ic-arm.cc')
-rw-r--r-- | v8/src/ic-arm.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/v8/src/ic-arm.cc b/v8/src/ic-arm.cc index 4db3980..d407f85 100644 --- a/v8/src/ic-arm.cc +++ b/v8/src/ic-arm.cc @@ -39,7 +39,7 @@ namespace v8 { namespace internal { // Static IC stub generators. // -#define __ masm-> +#define __ DEFINE_MASM(masm) // Helper function used from LoadIC/CallIC GenerateNormal. @@ -96,7 +96,9 @@ static void GenerateDictionaryLoad(MacroAssembler* masm, // Compute the masked index: (hash + i + i * i) & mask. __ ldr(t1, FieldMemOperand(r2, String::kLengthOffset)); __ mov(t1, Operand(t1, LSR, String::kHashShift)); - if (i > 0) __ add(t1, t1, Operand(Dictionary::GetProbeOffset(i))); + if (i > 0) { + __ add(t1, t1, Operand(Dictionary::GetProbeOffset(i))); + } __ and_(t1, t1, Operand(r3)); // Scale the index by multiplying by the element size. |