From d4df0567d5ce477fc40fb925847f70af79d712a6 Mon Sep 17 00:00:00 2001 From: fumiama Date: Fri, 9 Apr 2021 18:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 32/base1432le.c | 24 ++++++++++++------------ 64/base1464le.c | 30 +++++++++++++++--------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/32/base1432le.c b/32/base1432le.c index 2cc7120..0258739 100644 --- a/32/base1432le.c +++ b/32/base1432le.c @@ -30,16 +30,16 @@ LENDAT* encode(const uint8_t* data, const u_int32_t len) { uint32_t i = 0; for(; i < len; i += 7) { register uint32_t sum = 0x0000003f & ((uint32_t)data[i] >> 2); - sum |= ((((uint32_t)data[i + 1] >> 2) | (data[i] << 6)) << 8) & 0x0000ff00; - sum |= ((((uint32_t)data[i + 1] << 4) | ((uint32_t)data[i + 2] >> 4)) << 16) & 0x003f0000; - sum |= ((((uint32_t)data[i + 2] << 4) | ((uint32_t)data[i + 3] >> 4)) << 24) & 0xff000000; + sum |= (((uint32_t)data[i + 1] << 6) | (data[i] << 14)) & 0x0000ff00; + sum |= (((uint32_t)data[i + 1] << 20) | ((uint32_t)data[i + 2] << 12)) & 0x003f0000; + sum |= (((uint32_t)data[i + 2] << 28) | ((uint32_t)data[i + 3] << 20)) & 0xff000000; sum += 0x004e004e; vals[n++] = sum; #ifdef DEBUG printf("n: %u, add sum: %08x\n", n, sum); #endif sum = ((((uint32_t)data[i + 3] << 2) | ((uint32_t)data[i + 4] >> 6))) & 0x0000003f; - sum |= ((((uint32_t)data[i + 4] << 2) | ((uint32_t)data[i + 5] >> 6)) << 8) & 0x0000ff00; + sum |= (((uint32_t)data[i + 4] << 10) | ((uint32_t)data[i + 5] << 2)) & 0x0000ff00; sum |= ((uint32_t)data[i + 5] << 16) & 0x003f0000; sum |= ((uint32_t)data[i + 6] << 24) & 0xff000000; sum += 0x004e004e; @@ -50,27 +50,27 @@ LENDAT* encode(const uint8_t* data, const u_int32_t len) { } if(offset > 0) { register uint32_t sum = 0x0000003f & (data[i] >> 2); - sum |= (((uint32_t)data[i] << 6) << 8) & 0x0000c000; + sum |= ((uint32_t)data[i] << 14) & 0x0000c000; if(offset > 1) { - sum |= (((uint32_t)data[i + 1] >> 2) << 8) & 0x00003f00; - sum |= (((uint32_t)data[i + 1] << 4) << 16) & 0x00300000; + sum |= ((uint32_t)data[i + 1] << 6) & 0x00003f00; + sum |= ((uint32_t)data[i + 1] << 20) & 0x00300000; if(offset > 2) { - sum |= (((uint32_t)data[i + 2] >> 4) << 16) & 0x000f0000; - sum |= (((uint32_t)data[i + 2] << 4) << 24) & 0xf0000000; + sum |= ((uint32_t)data[i + 2] << 12) & 0x000f0000; + sum |= ((uint32_t)data[i + 2] << 28) & 0xf0000000; if(offset == 2) { sum += 0x004e004e; vals[n++] = sum; } if(offset > 3) { - sum |= (((uint32_t)data[i + 3] >> 4) << 24) & 0x0f000000; + sum |= ((uint32_t)data[i + 3] << 20) & 0x0f000000; sum += 0x004e004e; vals[n++] = sum; sum = (((uint32_t)data[i + 3] << 2)) & 0x0000003c; if(offset > 4) { sum |= (((uint32_t)data[i + 4] >> 6)) & 0x00000003; - sum |= (((uint32_t)data[i + 4] << 2) << 8) & 0x0000fc00; + sum |= ((uint32_t)data[i + 4] << 10) & 0x0000fc00; if(offset > 5) { - sum |= (((uint32_t)data[i + 5] >> 6) << 8) & 0x00000300; + sum |= ((uint32_t)data[i + 5] << 2) & 0x00000300; sum |= ((uint32_t)data[i + 5] << 16) & 0x003f0000; } } diff --git a/64/base1464le.c b/64/base1464le.c index 48e357e..179868a 100644 --- a/64/base1464le.c +++ b/64/base1464le.c @@ -30,11 +30,11 @@ LENDAT* encode(const uint8_t* data, const u_int64_t len) { uint64_t i = 0; for(; i < len; i += 7) { register uint64_t sum = 0x000000000000003f & ((uint64_t)data[i] >> 2); - sum |= ((((uint64_t)data[i + 1] >> 2) | (data[i] << 6)) << 8) & 0x000000000000ff00; - sum |= ((((uint64_t)data[i + 1] << 4) | ((uint64_t)data[i + 2] >> 4)) << 16) & 0x00000000003f0000; - sum |= ((((uint64_t)data[i + 2] << 4) | ((uint64_t)data[i + 3] >> 4)) << 24) & 0x00000000ff000000; - sum |= ((((uint64_t)data[i + 3] << 2) | ((uint64_t)data[i + 4] >> 6)) << 32) & 0x0000003f00000000; - sum |= ((((uint64_t)data[i + 4] << 2) | ((uint64_t)data[i + 5] >> 6)) << 40) & 0x0000ff0000000000; + sum |= (((uint64_t)data[i + 1] << 6) | (data[i] << 14)) & 0x000000000000ff00; + sum |= (((uint64_t)data[i + 1] << 20) | ((uint64_t)data[i + 2] << 12)) & 0x00000000003f0000; + sum |= (((uint64_t)data[i + 2] << 28) | ((uint64_t)data[i + 3] << 20)) & 0x00000000ff000000; + sum |= (((uint64_t)data[i + 3] << 34) | ((uint64_t)data[i + 4] << 26)) & 0x0000003f00000000; + sum |= (((uint64_t)data[i + 4] << 42) | ((uint64_t)data[i + 5] << 34)) & 0x0000ff0000000000; sum |= ((uint64_t)data[i + 5] << 48) & 0x003f000000000000; sum |= ((uint64_t)data[i + 6] << 56) & 0xff00000000000000; sum += 0x004e004e004e004e; @@ -45,21 +45,21 @@ LENDAT* encode(const uint8_t* data, const u_int64_t len) { } if(offset > 0) { register uint64_t sum = 0x000000000000003f & (data[i] >> 2); - sum |= (((uint64_t)data[i] << 6) << 8) & 0x000000000000c000; + sum |= ((uint64_t)data[i] << 14) & 0x000000000000c000; if(offset > 1) { - sum |= (((uint64_t)data[i + 1] >> 2) << 8) & 0x0000000000003f00; - sum |= (((uint64_t)data[i + 1] << 4) << 16) & 0x0000000000300000; + sum |= ((uint64_t)data[i + 1] << 6) & 0x0000000000003f00; + sum |= ((uint64_t)data[i + 1] << 20) & 0x0000000000300000; if(offset > 2) { - sum |= (((uint64_t)data[i + 2] >> 4) << 16) & 0x00000000000f0000; - sum |= (((uint64_t)data[i + 2] << 4) << 24) & 0x00000000f0000000; + sum |= ((uint64_t)data[i + 2] << 12) & 0x00000000000f0000; + sum |= ((uint64_t)data[i + 2] << 28) & 0x00000000f0000000; if(offset > 3) { - sum |= (((uint64_t)data[i + 3] >> 4) << 24) & 0x000000000f000000; - sum |= (((uint64_t)data[i + 3] << 2) << 32) & 0x0000003c00000000; + sum |= ((uint64_t)data[i + 3] << 20) & 0x000000000f000000; + sum |= ((uint64_t)data[i + 3] << 34) & 0x0000003c00000000; if(offset > 4) { - sum |= (((uint64_t)data[i + 4] >> 6) << 32) & 0x0000000300000000; - sum |= (((uint64_t)data[i + 4] << 2) << 40) & 0x0000fc0000000000; + sum |= ((uint64_t)data[i + 4] << 26) & 0x0000000300000000; + sum |= ((uint64_t)data[i + 4] << 42) & 0x0000fc0000000000; if(offset > 5) { - sum |= (((uint64_t)data[i + 5] >> 6) << 40) & 0x0000030000000000; + sum |= ((uint64_t)data[i + 5] << 34) & 0x0000030000000000; sum |= ((uint64_t)data[i + 5] << 48) & 0x003f000000000000; } }