Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2025-01-09 13:30:34 +00:00
Code Issues Projects Releases Wiki Activity

display trap name for GetToolTrap, etc.

Browse Source
This commit is contained in:
Kelvin Sherlock 2014-12-05 14:32:18 -05:00
parent fed6e9b172
commit fc7df738cc
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toolbox/os.cpp
View File

@ -47,6 +47,7 @@
#include <macos/sysequ.h> #include <macos/sysequ.h>
#include <macos/errors.h> #include <macos/errors.h>
#include <macos/traps.h>
#include "os.h" #include "os.h"
#include "os_internal.h" #include "os_internal.h"
@ -1130,7 +1131,10 @@ namespace OS
* *
*/ */
uint16_t trapNumber = cpuGetDReg(0); uint16_t trapNumber = cpuGetDReg(0);
Log("%04x GetToolTrapAddress($%04x)\n", trap, trapNumber); const char *trapName = TrapName(trapNumber | 0xa800);
if (!trapName) trapName = "Unknown";
Log("%04x GetToolTrapAddress($%04x %s)\n", trap, trapNumber, trapName);
cpuSetAReg(0, 0); cpuSetAReg(0, 0);
return MacOS::dsCoreErr; return MacOS::dsCoreErr;
@ -1154,9 +1158,11 @@ namespace OS
uint16_t trapNumber = cpuGetDReg(0); uint16_t trapNumber = cpuGetDReg(0);
uint32_t trapAddress = cpuGetAReg(0); uint32_t trapAddress = cpuGetAReg(0);
const char *trapName = TrapName(trapNumber | 0xa800);
if (!trapName) trapName = "Unknown";
Log("%04x SetToolTrapAddress($%08x, $%04x)\n", Log("%04x SetToolTrapAddress($%08x, $%04x %s)\n",
trap, trapAddress, trapNumber); trap, trapAddress, trapNumber, trapName);
return MacOS::dsCoreErr; return MacOS::dsCoreErr;
@ -1173,7 +1179,10 @@ namespace OS
* *
*/ */
uint16_t trapNumber = cpuGetDReg(0); uint16_t trapNumber = cpuGetDReg(0);
Log("%04x GetOSTrapAddress($%04x)\n", trap, trapNumber); const char *trapName = TrapName(trapNumber | 0xa000);
if (!trapName) trapName = "Unknown";
Log("%04x GetOSTrapAddress($%04x %s)\n", trap, trapNumber, trapName);
cpuSetAReg(0, 0); cpuSetAReg(0, 0);
return MacOS::dsCoreErr; return MacOS::dsCoreErr;