summaryrefslogtreecommitdiff
path: root/compiler/utils/arm/assembler_arm32.cc
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2014-09-29 20:07:43 -0700
committer Andreas Gampe <agampe@google.com> 2014-09-29 20:13:48 -0700
commitc8ccf68b805c92674545f63e0341ba47e8d9701c (patch)
treefb360323538cb242ebf7c5c0aca27d3a0bce0abb /compiler/utils/arm/assembler_arm32.cc
parentfcabfbe577c0fd40910b565beb681bd4b66f6c5d (diff)
ART: Fix some -Wpedantic errors
Remove extra semicolons. Dollar signs in C++ identifiers are an extension. Named variadic macros are an extension. Binary literals are a C++14 feature. Enum re-declarations are not allowed. Overflow. Change-Id: I7d16b2217b2ef2959ca69de84eaecc754517714a
Diffstat (limited to 'compiler/utils/arm/assembler_arm32.cc')
-rw-r--r--compiler/utils/arm/assembler_arm32.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/arm/assembler_arm32.cc b/compiler/utils/arm/assembler_arm32.cc
index 267bba8521..6af69c86ce 100644
--- a/compiler/utils/arm/assembler_arm32.cc
+++ b/compiler/utils/arm/assembler_arm32.cc
@@ -955,11 +955,11 @@ void Arm32Assembler::EmitVPushPop(uint32_t reg, int nregs, bool push, bool dbl,
if (dbl) {
// Encoded as D:Vd.
D = (reg >> 4) & 1;
- Vd = reg & 0b1111;
+ Vd = reg & 15U /* 0b1111 */;
} else {
// Encoded as Vd:D.
D = reg & 1;
- Vd = (reg >> 1) & 0b1111;
+ Vd = (reg >> 1) & 15U /* 0b1111 */;
}
int32_t encoding = B27 | B26 | B21 | B19 | B18 | B16 |
B11 | B9 |