mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
liblzma: Avoid implementation-defined behavior in the RISC-V filter.
GCC docs promise that it works and a few other compilers do too. Clang/LLVM is documented source code only but unsurprisingly it behaves the same as others on x86-64 at least. But the certainly-portable way is good enough here so use that.
This commit is contained in:
parent
843ddc5f61
commit
f1d6b88aef
1 changed files with 22 additions and 8 deletions
|
@ -511,15 +511,29 @@ riscv_encode(void *simple lzma_attribute((__unused__)),
|
||||||
// be the same.
|
// be the same.
|
||||||
|
|
||||||
// Arithmetic right shift makes sign extension
|
// Arithmetic right shift makes sign extension
|
||||||
// trivial but C doesn't guarantee it for
|
// trivial but (1) it's implementation-defined
|
||||||
// signed integers so a fallback is provided
|
// behavior (C99/C11/C23 6.5.7-p5) and so is
|
||||||
// for portability.
|
// (2) casting unsigned to signed (6.3.1.3-p3).
|
||||||
|
//
|
||||||
|
// One can check for (1) with
|
||||||
|
//
|
||||||
|
// if ((-1 >> 1) == -1) ...
|
||||||
|
//
|
||||||
|
// but (2) has to be checked from the
|
||||||
|
// compiler docs. GCC promises that (1)
|
||||||
|
// and (2) behave in the common expected
|
||||||
|
// way and thus
|
||||||
|
//
|
||||||
|
// addr += (uint32_t)(
|
||||||
|
// (int32_t)inst2 >> 20);
|
||||||
|
//
|
||||||
|
// does the same as the code below. But since
|
||||||
|
// the 100 % portable way is only a few bytes
|
||||||
|
// bigger code and there is no real speed
|
||||||
|
// difference, let's just use that, especially
|
||||||
|
// since the decoder doesn't need this at all.
|
||||||
uint32_t addr = inst & 0xFFFFF000;
|
uint32_t addr = inst & 0xFFFFF000;
|
||||||
if ((-1 >> 1) == -1)
|
addr += (inst2 >> 20)
|
||||||
addr += (uint32_t)(
|
|
||||||
(int32_t)inst2 >> 20);
|
|
||||||
else
|
|
||||||
addr += (inst2 >> 20)
|
|
||||||
- ((inst2 >> 19) & 0x1000);
|
- ((inst2 >> 19) & 0x1000);
|
||||||
|
|
||||||
addr += now_pos + (uint32_t)i;
|
addr += now_pos + (uint32_t)i;
|
||||||
|
|
Loading…
Reference in a new issue