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

change debugging to test speed

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-05-12 22:14:49 -04:00
parent e1a3269cea
commit e920ee230e
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/loader.cpp
View File

@ -4,6 +4,8 @@
#include <cstring> #include <cstring>
#include <string> #include <string>
#include <vector> #include <vector>
#include <chrono>
#include <sysexits.h> #include <sysexits.h>
#include <getopt.h> #include <getopt.h>
#include <libgen.h> #include <libgen.h>
@ -761,6 +763,8 @@ int main(int argc, char **argv)
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
//auto start_time = std::chrono::high_resolution_clock::now();
int c; int c;
while ((c = getopt_long(argc, argv, "+hVm:r:s:", LongOpts, NULL)) != -1) while ((c = getopt_long(argc, argv, "+hVm:r:s:", LongOpts, NULL)) != -1)
{ {
@ -921,13 +925,21 @@ int main(int argc, char **argv)
if (Flags.traceCPU || Flags.traceMacsbug) if (Flags.traceCPU || Flags.traceMacsbug)
{ {
#ifdef CPU_INSTRUCTION_LOGGING
cpuSetInstructionLoggingFunc(InstructionLogger); cpuSetInstructionLoggingFunc(InstructionLogger);
#endif
// else do it manually below.
} }
cpuInitializeFromNewPC(address); cpuInitializeFromNewPC(address);
#if 0
auto begin_emu_time = std::chrono::high_resolution_clock::now();
fprintf(stderr, "Begin Emulation Time: %20lld\n", (begin_emu_time - start_time).count());
#endif
uint64_t cycles = 0;
for (;;) for (;;)
{ {
uint32_t pc = cpuGetPC(); uint32_t pc = cpuGetPC();
@ -954,9 +966,15 @@ int main(int argc, char **argv)
if (cpuGetStop()) break; // will this also be set by an interrupt? if (cpuGetStop()) break; // will this also be set by an interrupt?
cpuExecuteInstruction(); cycles += cpuExecuteInstruction();
} }
#if 0
auto end_emu_time = std::chrono::high_resolution_clock::now();
fprintf(stderr, " End Emulation Time: %20lld\n", (end_emu_time - start_time).count());
fprintf(stderr, " Cycles: %20lld\n", cycles);
#endif
if (Flags.memoryStats) if (Flags.memoryStats)
{ {
MM::Native::PrintMemoryStats(); MM::Native::PrintMemoryStats();
@ -965,5 +983,7 @@ int main(int argc, char **argv)
uint32_t rv = MPW::ExitStatus(); uint32_t rv = MPW::ExitStatus();
if (rv > 0xff) rv = 0xff; if (rv > 0xff) rv = 0xff;
exit(rv); exit(rv);
} }

2
cpu/CpuModule.h
View File

@ -12,7 +12,7 @@ extern void cpuSetFLineExceptionFunc(cpuLineExceptionFunc func);
// This header file defines the internal interfaces of the CPU module. // This header file defines the internal interfaces of the CPU module.
#define CPU_INSTRUCTION_LOGGING //#define CPU_INSTRUCTION_LOGGING
// Function to check if there are any external interrupt sources wanting to issue interrupts // Function to check if there are any external interrupt sources wanting to issue interrupts
typedef BOOLE (*cpuCheckPendingInterruptsFunc)(void); typedef BOOLE (*cpuCheckPendingInterruptsFunc)(void);