thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure Z_Malloc provides same alignment as libc

Browse source
This commit is contained in:
Eidolon 2023-09-24 18:08:28 -05:00
parent 2fa73d45d7
commit b7715d9186
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/z_zone.c
View file

@ -25,6 +25,9 @@
/// allocator was fragmenting badly. Finally, this version is a bit /// allocator was fragmenting badly. Finally, this version is a bit
/// simpler (about half the lines of code). /// simpler (about half the lines of code).
#include <stddef.h>
#include <stdalign.h>
#include <tracy/tracy/TracyC.h> #include <tracy/tracy/TracyC.h>
#include "doomdef.h" #include "doomdef.h"
@ -49,6 +52,7 @@ static boolean Z_calloc = false;
#define ZONEID 0xa441d13d #define ZONEID 0xa441d13d
typedef struct memblock_s typedef struct memblock_s
{ {
void **user; void **user;
@ -64,8 +68,9 @@ typedef struct memblock_s
struct memblock_s *next, *prev; struct memblock_s *next, *prev;
} memblock_t; } memblock_t;
#define MEMORY(x) (void *)((uintptr_t)(x) + sizeof(memblock_t)) #define ALIGNPAD (((sizeof (memblock_t) + (alignof (max_align_t) - 1)) & ~(alignof (max_align_t) - 1)) - sizeof (memblock_t))
#define MEMBLOCK(x) (memblock_t *)((uintptr_t)(x) - sizeof(memblock_t)) #define MEMORY(x) (void *)((uintptr_t)(x) + sizeof(memblock_t) + ALIGNPAD)
#define MEMBLOCK(x) (memblock_t *)((uintptr_t)(x) - ALIGNPAD - sizeof(memblock_t))
// both the head and tail of the zone memory block list // both the head and tail of the zone memory block list
static memblock_t head; static memblock_t head;
@ -200,16 +205,17 @@ void *Z_Malloc2(size_t size, INT32 tag, void *user, INT32 alignbits,
{ {
memblock_t *block; memblock_t *block;
void *ptr; void *ptr;
(void)(alignbits); // no longer used, so silence warnings.
(void)(alignbits); // no longer used, so silence warnings. TODO we should figure out a solution for this
#ifdef ZDEBUG #ifdef ZDEBUG
CONS_Debug(DBG_MEMORY, "Z_Malloc %s:%d\n", file, line); CONS_Debug(DBG_MEMORY, "Z_Malloc %s:%d\n", file, line);
#endif #endif
block = xm(sizeof (memblock_t) + size); block = xm(sizeof (memblock_t) + ALIGNPAD + size);
TracyCAlloc(block, sizeof (memblock_t) + size); TracyCAlloc(block, sizeof (memblock_t) + ALIGNPAD + size);
ptr = MEMORY(block); ptr = MEMORY(block);
I_Assert((intptr_t)ptr % sizeof (void *) == 0); I_Assert((intptr_t)ptr % alignof (max_align_t) == 0);
#ifdef HAVE_VALGRIND #ifdef HAVE_VALGRIND
Z_calloc = false; Z_calloc = false;