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

it works! Added tracing.

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-02-06 20:36:56 -05:00
parent 2af8f22406
commit 54f10c88e5
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
bin/loader.cpp
View File

@ -11,10 +11,11 @@
#include <cpu/defs.h> #include <cpu/defs.h>
#include <cpu/CpuModule.h> #include <cpu/CpuModule.h>
#include <cpu/fmem.h>
uint8_t *Memory; uint8_t *Memory;
uint32_t HighWater = 0x1000; uint32_t HighWater = 0x1000;
uint32_t MemorySize; uint32_t MemorySize = 0;
uint32_t EmulatedNewPtr(uint32_t size) uint32_t EmulatedNewPtr(uint32_t size)
{ {
@ -105,7 +106,7 @@ struct MPWArgs
*/ */
uint32_t load(const char *file) bool load(const char *file)
{ {
ResFileRefNum refNum; ResFileRefNum refNum;
@ -191,6 +192,7 @@ uint32_t load(const char *file)
// now link the segment 0 jump table... // now link the segment 0 jump table...
assert(a5); assert(a5);
bool first = true;
for (; jtStart < jtEnd; jtStart += 8) for (; jtStart < jtEnd; jtStart += 8)
{ {
uint16_t offset = ReadWord(Memory, jtStart); uint16_t offset = ReadWord(Memory, jtStart);
@ -211,10 +213,18 @@ uint32_t load(const char *file)
// JMP absolute long // JMP absolute long
WriteWord(Memory, jtStart + 2, 0x4EF9); WriteWord(Memory, jtStart + 2, 0x4EF9);
WriteLong(Memory, jtStart + 4, address); WriteLong(Memory, jtStart + 4, address);
if (first)
{
cpuSetPC(address);
first = false;
}
} }
// set pc to jump table entry 0. // set pc to jump table entry 0.
return a5; return true;
} }
void InitializeMPW(int argc, char **argv) void InitializeMPW(int argc, char **argv)
@ -332,18 +342,24 @@ struct {
uint32_t ram; uint32_t ram;
uint32_t stack; uint32_t stack;
uint32_t machine; uint32_t machine;
bool traceCPU;
} Flags = { 16 * 1024 * 1024, 8 * 1024, 68030 }; } Flags = { 16 * 1024 * 1024, 8 * 1024, 68030, false };
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
// getopt... // getopt...
enum
{
kTraceCPU = 1,
};
static struct option LongOpts[] = static struct option LongOpts[] =
{ {
{ "ram",required_argument, NULL, 'r' }, { "ram",required_argument, NULL, 'r' },
{ "stack", required_argument, NULL, 's' }, { "stack", required_argument, NULL, 's' },
{ "machine", required_argument, NULL, 'm' }, { "machine", required_argument, NULL, 'm' },
{ "trace-cpu", no_argument, NULL, kTraceCPU },
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' }, { "version", no_argument, NULL, 'V' },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
@ -354,6 +370,9 @@ int main(int argc, char **argv)
{ {
switch(c) switch(c)
{ {
case kTraceCPU:
Flags.traceCPU = true;
break;
case 'm': case 'm':
if (!parse_number(optarg, &Flags.machine)) if (!parse_number(optarg, &Flags.machine))
@ -399,6 +418,7 @@ int main(int argc, char **argv)
} }
Memory = new uint8_t[Flags.ram]; Memory = new uint8_t[Flags.ram];
MemorySize = Flags.ram;
cpuStartup(); cpuStartup();
cpuSetModel(3,0); cpuSetModel(3,0);
@ -431,11 +451,27 @@ int main(int argc, char **argv)
WriteLong(Memory, address + Flags.stack - 4, 0xffffffff); WriteLong(Memory, address + Flags.stack - 4, 0xffffffff);
} }
/* memorySetMemory(Memory, MemorySize);
for (unsigned i = 0; i < 10; ++i) for (unsigned i = 0; i < 10; ++i)
{ {
if (Flags.traceCPU)
{
static char strings[4][256];
for (unsigned j = 0; j < 4; ++j) strings[j][0] = 0;
uint32_t pc = cpuGetPC();
// todo - check for Axxx, recognize as a toolcall.
// move this to the cpuLogging facility?
cpuDisOpcode(pc, strings[0], strings[1], strings[2], strings[3]);
// address, data, instruction, operand
fprintf(stderr, "%s %-10s %-40s ; %s\n", strings[0], strings[2], strings[3], strings[1]);
// todo -- trace registers (only print changed registers?)
}
cpuExecuteInstruction(); cpuExecuteInstruction();
} }
*/
exit(0); // cpuGetDReg(0)
} }