mirror of
https://github.com/intel/isa-l.git
synced 2024-12-14 02:05:11 +01:00
d3cfb2fb77
The goal of this patch is to make isa-l testsuite pass on s390 with minimal changes to the library. The one and only reason isa-l does not work on s390 at the moment is that s390 is big-endian, and isa-l assumes little-endian at a lot of places. There are two flavors of this: loading/storing integers from/to memory, and overlapping structs. Loads/stores are already helpfully wrapped by unaligned.h header, so replace the functions there with endianness-aware variants. Solve struct member overlap by reversing their order on big-endian. Also, fix a couple of usages of uninitialized memory in the testsuite (found with MemorySanitizer). Fixes s390x part of #188. Change-Id: Iaf14a113bd266900192cc8b44212f8a47a8c7753 Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
130 lines
4.1 KiB
C
130 lines
4.1 KiB
C
/**********************************************************************
|
|
Copyright(c) 2011-2016 Intel Corporation All rights reserved.
|
|
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions
|
|
are met:
|
|
* Redistributions of source code must retain the above copyright
|
|
notice, this list of conditions and the following disclaimer.
|
|
* Redistributions in binary form must reproduce the above copyright
|
|
notice, this list of conditions and the following disclaimer in
|
|
the documentation and/or other materials provided with the
|
|
distribution.
|
|
* Neither the name of Intel Corporation nor the names of its
|
|
contributors may be used to endorse or promote products derived
|
|
from this software without specific prior written permission.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
**********************************************************************/
|
|
#ifndef BITBUF2_H
|
|
#define BITBUF2_H
|
|
|
|
#include "igzip_lib.h"
|
|
#include "unaligned.h"
|
|
|
|
#ifdef _MSC_VER
|
|
#define inline __inline
|
|
#endif
|
|
|
|
/* MAX_BITBUF_BIT WRITE is the maximum number of bits than can be safely written
|
|
* by consecutive calls of write_bits. Note this assumes the bitbuf is in a
|
|
* state that is possible at the exit of write_bits */
|
|
#define MAX_BITBUF_BIT_WRITE 56
|
|
|
|
static inline void init(struct BitBuf2 *me)
|
|
{
|
|
me->m_bits = 0;
|
|
me->m_bit_count = 0;
|
|
}
|
|
|
|
static inline void set_buf(struct BitBuf2 *me, unsigned char *buf, unsigned int len)
|
|
{
|
|
unsigned int slop = 8;
|
|
me->m_out_buf = me->m_out_start = buf;
|
|
me->m_out_end = buf + len - slop;
|
|
}
|
|
|
|
static inline int is_full(struct BitBuf2 *me)
|
|
{
|
|
return (me->m_out_buf > me->m_out_end);
|
|
}
|
|
|
|
static inline uint8_t *buffer_ptr(struct BitBuf2 *me)
|
|
{
|
|
return me->m_out_buf;
|
|
}
|
|
|
|
static inline uint32_t buffer_used(struct BitBuf2 *me)
|
|
{
|
|
return (uint32_t) (me->m_out_buf - me->m_out_start);
|
|
}
|
|
|
|
static inline uint32_t buffer_bits_used(struct BitBuf2 *me)
|
|
{
|
|
return (8 * (uint32_t) (me->m_out_buf - me->m_out_start) + me->m_bit_count);
|
|
}
|
|
|
|
static inline void flush_bits(struct BitBuf2 *me)
|
|
{
|
|
uint32_t bits;
|
|
store_le_u64(me->m_out_buf, me->m_bits);
|
|
bits = me->m_bit_count & ~7;
|
|
me->m_bit_count -= bits;
|
|
me->m_out_buf += bits / 8;
|
|
me->m_bits >>= bits;
|
|
|
|
}
|
|
|
|
/* Can write up to 8 bytes to output buffer */
|
|
static inline void flush(struct BitBuf2 *me)
|
|
{
|
|
uint32_t bytes;
|
|
if (me->m_bit_count) {
|
|
store_le_u64(me->m_out_buf, me->m_bits);
|
|
bytes = (me->m_bit_count + 7) / 8;
|
|
me->m_out_buf += bytes;
|
|
}
|
|
me->m_bits = 0;
|
|
me->m_bit_count = 0;
|
|
}
|
|
|
|
static inline void check_space(struct BitBuf2 *me, uint32_t num_bits)
|
|
{
|
|
/* Checks if bitbuf has num_bits extra space and flushes the bytes in
|
|
* the bitbuf if it doesn't. */
|
|
if (63 - me->m_bit_count < num_bits)
|
|
flush_bits(me);
|
|
}
|
|
|
|
static inline void write_bits_unsafe(struct BitBuf2 *me, uint64_t code, uint32_t count)
|
|
{
|
|
me->m_bits |= code << me->m_bit_count;
|
|
me->m_bit_count += count;
|
|
}
|
|
|
|
static inline void write_bits(struct BitBuf2 *me, uint64_t code, uint32_t count)
|
|
{ /* Assumes there is space to fit code into m_bits. */
|
|
me->m_bits |= code << me->m_bit_count;
|
|
me->m_bit_count += count;
|
|
flush_bits(me);
|
|
}
|
|
|
|
static inline void write_bits_flush(struct BitBuf2 *me, uint64_t code, uint32_t count)
|
|
{ /* Assumes there is space to fit code into m_bits. */
|
|
me->m_bits |= code << me->m_bit_count;
|
|
me->m_bit_count += count;
|
|
flush(me);
|
|
}
|
|
|
|
#endif //BITBUF2_H
|