Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2024-11-25 19:30:50 +00:00
Code Issues Projects Releases Wiki Activity

Native::NewPtr clear flag

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-02-17 15:07:32 -05:00
parent 4f4fde9cfb
commit 1bb0369223
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toolbox/mm.cpp
View File

@ -72,7 +72,7 @@ namespace MM
namespace Native { namespace Native {
uint16_t NewPtr(uint32_t size, uint32_t &mcptr) uint16_t NewPtr(uint32_t size, bool clear, uint32_t &mcptr)
{ {
// native pointers. // native pointers.
@ -86,6 +86,9 @@ namespace MM
return memFullErr; return memFullErr;
} }
if (clear)
std::memset(ptr, 0, size);
mcptr = ptr - Memory; mcptr = ptr - Memory;
PtrMap.emplace(std::make_pair(mcptr, size)); PtrMap.emplace(std::make_pair(mcptr, size));
@ -219,17 +222,7 @@ namespace MM
uint32_t mcptr; uint32_t mcptr;
uint16_t error; uint16_t error;
error = Native::NewPtr(size, mcptr); error = Native::NewPtr(size, clear, mcptr);
if (!error)
{
if (clear && mcptr)
{
uint8_t *ptr = memoryPointer(mcptr);
std::memset(ptr, 0, size);
}
}
cpuSetAReg(0, mcptr); cpuSetAReg(0, mcptr);
return SetMemError(error); return SetMemError(error);

2
toolbox/mm.h
View File

@ -17,7 +17,7 @@ namespace MM
namespace Native namespace Native
{ {
uint16_t NewHandle(uint32_t size, uint32_t &handle); uint16_t NewHandle(uint32_t size, uint32_t &handle);
uint16_t NewPtr(uint32_t size, uint32_t &pointer); uint16_t NewPtr(uint32_t size, bool clear, uint32_t &pointer);
uint16_t DisposeHandle(uint32_t handle); uint16_t DisposeHandle(uint32_t handle);
uint16_t DisposePtr(uint32_t pointer); uint16_t DisposePtr(uint32_t pointer);