mirror of
https://github.com/intel/isa-l.git
synced 2024-12-12 17:33:50 +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>
86 lines
2.8 KiB
C
86 lines
2.8 KiB
C
/**********************************************************************
|
|
Copyright(c) 2011-2017 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.
|
|
**********************************************************************/
|
|
|
|
#include "igzip_lib.h"
|
|
#include "huff_codes.h"
|
|
#include "unaligned.h"
|
|
|
|
static inline void heapify(uint64_t * heap, uint64_t heap_size, uint64_t index)
|
|
{
|
|
uint64_t child = 2 * index, tmp;
|
|
while (child <= heap_size) {
|
|
child = (heap[child] <= heap[child + 1]) ? child : child + 1;
|
|
|
|
if (heap[index] > heap[child]) {
|
|
tmp = heap[index];
|
|
heap[index] = heap[child];
|
|
heap[child] = tmp;
|
|
index = child;
|
|
child = 2 * index;
|
|
} else
|
|
break;
|
|
}
|
|
}
|
|
|
|
void build_heap(uint64_t * heap, uint64_t heap_size)
|
|
{
|
|
uint64_t i;
|
|
heap[heap_size + 1] = -1;
|
|
for (i = heap_size / 2; i > 0; i--)
|
|
heapify(heap, heap_size, i);
|
|
|
|
}
|
|
|
|
uint32_t build_huff_tree(struct heap_tree *heap_space, uint64_t heap_size, uint64_t node_ptr)
|
|
{
|
|
uint64_t *heap = (uint64_t *) heap_space;
|
|
uint64_t h1, h2;
|
|
|
|
while (heap_size > 1) {
|
|
h1 = heap[1];
|
|
heap[1] = heap[heap_size];
|
|
heap[heap_size--] = -1;
|
|
|
|
heapify(heap, heap_size, 1);
|
|
|
|
h2 = heap[1];
|
|
heap[1] = ((h1 + h2) & ~0xFFFFull) | node_ptr;
|
|
|
|
heapify(heap, heap_size, 1);
|
|
|
|
store_native_u16_to_u64(&heap[node_ptr], h1);
|
|
store_native_u16_to_u64(&heap[node_ptr - 1], h2);
|
|
node_ptr -= 2;
|
|
|
|
}
|
|
h1 = heap[1];
|
|
store_native_u16_to_u64(&heap[node_ptr], h1);
|
|
return node_ptr;
|
|
}
|