nzp-team/glquake
0
0
Fork 0
mirror of https://github.com/nzp-team/glquake.git synced 2025-03-12 04:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pull in zone.c from dquakeplus

Browse source
This commit is contained in:
cypress 2024-09-04 19:14:47 -07:00
parent e86beee7a9
commit 19bd2f273d
2 changed files with 681 additions and 230 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

751
source/zone.c
View file

@ -1,5 +1,7 @@
/*
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1996-2001 Id Software, Inc.
Copyright (C) 2002-2009 John Fitzgibbons and others
Copyright (C) 2010-2014 QuakeSpasm developers
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -17,10 +19,11 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Z_zone.c
// zone.c
#include "quakedef.h"
// cypress -- who the fuck needs a 250kB zone block?? what?? restoring to 50kB.
#define DYNAMIC_SIZE 0xc000
#define ZONEID 0x1d4a11
@ -31,8 +34,8 @@ typedef struct memblock_s
int size; // including the header and possibly tiny fragments
int tag; // a tag of 0 is a free block
int id; // should be ZONEID
struct memblock_s *next, *prev;
int pad; // pad to 64 bit boundary
struct memblock_s *next, *prev;
} memblock_t;
typedef struct
@ -45,6 +48,405 @@ typedef struct
void Cache_FreeLow (int new_low_hunk);
void Cache_FreeHigh (int new_high_hunk);
#ifdef PSP_VFPU
void* memcpy_vfpu( void* dst, void* src, unsigned int size )
{
u8* src8 = (u8*)src;
u8* dst8 = (u8*)dst;
// < 8 isn't worth trying any optimisations...
if (size<8) goto bytecopy;
// < 64 means we don't gain anything from using vfpu...
if (size<64)
{
// Align dst on 4 bytes or just resume if already done
while (((((u32)dst8) & 0x3)!=0) && size) {
*dst8++ = *src8++;
size--;
}
if (size<4) goto bytecopy;
// We are dst aligned now and >= 4 bytes to copy
u32* src32 = (u32*)src8;
u32* dst32 = (u32*)dst8;
switch(((u32)src8)&0x3)
{
case 0:
while (size&0xC)
{
*dst32++ = *src32++;
size -= 4;
}
if (size==0) return (dst); // fast out
while (size>=16)
{
*dst32++ = *src32++;
*dst32++ = *src32++;
*dst32++ = *src32++;
*dst32++ = *src32++;
size -= 16;
}
if (size==0) return (dst); // fast out
src8 = (u8*)src32;
dst8 = (u8*)dst32;
break;
default:
{
register u32 a, b, c, d;
while (size>=4)
{
a = *src8++;
b = *src8++;
c = *src8++;
d = *src8++;
*dst32++ = (d << 24) | (c << 16) | (b << 8) | a;
size -= 4;
}
if (size==0) return (dst); // fast out
dst8 = (u8*)dst32;
}
break;
}
goto bytecopy;
}
// Align dst on 16 bytes to gain from vfpu aligned stores
while ((((u32)dst8) & 0xF)!=0 && size) {
*dst8++ = *src8++;
size--;
}
// We use uncached dst to use VFPU writeback and free cpu cache for src only
u8* udst8 = (u8*)((u32)dst8 | 0x40000000);
// We need the 64 byte aligned address to make sure the dcache is invalidated correctly
u8* dst64a = (u8*)((u32)dst8&~0x3F);
// Invalidate the first line that matches up to the dst start
if (size>=64)
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"cache 0x1B, 0(%0)\n"
"addiu %0, %0, 64\n"
"sync\n"
".set pop\n"
:"+r"(dst64a));
switch(((u32)src8&0xF))
{
// src aligned on 16 bytes too? nice!
case 0:
while (size>=64)
{
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"cache 0x1B, 0(%2)\n" // Dcache writeback invalidate
"lv.q c000, 0(%1)\n"
"lv.q c010, 16(%1)\n"
"lv.q c020, 32(%1)\n"
"lv.q c030, 48(%1)\n"
"sync\n" // Wait for allegrex writeback
"sv.q c000, 0(%0), wb\n"
"sv.q c010, 16(%0), wb\n"
"sv.q c020, 32(%0), wb\n"
"sv.q c030, 48(%0), wb\n"
// Lots of variable updates... but get hidden in sv.q latency anyway
"addiu %3, %3, -64\n"
"addiu %2, %2, 64\n"
"addiu %1, %1, 64\n"
"addiu %0, %0, 64\n"
".set pop\n" // restore assembler option
:"+r"(udst8),"+r"(src8),"+r"(dst64a),"+r"(size)
:
:"memory"
);
}
if (size>16)
{
// Invalidate the last cache line where the max remaining 63 bytes are
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"cache 0x1B, 0(%0)\n"
"sync\n"
".set pop\n" // restore assembler option
::"r"(dst64a));
while (size>=16)
{
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"lv.q c000, 0(%1)\n"
"sv.q c000, 0(%0), wb\n"
// Lots of variable updates... but get hidden in sv.q latency anyway
"addiu %2, %2, -16\n"
"addiu %1, %1, 16\n"
"addiu %0, %0, 16\n"
".set pop\n" // restore assembler option
:"+r"(udst8),"+r"(src8),"+r"(size)
:
:"memory"
);
}
}
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"vflush\n" // Flush VFPU writeback cache
".set pop\n" // restore assembler option
);
dst8 = (u8*)((u32)udst8 & ~0x40000000);
break;
// src is only qword unaligned but word aligned? We can at least use ulv.q
case 4:
case 8:
case 12:
while (size>=64)
{
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"cache 0x1B, 0(%2)\n" // Dcache writeback invalidate
"ulv.q c000, 0(%1)\n"
"ulv.q c010, 16(%1)\n"
"ulv.q c020, 32(%1)\n"
"ulv.q c030, 48(%1)\n"
"sync\n" // Wait for allegrex writeback
"sv.q c000, 0(%0), wb\n"
"sv.q c010, 16(%0), wb\n"
"sv.q c020, 32(%0), wb\n"
"sv.q c030, 48(%0), wb\n"
// Lots of variable updates... but get hidden in sv.q latency anyway
"addiu %3, %3, -64\n"
"addiu %2, %2, 64\n"
"addiu %1, %1, 64\n"
"addiu %0, %0, 64\n"
".set pop\n" // restore assembler option
:"+r"(udst8),"+r"(src8),"+r"(dst64a),"+r"(size)
:
:"memory"
);
}
if (size>16)
// Invalidate the last cache line where the max remaining 63 bytes are
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"cache 0x1B, 0(%0)\n"
"sync\n"
".set pop\n" // restore assembler option
::"r"(dst64a));
while (size>=16)
{
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"ulv.q c000, 0(%1)\n"
"sv.q c000, 0(%0), wb\n"
// Lots of variable updates... but get hidden in sv.q latency anyway
"addiu %2, %2, -16\n"
"addiu %1, %1, 16\n"
"addiu %0, %0, 16\n"
".set pop\n" // restore assembler option
:"+r"(udst8),"+r"(src8),"+r"(size)
:
:"memory"
);
}
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"vflush\n" // Flush VFPU writeback cache
".set pop\n" // restore assembler option
);
dst8 = (u8*)((u32)udst8 & ~0x40000000);
break;
// src not aligned? too bad... have to use unaligned reads
default:
while (size>=64)
{
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"cache 0x1B, 0(%2)\n"
"lwr $8, 0(%1)\n" //
"lwl $8, 3(%1)\n" // $8 = *(s + 0)
"lwr $9, 4(%1)\n" //
"lwl $9, 7(%1)\n" // $9 = *(s + 4)
"lwr $10, 8(%1)\n" //
"lwl $10, 11(%1)\n" // $10 = *(s + 8)
"lwr $11, 12(%1)\n" //
"lwl $11, 15(%1)\n" // $11 = *(s + 12)
"mtv $8, s000\n"
"mtv $9, s001\n"
"mtv $10, s002\n"
"mtv $11, s003\n"
"lwr $8, 16(%1)\n"
"lwl $8, 19(%1)\n"
"lwr $9, 20(%1)\n"
"lwl $9, 23(%1)\n"
"lwr $10, 24(%1)\n"
"lwl $10, 27(%1)\n"
"lwr $11, 28(%1)\n"
"lwl $11, 31(%1)\n"
"mtv $8, s010\n"
"mtv $9, s011\n"
"mtv $10, s012\n"
"mtv $11, s013\n"
"lwr $8, 32(%1)\n"
"lwl $8, 35(%1)\n"
"lwr $9, 36(%1)\n"
"lwl $9, 39(%1)\n"
"lwr $10, 40(%1)\n"
"lwl $10, 43(%1)\n"
"lwr $11, 44(%1)\n"
"lwl $11, 47(%1)\n"
"mtv $8, s020\n"
"mtv $9, s021\n"
"mtv $10, s022\n"
"mtv $11, s023\n"
"lwr $8, 48(%1)\n"
"lwl $8, 51(%1)\n"
"lwr $9, 52(%1)\n"
"lwl $9, 55(%1)\n"
"lwr $10, 56(%1)\n"
"lwl $10, 59(%1)\n"
"lwr $11, 60(%1)\n"
"lwl $11, 63(%1)\n"
"mtv $8, s030\n"
"mtv $9, s031\n"
"mtv $10, s032\n"
"mtv $11, s033\n"
"sync\n"
"sv.q c000, 0(%0), wb\n"
"sv.q c010, 16(%0), wb\n"
"sv.q c020, 32(%0), wb\n"
"sv.q c030, 48(%0), wb\n"
// Lots of variable updates... but get hidden in sv.q latency anyway
"addiu %3, %3, -64\n"
"addiu %2, %2, 64\n"
"addiu %1, %1, 64\n"
"addiu %0, %0, 64\n"
".set pop\n" // restore assembler option
:"+r"(udst8),"+r"(src8),"+r"(dst64a),"+r"(size)
:
:"$8","$9","$10","$11","memory"
);
}
if (size>16)
// Invalidate the last cache line where the max remaining 63 bytes are
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"cache 0x1B, 0(%0)\n"
"sync\n"
".set pop\n" // restore assembler option
::"r"(dst64a));
while (size>=16)
{
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"lwr $8, 0(%1)\n" //
"lwl $8, 3(%1)\n" // $8 = *(s + 0)
"lwr $9, 4(%1)\n" //
"lwl $9, 7(%1)\n" // $9 = *(s + 4)
"lwr $10, 8(%1)\n" //
"lwl $10, 11(%1)\n" // $10 = *(s + 8)
"lwr $11, 12(%1)\n" //
"lwl $11, 15(%1)\n" // $11 = *(s + 12)
"mtv $8, s000\n"
"mtv $9, s001\n"
"mtv $10, s002\n"
"mtv $11, s003\n"
"sv.q c000, 0(%0), wb\n"
// Lots of variable updates... but get hidden in sv.q latency anyway
"addiu %2, %2, -16\n"
"addiu %1, %1, 16\n"
"addiu %0, %0, 16\n"
".set pop\n" // restore assembler option
:"+r"(udst8),"+r"(src8),"+r"(size)
:
:"$8","$9","$10","$11","memory"
);
}
asm(".set push\n" // save assembler option
".set noreorder\n" // suppress reordering
"vflush\n" // Flush VFPU writeback cache
".set pop\n" // restore assembler option
);
dst8 = (u8*)((u32)udst8 & ~0x40000000);
break;
}
bytecopy:
// Copy the remains byte per byte...
while (size--)
{
*dst8++ = *src8++;
}
return (dst);
}
#endif //PSP_VFPU
/*
===================
Q_malloc
Use it instead of malloc so that if memory allocation fails,
the program exits with a message saying there's not enough memory
instead of crashing after trying to use a NULL pointer
===================
*/
void *Q_malloc (size_t size)
{
void *p;
if (!(p = malloc(size)))
Sys_Error ("Not enough memory free; check disk space");
return p;
}
/*
===================
Q_calloc
===================
*/
void *Q_calloc (size_t n, size_t size)
{
void *p;
if (!(p = calloc(n, size)))
Sys_Error ("Not enough memory free; check disk space");
return p;
}
/*
===================
Q_realloc
===================
*/
void *Q_realloc (void *ptr, size_t size)
{
void *p;
if (!(p = realloc(ptr, size)))
Sys_Error ("Not enough memory free; check disk space");
return p;
}
/*
===================
Q_strdup
===================
*/
void *Q_strdup (const char *str)
{
char *p;
if (!(p = strdup(str)))
Sys_Error ("Not enough memory free; check disk space");
return p;
}
/*
==============================================================================
@ -61,34 +463,7 @@ all big things are allocated on the hunk.
==============================================================================
*/
memzone_t *mainzone;
void Z_ClearZone (memzone_t *zone, int size);
/*
========================
Z_ClearZone
========================
*/
void Z_ClearZone (memzone_t *zone, int size)
{
memblock_t *block;
// set the entire zone to one free block
zone->blocklist.next = zone->blocklist.prev = block =
(memblock_t *)( (byte *)zone + sizeof(memzone_t) );
zone->blocklist.tag = 1; // in use block
zone->blocklist.id = 0;
zone->blocklist.size = 0;
zone->rover = block;
block->prev = block->next = &zone->blocklist;
block->tag = 0; // free block
block->id = ZONEID;
block->size = size - sizeof(memzone_t);
}
static memzone_t *mainzone;
/*
@ -134,28 +509,10 @@ void Z_Free (void *ptr)
}
/*
========================
Z_Malloc
========================
*/
void *Z_Malloc (int size)
{
void *buf;
Z_CheckHeap (); // DEBUG
buf = Z_TagMalloc (size, 1);
if (!buf)
Sys_Error ("Z_Malloc: failed on allocation of %i bytes",size);
Q_memset (buf, 0, size);
return buf;
}
void *Z_TagMalloc (int size, int tag)
{
int extra;
memblock_t *start, *rover, *new, *base;
memblock_t *start, *rover, *newblock, *base;
if (!tag)
Sys_Error ("Z_TagMalloc: tried to use a 0 tag");
@ -187,14 +544,14 @@ void *Z_TagMalloc (int size, int tag)
extra = base->size - size;
if (extra > MINFRAGMENT)
{ // there will be a free fragment after the allocated block
new = (memblock_t *) ((byte *)base + size );
new->size = extra;
new->tag = 0; // free block
new->prev = base;
new->id = ZONEID;
new->next = base->next;
new->next->prev = new;
base->next = new;
newblock = (memblock_t *) ((byte *)base + size );
newblock->size = extra;
newblock->tag = 0; // free block
newblock->prev = base;
newblock->id = ZONEID;
newblock->next = base->next;
newblock->next->prev = newblock;
base->next = newblock;
base->size = size;
}
@ -210,7 +567,85 @@ void *Z_TagMalloc (int size, int tag)
return (void *) ((byte *)base + sizeof(memblock_t));
}
char *Z_Strdup (const char *s)
/*
========================
Z_CheckHeap
========================
*/
void Z_CheckHeap (void)
{
memblock_t *block;
for (block = mainzone->blocklist.next ; ; block = block->next)
{
if (block->next == &mainzone->blocklist)
break; // all blocks have been hit
if ( (byte *)block + block->size != (byte *)block->next)
Sys_Error ("Z_CheckHeap: block size does not touch the next block");
if ( block->next->prev != block)
Sys_Error ("Z_CheckHeap: next block doesn't have proper back link");
if (!block->tag && !block->next->tag)
Sys_Error ("Z_CheckHeap: two consecutive free blocks");
}
}
/*
========================
Z_Malloc
========================
*/
void *Z_Malloc (int size)
{
void *buf;
Z_CheckHeap (); // DEBUG
buf = Z_TagMalloc (size, 1);
if (!buf)
Sys_Error ("Z_Malloc: failed on allocation of %i bytes",size);
Q_memset (buf, 0, size);
return buf;
}
/*
========================
Z_Realloc
========================
*/
void *Z_Realloc(void *ptr, int size)
{
int old_size;
void *old_ptr;
memblock_t *block;
if (!ptr)
return Z_Malloc (size);
block = (memblock_t *) ((byte *) ptr - sizeof (memblock_t));
if (block->id != ZONEID)
Sys_Error ("Z_Realloc: realloced a pointer without ZONEID");
if (block->tag == 0)
Sys_Error ("Z_Realloc: realloced a freed pointer");
old_size = block->size;
old_size -= (4 + (int)sizeof(memblock_t)); /* see Z_TagMalloc() */
old_ptr = ptr;
Z_Free (ptr);
ptr = Z_TagMalloc (size, 1);
if (!ptr)
Sys_Error ("Z_Realloc: failed on allocation of %i bytes", size);
if (ptr != old_ptr)
memmove (ptr, old_ptr, MIN(old_size, size));
if (old_size < size)
memset ((byte *)ptr + old_size, 0, size - old_size);
return ptr;
}
char *Z_Strdup (char *s)
{
size_t sz = strlen(s) + 1;
char *ptr = (char *) Z_Malloc (sz);
@ -218,6 +653,7 @@ char *Z_Strdup (const char *s)
return ptr;
}
/*
========================
Z_Print
@ -246,37 +682,16 @@ void Z_Print (memzone_t *zone)
}
/*
========================
Z_CheckHeap
========================
*/
void Z_CheckHeap (void)
{
memblock_t *block;
for (block = mainzone->blocklist.next ; ; block = block->next)
{
if (block->next == &mainzone->blocklist)
break; // all blocks have been hit
if ( (byte *)block + block->size != (byte *)block->next)
Sys_Error ("Z_CheckHeap: block size does not touch the next block\n");
if ( block->next->prev != block)
Sys_Error ("Z_CheckHeap: next block doesn't have proper back link\n");
if (!block->tag && !block->next->tag)
Sys_Error ("Z_CheckHeap: two consecutive free blocks\n");
}
}
//============================================================================
#define HUNK_SENTINAL 0x1df001ed
#define HUNK_SENTINEL 0x1df001ed
#define HUNKNAME_LEN 24
typedef struct
{
int sentinal;
int sentinel;
int size; // including sizeof(hunk_t), -1 = not allocated
char name[8];
char name[HUNKNAME_LEN];
} hunk_t;
byte *hunk_base;
@ -288,13 +703,11 @@ int hunk_high_used;
qboolean hunk_tempactive;
int hunk_tempmark;
void R_FreeTextures (void);
/*
==============
Hunk_Check
Run consistancy and sentinal trahing checks
Run consistancy and sentinel trahing checks
==============
*/
void Hunk_Check (void)
@ -303,9 +716,9 @@ void Hunk_Check (void)
for (h = (hunk_t *)hunk_base ; (byte *)h != hunk_base + hunk_low_used ; )
{
if (h->sentinal != HUNK_SENTINAL)
Sys_Error ("Hunk_Check: trahsed sentinal");
if (h->size < 16 || h->size + (byte *)h - hunk_base > hunk_size)
if (h->sentinel != HUNK_SENTINEL)
Sys_Error ("Hunk_Check: trashed sentinel");
if (h->size < (int) sizeof(hunk_t) || h->size + (byte *)h - hunk_base > hunk_size)
Sys_Error ("Hunk_Check: bad size");
h = (hunk_t *)((byte *)h+h->size);
}
@ -324,9 +737,8 @@ void Hunk_Print (qboolean all)
hunk_t *h, *next, *endlow, *starthigh, *endhigh;
int count, sum;
int totalblocks;
char name[9];
char name[HUNKNAME_LEN];
name[8] = 0;
count = 0;
sum = 0;
totalblocks = 0;
@ -361,9 +773,9 @@ void Hunk_Print (qboolean all)
//
// run consistancy checks
//
if (h->sentinal != HUNK_SENTINAL)
Sys_Error ("Hunk_Check: trahsed sentinal");
if (h->size < 16 || h->size + (byte *)h - hunk_base > hunk_size)
if (h->sentinel != HUNK_SENTINEL)
Sys_Error ("Hunk_Check: trashed sentinel");
if (h->size < (int) sizeof(hunk_t) || h->size + (byte *)h - hunk_base > hunk_size)
Sys_Error ("Hunk_Check: bad size");
next = (hunk_t *)((byte *)h+h->size);
@ -374,7 +786,7 @@ void Hunk_Print (qboolean all)
//
// print the single block
//
memcpy (name, h->name, 8);
memcpy (name, h->name, HUNKNAME_LEN);
if (all)
Con_Printf ("%8p :%8i %8s\n",h, h->size, name);
@ -382,7 +794,7 @@ void Hunk_Print (qboolean all)
// print the total
//
if (next == endlow || next == endhigh ||
strncmp (h->name, next->name, 8) )
strncmp (h->name, next->name, HUNKNAME_LEN - 1))
{
if (!all)
Con_Printf (" :%8i %8s (TOTAL)\n",sum, name);
@ -398,6 +810,16 @@ void Hunk_Print (qboolean all)
}
/*
===================
Hunk_Print_f -- johnfitz -- console command to call hunk_print
===================
*/
void Hunk_Print_f (void)
{
Hunk_Print (false);
}
/*
===================
Hunk_AllocName
@ -427,8 +849,8 @@ void *Hunk_AllocName (int size, char *name)
memset (h, 0, size);
h->size = size;
h->sentinal = HUNK_SENTINAL;
Q_strncpy (h->name, name, 8);
h->sentinel = HUNK_SENTINEL;
strlcpy(h->name, name, HUNKNAME_LEN);
return (void *)(h+1);
}
@ -518,8 +940,8 @@ void *Hunk_HighAllocName (int size, char *name)
memset (h, 0, size);
h->size = size;
h->sentinal = HUNK_SENTINAL;
Q_strncpy (h->name, name, 8);
h->sentinel = HUNK_SENTINEL;
strlcpy (h->name, name, HUNKNAME_LEN);
return (void *)(h+1);
}
@ -553,6 +975,14 @@ void *Hunk_TempAlloc (int size)
return buf;
}
char *Hunk_Strdup (char *s, char *name)
{
size_t sz = strlen(s) + 1;
char *ptr = (char *) Hunk_AllocName (sz, name);
memcpy (ptr, s, sz);
return ptr;
}
/*
===============================================================================
@ -561,11 +991,12 @@ CACHE MEMORY
===============================================================================
*/
#define CACHENAME_LEN 32
typedef struct cache_system_s
{
int size; // including this header
cache_user_t *user;
char name[16];
char name[CACHENAME_LEN];
struct cache_system_s *prev, *next;
struct cache_system_s *lru_prev, *lru_next; // for LRU flushing
} cache_system_t;
@ -581,19 +1012,19 @@ Cache_Move
*/
void Cache_Move ( cache_system_t *c)
{
cache_system_t *new;
cache_system_t *new_cs;
// we are clearing up space at the bottom, so only allocate it late
new = Cache_TryAlloc (c->size, true);
if (new)
new_cs = Cache_TryAlloc (c->size, true);
if (new_cs)
{
// Con_Printf ("cache_move ok\n");
Q_memcpy ( new+1, c+1, c->size - sizeof(cache_system_t) );
new->user = c->user;
Q_memcpy (new->name, c->name, sizeof(new->name));
Q_memcpy ( new_cs+1, c+1, c->size - sizeof(cache_system_t) );
new_cs->user = c->user;
Q_memcpy (new_cs->name, c->name, sizeof(new_cs->name));
Cache_Free (c->user);
new->user->data = (void *)(new+1);
new_cs->user->data = (void *)(new_cs+1);
}
else
{
@ -686,7 +1117,7 @@ Size should already include the header and padding
*/
cache_system_t *Cache_TryAlloc (int size, qboolean nobottom)
{
cache_system_t *cs, *new;
cache_system_t *cs, *new_cs;
// is the cache completely empty?
@ -695,62 +1126,62 @@ cache_system_t *Cache_TryAlloc (int size, qboolean nobottom)
if (hunk_size - hunk_high_used - hunk_low_used < size)
Sys_Error ("Cache_TryAlloc: %i is greater then free hunk", size);
new = (cache_system_t *) (hunk_base + hunk_low_used);
memset (new, 0, sizeof(*new));
new->size = size;
new_cs = (cache_system_t *) (hunk_base + hunk_low_used);
memset (new_cs, 0, sizeof(*new_cs));
new_cs->size = size;
cache_head.prev = cache_head.next = new;
new->prev = new->next = &cache_head;
cache_head.prev = cache_head.next = new_cs;
new_cs->prev = new_cs->next = &cache_head;
Cache_MakeLRU (new);
return new;
Cache_MakeLRU (new_cs);
return new_cs;
}
// search from the bottom up for space
new = (cache_system_t *) (hunk_base + hunk_low_used);
new_cs = (cache_system_t *) (hunk_base + hunk_low_used);
cs = cache_head.next;
do
{
if (!nobottom || cs != cache_head.next)
{
if ( (byte *)cs - (byte *)new >= size)
if ( (byte *)cs - (byte *)new_cs >= size)
{ // found space
memset (new, 0, sizeof(*new));
new->size = size;
memset (new_cs, 0, sizeof(*new_cs));
new_cs->size = size;
new->next = cs;
new->prev = cs->prev;
cs->prev->next = new;
cs->prev = new;
new_cs->next = cs;
new_cs->prev = cs->prev;
cs->prev->next = new_cs;
cs->prev = new_cs;
Cache_MakeLRU (new);
Cache_MakeLRU (new_cs);
return new;
return new_cs;
}
}
// continue looking
new = (cache_system_t *)((byte *)cs + cs->size);
new_cs = (cache_system_t *)((byte *)cs + cs->size);
cs = cs->next;
} while (cs != &cache_head);
// try to allocate one at the very end
if ( hunk_base + hunk_size - hunk_high_used - (byte *)new >= size)
if ( hunk_base + hunk_size - hunk_high_used - (byte *)new_cs >= size)
{
memset (new, 0, sizeof(*new));
new->size = size;
memset (new_cs, 0, sizeof(*new_cs));
new_cs->size = size;
new->next = &cache_head;
new->prev = cache_head.prev;
cache_head.prev->next = new;
cache_head.prev = new;
new_cs->next = &cache_head;
new_cs->prev = cache_head.prev;
cache_head.prev->next = new_cs;
cache_head.prev = new_cs;
Cache_MakeLRU (new);
Cache_MakeLRU (new_cs);
return new;
return new_cs;
}
return NULL; // couldn't allocate
@ -769,7 +1200,6 @@ void Cache_Flush (void)
Cache_Free ( cache_head.next->user); // reclaim the space
}
/*
============
Cache_Print
@ -797,16 +1227,6 @@ void Cache_Report (void)
Con_DPrintf ("%4.1f megabyte data cache\n", (hunk_size - hunk_high_used - hunk_low_used) / (float)(1024*1024) );
}
/*
============
Cache_Compact
============
*/
void Cache_Compact (void)
{
}
/*
============
Cache_Init
@ -880,7 +1300,7 @@ void *Cache_Alloc (cache_user_t *c, int size, char *name)
cache_system_t *cs;
if (c->data)
Sys_Error ("Cache_Alloc: allready allocated");
Sys_Error ("Cache_Alloc: already allocated");
if (size <= 0)
Sys_Error ("Cache_Alloc: size %i", size);
@ -893,7 +1313,7 @@ void *Cache_Alloc (cache_user_t *c, int size, char *name)
cs = Cache_TryAlloc (size, false);
if (cs)
{
strncpy (cs->name, name, sizeof(cs->name)-1);
strlcpy (cs->name, name, CACHENAME_LEN);
c->data = (void *)(cs+1);
cs->user = c;
break;
@ -901,8 +1321,8 @@ void *Cache_Alloc (cache_user_t *c, int size, char *name)
// free the least recently used cahedat
if (cache_head.lru_prev == &cache_head)
Sys_Error ("Cache_Alloc: out of memory");
// not enough memory at all
Sys_Error ("Cache_Alloc: out of memory"); // not enough memory at all
Cache_Free (cache_head.lru_prev->user);
}
@ -912,6 +1332,25 @@ void *Cache_Alloc (cache_user_t *c, int size, char *name)
//============================================================================
void Memory_InitZone (memzone_t *zone, int size)
{
memblock_t *block;
// set the entire zone to one free block
zone->blocklist.next = zone->blocklist.prev = block =
(memblock_t *)( (byte *)zone + sizeof(memzone_t) );
zone->blocklist.tag = 1; // in use block
zone->blocklist.id = 0;
zone->blocklist.size = 0;
zone->rover = block;
block->prev = block->next = &zone->blocklist;
block->tag = 0; // free block
block->id = ZONEID;
block->size = size - sizeof(memzone_t);
}
/*
========================
Memory_Init
@ -922,7 +1361,7 @@ void Memory_Init (void *buf, int size)
int p;
int zonesize = DYNAMIC_SIZE;
hunk_base = buf;
hunk_base = (byte *) buf;
hunk_size = size;
hunk_low_used = 0;
hunk_high_used = 0;
@ -936,7 +1375,9 @@ void Memory_Init (void *buf, int size)
else
Sys_Error ("Memory_Init: you must specify a size in KB after -zone");
}
mainzone = Hunk_AllocName (zonesize, "zone" );
Z_ClearZone (mainzone, zonesize);
mainzone = (memzone_t *) Hunk_AllocName (zonesize, "zone" );
Memory_InitZone (mainzone, zonesize);
Cmd_AddCommand ("hunk_print", Hunk_Print_f); //johnfitz
}

28
source/zone.h
View file

@ -1,5 +1,7 @@
/*
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1996-2001 Id Software, Inc.
Copyright (C) 2002-2009 John Fitzgibbons and others
Copyright (C) 2010-2014 QuakeSpasm developers
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -17,6 +19,10 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __ZZONE_H
#define __ZZONE_H
/*
memory allocation
@ -85,19 +91,20 @@ Zone block
void Memory_Init (void *buf, int size);
void *Q_malloc (size_t size); // joe
void *Q_calloc (size_t n, size_t size); //
void *Q_realloc (void *ptr, size_t size); //
void *Q_strdup (const char *str); //
void Z_Free (void *ptr);
void *Z_Malloc (int size); // returns 0 filled memory
void *Z_TagMalloc (int size, int tag);
void Z_DumpHeap (void);
void Z_CheckHeap (void);
int Z_FreeMemory (void);
char *Z_Strdup (const char *s);
void *Z_Realloc (void *ptr, int size);
char *Z_Strdup (char *s);
void *Hunk_Alloc (int size); // returns 0 filled memory
void *Hunk_AllocName (int size, char *name);
void *Hunk_HighAllocName (int size, char *name);
char *Hunk_Strdup (char *s, char *name);
int Hunk_LowMark (void);
void Hunk_FreeToLowMark (int mark);
@ -128,5 +135,8 @@ void *Cache_Alloc (cache_user_t *c, int size, char *name);
void Cache_Report (void);
#ifdef PSP_VFPU
void* memcpy_vfpu(void* dst, void* src, unsigned int size);
#endif // PSP_VFPU
#endif /* __ZZONE_H */