blob: 509b46a60cd9484787a77ca3dd16ea9ffc28c419 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
From: Mike Hommey <mh@glandium.org>
Date: Fri, 18 Nov 2011 11:32:09 +0100
Subject: Bug 703531 - Fix ARMAssembler::getOp2RegScale on < ARMv5
---
js/src/assembler/assembler/ARMAssembler.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/js/src/assembler/assembler/ARMAssembler.cpp b/js/src/assembler/assembler/ARMAssembler.cpp
index 78b8a7d..0458446 100644
--- a/js/src/assembler/assembler/ARMAssembler.cpp
+++ b/js/src/assembler/assembler/ARMAssembler.cpp
@@ -112,10 +112,10 @@ ARMWord ARMAssembler::getOp2RegScale(RegisterID reg, ARMWord scale)
: // No clobbers.
);
#else
- ARMWord lz = 0; // Accumulate leading zeroes.
+ lz = 0; // Accumulate leading zeroes.
for (ARMWord s = 16; s > 0; s /= 2) {
ARMWord mask = 0xffffffff << (32-lz-s);
- if ((x & mask) == 0) {
+ if ((scale & mask) == 0) {
lz += s;
}
}
|
