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

update dispatch code...

Browse Source
This commit is contained in:
Kelvin Sherlock 2015-01-18 15:20:38 -05:00
parent c7c548e5ac
commit 2e9ab5200c
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/loader.cpp
View File

@ -891,6 +891,7 @@ int main(int argc, char **argv)
MM::Init(Memory, MemorySize, kGlobalSize, Flags.stackSize); MM::Init(Memory, MemorySize, kGlobalSize, Flags.stackSize);
OS::Init(); OS::Init();
ToolBox::Init();
MPW::Init(argc, argv, defines); MPW::Init(argc, argv, defines);

31
toolbox/dispatch.cpp
View File

@ -60,6 +60,9 @@ namespace {
uint32_t trap_address[1024]; uint32_t trap_address[1024];
uint32_t os_address[256]; uint32_t os_address[256];
uint32_t ToolGlue;
uint32_t OSGlue;
inline constexpr bool is_tool_trap(uint16_t trap) inline constexpr bool is_tool_trap(uint16_t trap)
{ {
@ -125,9 +128,8 @@ namespace OS {
return 0; return 0;
} }
// todo -- return stub address. cpuSetAReg(0, ToolGlue + trapNumber * 4);
cpuSetAReg(0, 0); return 0; //MacOS::dsCoreErr;
return MacOS::dsCoreErr;
} }
uint16_t SetToolTrapAddress(uint16_t trap) uint16_t SetToolTrapAddress(uint16_t trap)
@ -185,8 +187,8 @@ namespace OS {
return 0; return 0;
} }
cpuSetAReg(0, 0); cpuSetAReg(0, OSGlue + trapNumber * 4);
return MacOS::dsCoreErr; return 0; // MacOS::dsCoreErr;
} }
uint16_t OSDispatch(uint16_t trap) uint16_t OSDispatch(uint16_t trap)
@ -235,10 +237,12 @@ namespace ToolBox {
std::fill(std::begin(trap_address), std::end(trap_address), 0); std::fill(std::begin(trap_address), std::end(trap_address), 0);
std::fill(std::begin(os_address), std::end(os_address), 0); std::fill(std::begin(os_address), std::end(os_address), 0);
#if 0
// alternate entry code // alternate entry code
ToolGlue = MM::Native::NewPtr(1024 * 4 + 256 * 4 + ..., false, ToolGlue); MM::Native::NewPtr(1024 * 4 + 256 * 4, false, ToolGlue);
uint16_t *code = (uint16_t *)Memory + ToolGlue; OSGlue = ToolGlue + 1024 * 4;
uint16_t *code = (uint16_t *)memoryPointer(ToolGlue);
for (unsigned i = 0; i < 1024; ++i) { for (unsigned i = 0; i < 1024; ++i) {
*code++ = 0xafff; *code++ = 0xafff;
@ -249,14 +253,20 @@ namespace ToolBox {
*code++ = 0xafff; *code++ = 0xafff;
*code++ = 0xa000 | i; *code++ = 0xa000 | i;
} }
// os return code...
#endif // os return code... pull registers, TST.W d0, etc.
return true; return true;
} }
void native_dispatch(uint16_t trap); void native_dispatch(uint16_t trap);
void dispatch(uint16_t trap) void dispatch(uint16_t trap)
{ {
return native_dispatch(trap);
// hold off on actually _calling_ for now...
#if 0
uint32_t returnPC = 0; uint32_t returnPC = 0;
bool saveA0 = false; bool saveA0 = false;
@ -410,6 +420,7 @@ namespace ToolBox {
if (saveA0) cpuSetAReg(0, a0); if (saveA0) cpuSetAReg(0, a0);
if (returnPC) cpuInitializeFromNewPC(returnPC); if (returnPC) cpuInitializeFromNewPC(returnPC);
#endif
} }
void native_dispatch(uint16_t trap) void native_dispatch(uint16_t trap)

1
toolbox/toolbox.h
View File

@ -22,6 +22,7 @@ namespace ToolBox
} }
bool Init();
void dispatch(uint16_t trap); void dispatch(uint16_t trap);