6502
/
emu816
mirror of https://github.com/andrew-jacobs/emu816.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/andrew-jacobs/emu816 

# Conflicts:
#	program.cc

Fixed issues with timing code added for Linux.
This commit is contained in:
andrew-jacobs 2016-10-22 23:59:13 +01:00
parent 6638462e10 b68abaaa3c
commit d7ffb289bb
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
program.cc
View File

@ -9,7 +9,7 @@
//
// A Portable C++ WDC 65C816 Emulator
//------------------------------------------------------------------------------
// Copyright (C)2016 Andrew John Jacobs
// Copyright (C),2016 Andrew John Jacobs
// All rights reserved.
//
// This work is made available under the terms of the Creative Commons
@ -27,9 +27,12 @@ using namespace std;
#include <string.h>
#ifdef WIN32
#include "Windows.h"
#else
#include <time.h>
#endif
#include "mem816.h"
#include "emu816.h"
//==============================================================================
@ -149,18 +152,31 @@ int main(int argc, char **argv)
return (1);
}
#ifdef WIN32
LARGE_INTEGER freq, start, end;
QueryPerformanceFrequency(&freq);
QueryPerformanceCounter(&start);
#else
timespec start, end;
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &start);
#endif
emu816::reset(trace);
while (!emu816::isStopped ())
loop();
#ifdef LINUX
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &end);
double secs = (end.tv_sec + end.tv_nsec / 1000000000.0)
- (start.tv_sec + start.tv_nsec / 1000000000.0);
#else
QueryPerformanceCounter(&end);
double secs = (end.QuadPart - start.QuadPart) / (double) freq.QuadPart;
#endif
double speed = emu816::getCycles() / secs;
@ -176,6 +192,5 @@ int main(int argc, char **argv)
}
cout << endl;
system("pause");
return(0);
}
}