From 42fedbca8f5b54324ed89be3484d4a3dc9946387 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 14 Sep 2015 13:38:53 -0700 Subject: [PATCH] target-arm: Use new revbit functions Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target-arm/helper-a64.c | 15 +-------------- target-arm/helper.c | 12 +----------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 2c7a645f66..deb8dbe489 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -70,20 +70,7 @@ uint32_t HELPER(clz32)(uint32_t x) uint64_t HELPER(rbit64)(uint64_t x) { - /* assign the correct byte position */ - x = bswap64(x); - - /* assign the correct nibble position */ - x = ((x & 0xf0f0f0f0f0f0f0f0ULL) >> 4) - | ((x & 0x0f0f0f0f0f0f0f0fULL) << 4); - - /* assign the correct bit position */ - x = ((x & 0x8888888888888888ULL) >> 3) - | ((x & 0x4444444444444444ULL) >> 1) - | ((x & 0x2222222222222222ULL) << 1) - | ((x & 0x1111111111111111ULL) << 3); - - return x; + return revbit64(x); } /* Convert a softfloat float_relation_ (as returned by diff --git a/target-arm/helper.c b/target-arm/helper.c index 65b9ff5ad0..12ea88fd52 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5044,17 +5044,7 @@ uint32_t HELPER(udiv)(uint32_t num, uint32_t den) uint32_t HELPER(rbit)(uint32_t x) { - x = ((x & 0xff000000) >> 24) - | ((x & 0x00ff0000) >> 8) - | ((x & 0x0000ff00) << 8) - | ((x & 0x000000ff) << 24); - x = ((x & 0xf0f0f0f0) >> 4) - | ((x & 0x0f0f0f0f) << 4); - x = ((x & 0x88888888) >> 3) - | ((x & 0x44444444) >> 1) - | ((x & 0x22222222) << 1) - | ((x & 0x11111111) << 3); - return x; + return revbit32(x); } #if defined(CONFIG_USER_ONLY)