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

GetHandleSize needs to return the 32-bit sign-extended error code.

Browse Source
This commit is contained in:
Kelvin Sherlock 2014-12-22 17:58:35 -05:00
parent d8f6edd964
commit 48558e9885
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
toolbox/mm.cpp
View File

@ -73,7 +73,7 @@ namespace
// map of handle -> size [? just use Ptr map?] // map of handle -> size [? just use Ptr map?]
std::map<uint32_t, HandleInfo> HandleMap; std::map<uint32_t, HandleInfo> HandleMap;
inline uint16_t SetMemError(uint16_t error) inline int16_t SetMemError(int16_t error)
{ {
memoryWriteWord(error, MacOS::MemErr); memoryWriteWord(error, MacOS::MemErr);
return error; return error;
@ -394,6 +394,8 @@ namespace MM
uint16_t SetHandleSize(uint32_t handle, uint32_t newSize) uint16_t SetHandleSize(uint32_t handle, uint32_t newSize)
{ {
if (handle == 0) return SetMemError(MacOS::nilHandleErr);
const auto iter = HandleMap.find(handle); const auto iter = HandleMap.find(handle);
if (iter == HandleMap.end()) return SetMemError(MacOS::memWZErr); if (iter == HandleMap.end()) return SetMemError(MacOS::memWZErr);
@ -1032,9 +1034,21 @@ namespace MM
* *
*/ */
/*
* The trap dispatcher sets the condition codes before returning
* from a trap by testing the low-order word of register D0 with
* a TST.W instruction. Because the block size returned in D0 by
* _GetHandleSize is a full 32-bit long word, the word-length
* test sets the condition codes incorrectly in this case. To
* branch on the contents of D0, use your own TST.L instruction
* on return from the trap to test the full 32 bits of the register.
*/
uint32_t hh = cpuGetAReg(0); uint32_t hh = cpuGetAReg(0);
Log("%08x GetHandleSize(%08x)\n", trap, hh); Log("%04x GetHandleSize(%08x)\n", trap, hh);
if (hh == 0) return SetMemError(MacOS::nilHandleErr); // ????
auto iter = HandleMap.find(hh); auto iter = HandleMap.find(hh);