adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cut unused components of the memory library.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2878 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2007-12-21 00:48:43 +00:00
parent f7392e1399
commit 73c82ef1ca
10 changed files with 27 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/displist.h
+1 -1
View File
@@ -91,7 +91,7 @@ UnlockLink (const QUEUE *pq, HLINK h)
#define AllocQueueTab(pq,n) \
((pq)->hq_tab = mem_allocate ((MEM_SIZE)((COUNT)(pq)->object_size * \
(COUNT)((pq)->num_objects = (BYTE)(n))), \
MEM_PRIMARY, DEFAULT_MEM_PRIORITY, MEM_SIMPLE))
MEM_PRIMARY))
#define LockQueueTab(pq) ((pq)->pq_tab = (BYTE*)mem_lock ((pq)->hq_tab))
#define UnlockQueueTab(pq) mem_unlock ((pq)->hq_tab)
#define FreeQueueTab(pq) mem_release ((pq)->hq_tab); (pq)->hq_tab = 0
sc2/src/sc2code/libs/decomp/lzencode.c
+1 -2
View File
@@ -36,8 +36,7 @@ static SWORD *dad;
mem_allocate ( \
(MEM_SIZE)(((N + 1) + (N + 257) + (N + 1)) \
* sizeof (lson[0]) + sizeof (MEM_HANDLE)), \
MEM_ZEROINIT, DEFAULT_MEM_PRIORITY, MEM_SIMPLE \
)
MEM_ZEROINIT)
#define LockCodeArrays (SWORD*)mem_lock
#define UnlockCodeArrays mem_unlock
#define FreeCodeArrays mem_release
sc2/src/sc2code/libs/decomp/lzh.h
+1 -2
View File
@@ -78,8 +78,7 @@ typedef LZHCODE_DESC *PLZHCODE_DESC;
#define AllocCodeDesc() \
mem_allocate ((MEM_SIZE)sizeof (LZHCODE_DESC), \
MEM_ZEROINIT, DEFAULT_MEM_PRIORITY, MEM_SIMPLE)
mem_allocate ((MEM_SIZE)sizeof (LZHCODE_DESC), MEM_ZEROINIT)
#define LockCodeDesc (PLZHCODE_DESC)mem_lock
#define UnlockCodeDesc mem_unlock
#define FreeCodeDesc mem_release
sc2/src/sc2code/libs/graphics/context.h
+1 -1
View File
@@ -46,7 +46,7 @@ struct context_desc
#define AllocContext() \
(CONTEXT_REF)mem_allocate ((MEM_SIZE)sizeof (CONTEXT_DESC), \
MEM_ZEROINIT | MEM_PRIMARY, CONTEXT_PRIORITY, MEM_SIMPLE)
MEM_ZEROINIT | MEM_PRIMARY)
#define LockContext (CONTEXT)mem_lock
#define UnlockContext mem_unlock
#define FreeContext mem_release
sc2/src/sc2code/libs/graphics/drawable.c
+1 -2
View File
@@ -84,8 +84,7 @@ AllocDrawable (COUNT n)
{
DRAWABLE Drawable;
Drawable = (DRAWABLE)mem_allocate ((MEM_SIZE)(sizeof (DRAWABLE_DESC)),
MEM_ZEROINIT | MEM_GRAPHICS,
DRAWABLE_PRIORITY, MEM_SIMPLE);
MEM_ZEROINIT | MEM_GRAPHICS);
if (Drawable)
{
DRAWABLE_DESC *DrawablePtr;
sc2/src/sc2code/libs/graphics/font.h
+1 -1
View File
@@ -61,7 +61,7 @@ struct font_desc
#define AllocFont(size) \
(FONT_REF)mem_allocate ((MEM_SIZE)(sizeof (FONT_DESC) + (size)), \
MEM_ZEROINIT | MEM_GRAPHICS, FONT_PRIORITY, MEM_SIMPLE)
MEM_ZEROINIT | MEM_GRAPHICS)
#define LockFont(h) (FONT)mem_lock (h)
#define UnlockFont(h) mem_unlock (h)
#define FreeFont _ReleaseFontData
sc2/src/sc2code/libs/memlib.h
+9 -97
View File
@@ -21,82 +21,19 @@
#include "compiler.h"
#define MEM_NULL 0L
#define NULL_HANDLE (MEM_HANDLE)MEM_NULL
#define NULL_HANDLE (MEM_HANDLE)(0L)
typedef signed long MEM_SIZE;
typedef MEM_SIZE *PMEM_SIZE;
typedef long MEM_OFFS;
typedef SWORD MEM_HANDLE;
typedef MEM_HANDLE *PMEM_HANDLE;
typedef BOOLEAN MEM_BOOL;
#define MEM_FAILURE FALSE
#define MEM_SUCCESS TRUE
enum
{
SAME_MEM_USAGE = 0,
MEM_SIMPLE,
MEM_COMPLEX
};
typedef BYTE MEM_USAGE;
#define NO_MEM_USAGE (MEM_USAGE)SAME_MEM_USAGE
#define DEFAULT_MEM_USAGE (MEM_USAGE)MEM_SIMPLE
enum
{
MEM_NO_ACCESS = 0,
MEM_READ_ONLY,
MEM_WRITE_ONLY,
MEM_READ_WRITE
};
typedef BYTE MEM_ACCESS_MODE;
enum
{
MEM_SEEK_REL,
MEM_SEEK_ABS
};
typedef BYTE MEM_SEEK_MODE;
enum
{
MEM_FORWARD,
MEM_BACKWARD
};
typedef BYTE MEM_DIRECTION;
typedef struct mem_size_request
{
MEM_SIZE min_size, size, max_size;
MEM_DIRECTION direction;
} MEM_SIZE_REQUEST;
typedef MEM_SIZE_REQUEST *PMEM_SIZE_REQUEST;
typedef SBYTE MEM_PRIORITY;
typedef UWORD MEM_FLAGS;
#define DEFAULT_MEM_FLAGS (MEM_FLAGS)0
#define SAME_MEM_FLAGS (MEM_FLAGS)0
#define MEM_CONSTRAINED (MEM_FLAGS)(1 << 2)
#define MEM_DISCARDABLE (MEM_FLAGS)(1 << 3)
#define MEM_NODISCARD (MEM_FLAGS)(1 << 4)
#define MEM_DISCARDED (MEM_FLAGS)(1 << 5)
#define MEM_ACCESSED (MEM_FLAGS)(1 << 6)
#define MEM_STATIC (MEM_FLAGS)(1 << 7)
#define MEM_PRIMARY (MEM_FLAGS)(1 << 8)
#define MEM_ZEROINIT (MEM_FLAGS)(1 << 9)
#define MEM_GRAPHICS (MEM_FLAGS)(1 << 10)
#define MEM_SOUND (MEM_FLAGS)(1 << 11)
#define DEFAULT_MEM_PRIORITY (MEM_PRIORITY)0
#define SAME_MEM_PRIORITY (MEM_PRIORITY)0
#define HIGHEST_MEM_PRIORITY (MEM_PRIORITY)1
#define LOWEST_MEM_PRIORITY (MEM_PRIORITY)100
typedef struct mem_header {
MEM_HANDLE handle;
} _ALIGNED_ANY MEM_HEADER;
@@ -112,45 +49,20 @@ typedef struct mem_header {
extern MEM_BOOL mem_init (MEM_SIZE core_size, PMEM_SIZE pmin_addressable,
PSTR disk_name);*/
extern MEM_BOOL mem_init (void);
extern BOOLEAN mem_init (void);
extern MEM_BOOL mem_uninit (void);
extern BOOLEAN mem_uninit (void);
extern MEM_HANDLE mem_allocate (MEM_SIZE size, MEM_FLAGS flags);
extern BOOLEAN mem_release (MEM_HANDLE handle);
extern MEM_HANDLE mem_allocate (MEM_SIZE size, MEM_FLAGS flags,
MEM_PRIORITY priority, MEM_USAGE usage);
#define mem_request(size) \
mem_allocate((MEM_SIZE)(size), DEFAULT_MEM_FLAGS, DEFAULT_MEM_PRIORITY, DEFAULT_MEM_USAGE)
extern MEM_BOOL mem_release (MEM_HANDLE handle);
extern MEM_HANDLE mem_reallocate (MEM_HANDLE handle, MEM_SIZE size,
MEM_FLAGS flags, MEM_PRIORITY priority, MEM_USAGE usage);
#define mem_resize(h, size) \
mem_reallocate(h, (MEM_SIZE)size, SAME_MEM_FLAGS, SAME_MEM_PRIORITY, SAME_MEM_USAGE)
extern MEM_HANDLE mem_static (void *pVoid, MEM_SIZE size, MEM_USAGE
usage);
extern MEM_HANDLE mem_dup (MEM_HANDLE handle, MEM_USAGE usage);
mem_allocate((MEM_SIZE)(size), DEFAULT_MEM_FLAGS)
extern void* mem_simple_access (MEM_HANDLE handle);
extern MEM_BOOL mem_simple_unaccess (MEM_HANDLE handle);
#define mem_lock mem_simple_access
#define mem_unlock mem_simple_unaccess
extern void* mem_complex_access (MEM_HANDLE handle, MEM_SIZE pos,
PMEM_SIZE_REQUEST pSizeRequest, MEM_ACCESS_MODE access_mode);
extern MEM_BOOL mem_complex_unaccess (MEM_HANDLE handle);
extern void* mem_complex_seek (MEM_HANDLE handle, MEM_OFFS offset,
PMEM_SIZE_REQUEST pSizeRequest, MEM_SEEK_MODE seek_mode);
extern MEM_SIZE mem_get_memavailable (MEM_SIZE size, MEM_PRIORITY
priority);
extern void* mem_lock (MEM_HANDLE handle);
extern BOOLEAN mem_unlock (MEM_HANDLE handle);
extern MEM_SIZE mem_get_size (MEM_HANDLE handle);
extern MEM_USAGE mem_get_usage (MEM_HANDLE handle);
extern MEM_BOOL mem_set_flags (MEM_HANDLE handle, MEM_FLAGS mem_flags);
extern MEM_FLAGS mem_get_flags (MEM_HANDLE handle);
extern MEM_BOOL mem_set_priority (MEM_HANDLE handle, MEM_PRIORITY
mem_priority);
extern MEM_PRIORITY mem_get_priority (MEM_HANDLE handle);
#endif /* _MEMLIB_H */
sc2/src/sc2code/libs/memory/w_memlib.c
+10 -13
View File
@@ -231,8 +231,7 @@ MallocWithRetry(int bytes, char *diagStr)
}
MEM_HANDLE
mem_allocate (MEM_SIZE coreSize, MEM_FLAGS flags, MEM_PRIORITY priority,
MEM_USAGE usage)
mem_allocate (MEM_SIZE coreSize, MEM_FLAGS flags)
{
szMemoryNode *node;
@@ -277,8 +276,6 @@ mem_allocate (MEM_SIZE coreSize, MEM_FLAGS flags, MEM_PRIORITY priority,
}
UnlockMutex (_MemoryLock);
(void) priority; /* Satisfying compiler (unused parameter) */
(void) usage; /* Satisfying compiler (unused parameter) */
return (0);
}
@@ -342,7 +339,7 @@ mem_get_size (MEM_HANDLE h)
**
**END*/
MEM_BOOL
BOOLEAN
mem_init (void)
{
int i;
@@ -385,7 +382,7 @@ mem_init (void)
**
**END*/
MEM_BOOL
BOOLEAN
mem_uninit(void)
{
int i;
@@ -442,7 +439,7 @@ mem_uninit(void)
**
**END*/
MEM_BOOL
BOOLEAN
mem_release(MEM_HANDLE h)
{
if (h == 0)
@@ -507,7 +504,7 @@ mem_release(MEM_HANDLE h)
**END*/
void *
mem_simple_access(MEM_HANDLE h)
mem_lock (MEM_HANDLE h)
{
LockMutex (_MemoryLock);
@@ -545,8 +542,8 @@ mem_simple_access(MEM_HANDLE h)
**
**END*/
MEM_BOOL
mem_simple_unaccess(MEM_HANDLE h)
BOOLEAN
mem_unlock (MEM_HANDLE h)
{
LockMutex (_MemoryLock);
if (h > 0 && h <= MAX_EXTENTS && extents[h - 1].handle == h)
@@ -567,8 +564,8 @@ _alloc_mem (int size)
void *p;
int h;
h = mem_allocate (sizeof (MEM_HEADER) + size, 0, 0, 0);
p = (void *)mem_simple_access (h);
h = mem_allocate (sizeof (MEM_HEADER) + size, DEFAULT_MEM_FLAGS);
p = (void *)mem_lock (h);
if (p)
{
((MEM_HEADER *) p)->handle = h;
@@ -603,7 +600,7 @@ HFree (void *p)
hdr = GET_MEM_HEADER(p);
h = hdr->handle;
mem_simple_unaccess (h);
mem_unlock (h);
mem_release (h);
}
}
sc2/src/sc2code/libs/reslib.h
+1 -1
View File
@@ -88,7 +88,7 @@ extern MEM_HANDLE GetResourceData (uio_Stream *fp, DWORD length,
#define RESOURCE_PRIORITY DEFAULT_MEM_PRIORITY
#define AllocResourceData(s,mf) \
mem_allocate ((MEM_SIZE)(s), (mf), RESOURCE_PRIORITY, MEM_SIMPLE)
mem_allocate ((MEM_SIZE)(s), (mf))
#define LockResourceData(h,lp) \
do \
{ \
sc2/src/sc2code/libs/resource/resinit.c
+1 -2
View File
@@ -472,8 +472,7 @@ copyResTypeHandlers (ResourceIndex *dest, const ResourceIndex *src)
static MEM_HANDLE
allocResourceIndex (void) {
return mem_allocate (sizeof (ResourceIndex), MEM_PRIMARY,
INDEX_HEADER_PRIORITY, MEM_SIMPLE);
return mem_allocate (sizeof (ResourceIndex), MEM_PRIMARY);
}
static void