diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-05 17:27:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-08 14:50:48 +0000 |
| commit | 37fd5b53ba688e2a32d3966870361e667381ca95 (patch) | |
| tree | 2694cac793e519d4f3ad68d225c310fc75973462 /disas/libvixl/utils.h | |
| parent | 878a735d009d1e90e96d6c5c6f9471aa4ec2ba65 (diff) | |
| download | qemu-37fd5b53ba688e2a32d3966870361e667381ca95.zip qemu-37fd5b53ba688e2a32d3966870361e667381ca95.tar.gz qemu-37fd5b53ba688e2a32d3966870361e667381ca95.tar.bz2 | |
disas/libvixl: Fix upstream libvixl compilation issues
Fix various minor issues with upstream libvixl so that it will compile
successfully on the platforms QEMU cares about:
* remove unused GBytes constant (it clashes with the glib headers)
* fix suffixes on constants to use 'LL' for 64 bit constants so
we can compile on 32 bit hosts
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'disas/libvixl/utils.h')
| -rw-r--r-- | disas/libvixl/utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/disas/libvixl/utils.h b/disas/libvixl/utils.h index 4e0b367..029341e 100644 --- a/disas/libvixl/utils.h +++ b/disas/libvixl/utils.h @@ -36,7 +36,7 @@ namespace vixl { // Check number width. inline bool is_intn(unsigned n, int64_t x) { ASSERT((0 < n) && (n < 64)); - int64_t limit = 1L << (n - 1); + int64_t limit = 1ULL << (n - 1); return (-limit <= x) && (x < limit); } @@ -47,7 +47,7 @@ inline bool is_uintn(unsigned n, int64_t x) { inline unsigned truncate_to_intn(unsigned n, int64_t x) { ASSERT((0 < n) && (n < 64)); - return (x & ((1L << n) - 1)); + return (x & ((1ULL << n) - 1)); } #define INT_1_TO_63_LIST(V) \ |