hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* renamed udd to ctx in qse_mmgr_t

Browse Source 
* fixed problems in build and test scripts
This commit is contained in:
hyung-hwan
2011-08-15 03:07:31 +00:00
parent f332efc288
commit 6e2dd10655
37 changed files with 328 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qse/lib/cmn/Mmgr.cpp
View File

@ -24,19 +24,19 @@
QSE_BEGIN_NAMESPACE(QSE)
/////////////////////////////////
void* Mmgr::alloc_mem (void* udd, size_t n)
void* Mmgr::alloc_mem (void* ctx, size_t n)
{
return ((Mmgr*)udd)->allocMem (n);
return ((Mmgr*)ctx)->allocMem (n);
}
void* Mmgr::realloc_mem (void* udd, void* ptr, size_t n)
void* Mmgr::realloc_mem (void* ctx, void* ptr, size_t n)
{
return ((Mmgr*)udd)->reallocMem (ptr, n);
return ((Mmgr*)ctx)->reallocMem (ptr, n);
}
void Mmgr::free_mem (void* udd, void* ptr)
void Mmgr::free_mem (void* ctx, void* ptr)
{
return ((Mmgr*)udd)->freeMem (ptr);
return ((Mmgr*)ctx)->freeMem (ptr);
}
/////////////////////////////////

38
qse/lib/cmn/mem.c
View File

@ -1,5 +1,5 @@
/*
* $Id: mem.c 441 2011-04-22 14:28:43Z hyunghwan.chung $
* $Id: mem.c 549 2011-08-14 09:07:31Z hyunghwan.chung $
*
Copyright 2006-2011 Chung, Hyung-Hwan.
This file is part of QSE.
@ -19,7 +19,12 @@
*/
#include <qse/cmn/mem.h>
#include <stdlib.h>
#if defined(_WIN32)
# include <windows.h>
#else
# include <stdlib.h>
#endif
#if defined(__SPU__)
#include <spu_intrinsics.h>
@ -417,17 +422,40 @@ void* qse_memrmem (const void* hs, qse_size_t hl, const void* nd, qse_size_t nl)
static void* mmgr_alloc (void* data, qse_size_t n)
{
return malloc (n);
#if defined(_WIN32)
HANDLE heap;
heap = GetProcessHeap ();
if (heap == NULL) return QSE_NULL;
return HeapAlloc (heap, 0, n);
#else
/* TODO: need to rewrite this for __OS2__ using DosAllocMem()? */
return malloc (n);
#endif
}
static void* mmgr_realloc (void* data, void* ptr, qse_size_t n)
{
return realloc (ptr, n);
#if defined(_WIN32)
HANDLE heap;
heap = GetProcessHeap ();
if (heap == NULL) return QSE_NULL;
return ptr? HeapReAlloc (heap, 0, ptr, n):
HeapAlloc (heap, 0, n);
#else
return realloc (ptr, n);
#endif
}
static void mmgr_free (void* data, void* ptr)
{
free (ptr);
#if defined(_WIN32)
HANDLE heap;
heap = GetProcessHeap ();
if (heap) HeapFree (heap, 0, ptr);
#else
free (ptr);
#endif
}
static qse_mmgr_t builtin_mmgr =