Merge pull request #10 from clehner/stuff

Implement a few traps
This commit is contained in:
ksherlock 2014-08-03 11:22:37 -04:00
commit 28d8900f3f
8 changed files with 151 additions and 20 deletions

View File

@ -15,6 +15,7 @@ set(TOOLBOX_SRC
os_highlevel.cpp
os_alias.cpp
os_fileinfo.cpp
os_gestalt.cpp
qd.cpp
sane.cpp
saneparser.cpp

View File

@ -1455,4 +1455,18 @@ namespace MM
return 0;
}
}
uint16_t MaxApplZone(uint16_t trap)
{
// PROCEDURE MaxApplZone;
/*
* on exit:
* D0 Result code
*/
Log("%04x MaxApplZone\n", trap);
return 0;
}
}

View File

@ -81,6 +81,8 @@ namespace MM
uint16_t HandleZone(uint16_t trap);
uint16_t GetZone(uint16_t trap);
uint16_t SetZone(uint16_t trap);
uint16_t MaxApplZone(uint16_t trap);
}

View File

@ -90,6 +90,9 @@ namespace OS
uint16_t ResolveAliasFile();
uint16_t AliasDispatch(uint16_t trap);
#pragma mark - Gestalt Manager
uint16_t Gestalt(uint16_t trap);
}
#endif

99
toolbox/os_gestalt.cpp Normal file
View File

@ -0,0 +1,99 @@
/*
* Copyright (c) 2014, Charles Lehner
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include <cerrno>
#include <cctype>
#include <ctime>
#include <algorithm>
#include <chrono>
#include <deque>
#include <string>
#include <map>
#include <sys/xattr.h>
#include <sys/stat.h>
#include <sys/paths.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <strings.h>
#include <cpu/defs.h>
#include <cpu/CpuModule.h>
#include <cpu/fmem.h>
#include "os.h"
#include "os_internal.h"
#include "toolbox.h"
#include "stackframe.h"
using ToolBox::Log;
namespace OS {
enum
{
gestaltUndefSelectorErr = -5551,
gestaltUnknownErr = -5550,
gestaltDupSelectorErr = -5552,
gestaltLocationErr = -5553,
};
std::map<uint32_t, uint32_t> GestaltMap = {
{'alis', 1}, // Alias Manager
};
uint16_t Gestalt(uint16_t trap)
{
// FUNCTION Gestalt (selector: OSType; VAR response: LongInt): OSErr;
/*
* on entry:
* D0 Selector code
*
* on exit:
* A0 Response
* D0 Result code
*
*/
uint32_t selector = cpuGetDReg(0);
uint32_t response;
Log("%04x Gestalt('%s')\n", trap, ToolBox::TypeToString(selector).c_str());
auto iter = GestaltMap.find(selector);
if (iter == GestaltMap.end()) return gestaltUndefSelectorErr;
response = iter->second;
cpuSetAReg(0, response);
return 0;
}
}

View File

@ -49,6 +49,7 @@
using ToolBox::Log;
using namespace OS::Internal;
using namespace ToolBox;
namespace
{
@ -81,24 +82,6 @@ namespace
return error;
}
std::string TypeToString(uint32_t type)
{
char tmp[5] = { 0, 0, 0, 0, 0};
for (unsigned i = 0; i < 4; ++i)
{
char c = type & 0xff;
type >>= 8;
c = isprint(c) ? c : '.';
tmp[3 - i] = c;
}
return std::string(tmp);
}
bool LoadResType(uint32_t type)
{
// this filtering was originally to

View File

@ -41,6 +41,7 @@
#include "sane.h"
#include "utility.h"
#include "loader.h"
#include "macos/traps.h"
// yuck. TST.W d0
extern "C" void cpuSetFlagsNZ00NewW(UWO res);
@ -160,6 +161,9 @@ namespace ToolBox {
d0 = OS::AliasDispatch(trap);
break;
case 0xA1AD:
d0 = OS::Gestalt(trap);
break;
// SetPtrSize (p: Ptr; newSize: Size);
case 0xa020:
@ -254,6 +258,11 @@ namespace ToolBox {
d0 = MM::HandleZone(trap);
break;
// MaxApplZone
case 0xa063:
d0 = MM::MaxApplZone(trap);
break;
// ReadDateTime (VAR sees: LONGINT) : OSErr;
case 0xa039:
d0 = OS::ReadDateTime(trap);
@ -505,7 +514,8 @@ namespace ToolBox {
break;
default:
fprintf(stderr, "Unsupported tool trap: %04x\n", trap);
fprintf(stderr, "Unsupported tool trap: %04x (%s)\n",
trap, TrapName(trap));
fprintf(stderr, "pc: %08x\n", cpuGetPC());
exit(255);
}
@ -579,6 +589,23 @@ namespace ToolBox {
return true;
}
std::string TypeToString(uint32_t type)
{
char tmp[5] = { 0, 0, 0, 0, 0};
for (unsigned i = 0; i < 4; ++i)
{
char c = type & 0xff;
type >>= 8;
c = isprint(c) ? c : '.';
tmp[3 - i] = c;
}
return std::string(tmp);
}
/*
* MacOS basically does the absolute/relative paths backwards vs unix.
*

View File

@ -32,6 +32,8 @@ namespace ToolBox
bool WritePString(uint32_t address, const std::string &s);
std::string TypeToString(uint32_t type);
std::string UnixToMac(std::string path);
std::string MacToUnix(std::string path);