qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 05:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[zone] Use a static_assert for retain's offset

Browse source 
I'd written the old version long before static_assert was available in
C.
This commit is contained in:
Bill Currie 2024-09-24 10:57:01 +09:00
parent 867e49980f
commit 399c0ec17f
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libs/util/zone.c
View file

@ -82,6 +82,9 @@ typedef struct memblock_s {
int id; // should be ZONEID int id; // should be ZONEID
int retain; // reference counter (optional usage) int retain; // reference counter (optional usage)
} __attribute__((aligned (64))) memblock_t; } __attribute__((aligned (64))) memblock_t;
static_assert (__builtin_offsetof (memblock_t, retain) == 60,
"memblock_t.retain at incorrect offset");
struct memzone_s { struct memzone_s {
size_t size; // total bytes malloced, including header size_t size; // total bytes malloced, including header
@ -214,13 +217,9 @@ z_error (memzone_t *zone, const char *msg)
VISIBLE void VISIBLE void
Z_ClearZone (memzone_t *zone, size_t size, size_t zone_offset, size_t ele_size) Z_ClearZone (memzone_t *zone, size_t size, size_t zone_offset, size_t ele_size)
{ {
memblock_t *block
= __builtin_choose_expr (__builtin_offsetof (memblock_t, retain) == 60,
0, (void) 0);
// set the entire zone to one free block // set the entire zone to one free block
block = (memblock_t *) (zone + 1); auto block = (memblock_t *) (zone + 1);
zone->blocklist.next = block; zone->blocklist.next = block;
zone->blocklist.prev = block; zone->blocklist.prev = block;
zone->blocklist.tag = 1; // in use block zone->blocklist.tag = 1; // in use block