Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2025-08-09 03:25:15 +00:00
Code Issues Projects Releases Wiki Activity

MM::SetHandleSize - purge and retry.

Browse Source
This commit is contained in:
Kelvin Sherlock
2013-06-26 22:49:27 -04:00
parent ef80d410ca
commit acb5733e6c
1 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
toolbox/mm.cpp
View File

@@ -701,7 +701,7 @@ namespace MM
uint32_t hh = cpuGetAReg(0); uint32_t hh = cpuGetAReg(0);
uint32_t newSize = cpuGetDReg(0); uint32_t newSize = cpuGetDReg(0);
Log("%04x SetHandleSize(%08x, %08x)\n", hh, newSize); Log("%04x SetHandleSize(%08x, %08x)\n", trap, hh, newSize);
auto iter = HandleMap.find(hh); auto iter = HandleMap.find(hh);
@@ -743,35 +743,63 @@ namespace MM
return SetMemError(0); return SetMemError(0);
} }
// 3. - locked for (unsigned i = 0; i < 2; ++i)
if (info.locked)
{ {
if (mplite_resize(&pool, ptr, newSize) == MPLITE_OK)
// 3. - locked
if (info.locked)
{ {
info.size = newSize; if (mplite_resize(&pool, ptr, newSize) == MPLITE_OK)
return SetMemError(0); {
info.size = newSize;
return SetMemError(0);
}
} }
return SetMemError(MacOS::memFullErr); else
{
// 4. - resize.
ptr = (uint8_t *)mplite_realloc(&pool, ptr, newSize);
if (ptr)
{
mcptr = ptr - Memory;
info.address = mcptr;
info.size = newSize;
return SetMemError(0);
}
}
fprintf(stderr, "mplite_realloc failed.\n");
Native::PrintMemoryStats();
if (i > 0) return SetMemError(MacOS::memFullErr);
// purge...
for (auto & kv : HandleMap)
{
uint32_t handle = kv.first;
auto &info = kv.second;
if (handle == hh) continue;
if (info.size && info.purgeable && !info.locked)
{
mplite_free(&pool, Memory + info.address);
info.size = 0;
info.address = 0;
// also need to update memory
memoryWriteLong(0, handle);
}
}
} }
// 4. - resize. return SetMemError(MacOS::memFullErr);
ptr = (uint8_t *)mplite_realloc(&pool, ptr, newSize);
if (ptr)
{
mcptr = ptr - Memory;
info.address = mcptr;
info.size = newSize;
return SetMemError(0);
}
else
{
return SetMemError(MacOS::memFullErr);
}
} }