diff -r a748d39fd792 -r 968e67c7780c core/sourcehook/sh_pagealloc.h --- a/core/sourcehook/sh_pagealloc.h Fri Dec 17 22:20:10 2010 -0500 +++ b/core/sourcehook/sh_pagealloc.h Fri Dec 17 22:22:44 2010 -0500 @@ -1,6 +1,9 @@ #ifndef __SH_PAGEALLOC_H__ #define __SH_PAGEALLOC_H__ +#include "sh_list.h" +#include "sh_memory.h" + # if SH_XP == SH_XP_WINAPI # include # elif SH_XP == SH_XP_POSIX @@ -53,6 +56,7 @@ bool isolated; // may contain only one AU size_t minAlignment; AUList allocUnits; + bool isRE; // true: RE, otherwise: RW void CheckGap(size_t gap_begin, size_t gap_end, size_t reqsize, size_t &smallestgap_pos, size_t &smallestgap_size, size_t &outAlignBytes) @@ -122,9 +126,11 @@ void *alignedAUBegin = reinterpret_cast( AUBegin + ((minAlignment - AUBegin % minAlignment) % minAlignment) ); - + if (addr == alignedAUBegin) { + DebugCleanMemory(reinterpret_cast(startPtr) + iter->begin_offset, + iter->size); allocUnits.erase(iter); return true; } @@ -133,6 +139,26 @@ return false; } + void DebugCleanMemory(unsigned char* start, size_t size) + { + bool wasRE = isRE; + if (isRE) + { + SetRW(); + } + + unsigned char* end = start + size; + for (unsigned char* p = start; p != end; ++p) + { + *p = 0xCC; + } + + if (wasRE) + { + SetRE(); + } + } + bool Contains(void *addr) { return addr >= startPtr && addr < reinterpret_cast(reinterpret_cast(startPtr) + size); @@ -146,6 +172,18 @@ VirtualFree(startPtr, 0, MEM_RELEASE); #endif } + + void SetRE() + { + SetMemAccess(startPtr, size, SH_MEM_READ | SH_MEM_EXEC); + isRE = true; + } + + void SetRW() + { + SetMemAccess(startPtr, size, SH_MEM_READ | SH_MEM_WRITE); + isRE = false; + } }; typedef List ARList; @@ -178,6 +216,7 @@ if (newRegion.startPtr) { + newRegion.SetRW(); m_Regions.push_back(newRegion); return true; } @@ -210,7 +249,7 @@ } public: - CPageAlloc(size_t minAlignment = 1 /* power of 2 */ ) : m_MinAlignment(minAlignment) + CPageAlloc(size_t minAlignment = 4 /* power of 2 */ ) : m_MinAlignment(minAlignment) { #if SH_XP == SH_XP_POSIX m_PageSize = sysconf(_SC_PAGESIZE); @@ -262,7 +301,7 @@ { if (iter->Contains(ptr)) { - SetMemAccess(iter->startPtr, iter->size, SH_MEM_READ | SH_MEM_EXEC); + iter->SetRE(); break; } } @@ -274,7 +313,7 @@ { if (iter->Contains(ptr)) { - SetMemAccess(iter->startPtr, iter->size, SH_MEM_READ | SH_MEM_WRITE); + iter->SetRW(); break; } }