fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-12 20:10:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

pvr/csbgen: use stdint macro for unsigned 64-bit constants

Browse source 
Signed-off-by: Simon Perretta <simon.perretta@imgtec.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37439>
This commit is contained in:
Simon Perretta 2025-08-21 10:44:57 +01:00
parent e8adfa1241
commit 116d8573d4
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/imagination/csbgen/pvr_packet_helpers.h
View file

@ -64,7 +64,7 @@ union __pvr_value {
static inline __attribute__((always_inline)) uint64_t __pvr_mbo(uint32_t start,
uint32_t end)
{
return (~0ull >> (64 - (end - start + 1))) << start;
return (~UINT64_C(0) >> (64 - (end - start + 1))) << start;
}
static inline __attribute__((always_inline)) uint64_t
@ -75,7 +75,7 @@ __pvr_uint(uint64_t v, uint32_t start, NDEBUG_UNUSED uint32_t end)
#ifndef NDEBUG
const int width = end - start + 1;
if (width < 64) {
const uint64_t max = (1ull << width) - 1;
const uint64_t max = (UINT64_C(1) << width) - 1;
assert(v <= max);
}
#endif
@ -87,14 +87,13 @@ static inline __attribute__((always_inline)) uint64_t
__pvr_uint_unpack(uint64_t packed, uint32_t start, uint32_t end)
{
const int width = end - start + 1;
const uint64_t mask = ~0ull >> (64 - width);
const uint64_t mask = ~UINT64_C(0) >> (64 - width);
return (packed >> start) & mask;
}
static inline __attribute__((always_inline)) uint64_t __pvr_sint(int64_t v,
uint32_t start,
uint32_t end)
static inline __attribute__((always_inline)) uint64_t
__pvr_sint(int64_t v, uint32_t start, uint32_t end)
{
const int width = end - start + 1;
@ -108,7 +107,7 @@ static inline __attribute__((always_inline)) uint64_t __pvr_sint(int64_t v,
}
#endif
const uint64_t mask = ~0ull >> (64 - width);
const uint64_t mask = ~UINT64_C(0) >> (64 - width);
return (v & mask) << start;
}
@ -117,7 +116,7 @@ static inline __attribute__((always_inline)) int64_t
__pvr_sint_unpack(uint64_t packed, uint32_t start, uint32_t end)
{
const int width = end - start + 1;
const uint64_t mask = ~0ull >> (64 - width);
const uint64_t mask = ~UINT64_C(0) >> (64 - width);
return (int64_t)((packed >> start) & mask);
}
@ -129,7 +128,7 @@ __pvr_offset(uint64_t v,
{
__pvr_validate_value(v);
#ifndef NDEBUG
uint64_t mask = (~0ull >> (64 - (end - start + 1))) << start;
uint64_t mask = (~UINT64_C(0) >> (64 - (end - start + 1))) << start;
assert((v & ~mask) == 0);
#endif
@ -143,7 +142,7 @@ __pvr_offset_unpack(uint64_t packed,
NDEBUG_UNUSED uint32_t end)
{
#ifndef NDEBUG
uint64_t mask = (~0ull >> (64 - (end - start + 1))) << start;
uint64_t mask = (~UINT64_C(0) >> (64 - (end - start + 1))) << start;
assert((packed & ~mask) == 0);
#endif
@ -158,7 +157,7 @@ __pvr_address(__pvr_address_type address,
uint32_t end)
{
uint64_t addr_u64 = __pvr_get_address(address);
uint64_t mask = (~0ull >> (64 - (end - start + 1))) << start;
uint64_t mask = (~UINT64_C(0) >> (64 - (end - start + 1))) << start;
return ((addr_u64 >> shift) << start) & mask;
}
@ -169,7 +168,7 @@ __pvr_address_unpack(uint64_t packed,
uint32_t start,
uint32_t end)
{
uint64_t mask = (~0ull >> (64 - (end - start + 1))) << start;
uint64_t mask = (~UINT64_C(0) >> (64 - (end - start + 1))) << start;
uint64_t addr_u64 = ((packed & mask) >> start) << shift;
return __pvr_make_address(addr_u64);
@ -201,7 +200,7 @@ __pvr_sfixed(float v, uint32_t start, uint32_t end, uint32_t fract_bits)
#endif
const int64_t int_val = llroundf(v * factor);
const uint64_t mask = ~0ull >> (64 - (end - start + 1));
const uint64_t mask = ~UINT64_C(0) >> (64 - (end - start + 1));
return (int_val & mask) << start;
}