Skip to content

Fix allocating memory in zone under 64 bit #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Daivuk merged 2 commits into from
Feb 7, 2026
Merged

Fix allocating memory in zone under 64 bit #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2e9c88
Fix address alignment in zone
korbykob Feb 7, 2026
764d4ec
Update header
korbykob Feb 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion PureDOOM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48162,6 +48162,7 @@ void WI_Start(wbstartstruct_t* wbstartstruct)
}
#define ZONEID 0x1d4a11
#define MINFRAGMENT 64
#define MEM_ALIGN sizeof(void *)


typedef struct
Expand Down Expand Up @@ -48301,7 +48302,7 @@ void* Z_Malloc(int size, int tag, void* user)
memblock_t* newblock;
memblock_t* base;

size = (size + 3) & ~3;
size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);

// scan through the block list,
// looking for the first free block
Expand Down
3 changes: 2 additions & 1 deletion src/DOOM/z_zone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

#define ZONEID 0x1d4a11
#define MINFRAGMENT 64
#define MEM_ALIGN sizeof(void *)


typedef struct
Expand Down Expand Up @@ -182,7 +183,7 @@ void* Z_Malloc(int size, int tag, void* user)
memblock_t* newblock;
memblock_t* base;

size = (size + 3) & ~3;
size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);

// scan through the block list,
// looking for the first free block
Expand Down
Loading