fixed ticks to delay timer conversion

Interpreter.cpp

@@ -71,7 +71,7 @@ void Interpreter::tick() {
 
   // fetch instruction
   sreg_t iInstAddr = mvSpecialReg[SR_PC];
-  unsigned inst = (mvMemory[iInstAddr] << 8) | mvMemory[iInstAddr + 1];
+  unsigned inst = (mvMemory.at(iInstAddr) << 8) | mvMemory.at(iInstAddr + 1);
 
   // increment program counter
   mvSpecialReg[SR_PC] += 2;
@@ -145,16 +145,16 @@ void Interpreter::tick() {
   case 0xF000: // several unique instructions
     switch(inst & 0xF0FF) {
     case 0xF007: // FX07 - read timer register
-      mvReg[iRegDst] = (mvSpecialReg[SR_T1] + mcTicksPerSecond - 1) / mcTicksPerSecond;
+      mvReg[iRegDst] = (mvSpecialReg[SR_T1] * scTimerFreq + (mcTicksPerSecond - 1)) / mcTicksPerSecond;
       break;
     case 0xF015: // FX15 - set timer register
-      mvSpecialReg[SR_T1] = mcTicksPerSecond * mvReg[iRegDst];
+      mvSpecialReg[SR_T1] = (mcTicksPerSecond * mvReg[iRegDst]) / scTimerFreq;
       break;
     case 0xF018: // FX18 - set sound timer register
-      if(mvSpecialReg[SR_T1] == 0 && mvReg[iRegDst] != 0) {
+      if(mvSpecialReg[SR_T2] == 0 && mvReg[iRegDst] != 0) {
         mrBuzzer.on();
       }
-      mvSpecialReg[SR_T1] = mcTicksPerSecond * mvReg[iRegDst];
+      mvSpecialReg[SR_T2] = (mcTicksPerSecond * mvReg[iRegDst]) / scTimerFreq;
       break;
     case 0xF01E: // FX1E - add to I
       mvSpecialReg[SR_I] += mvReg[iRegDst];
@@ -163,18 +163,18 @@ void Interpreter::tick() {
       mvSpecialReg[SR_I] = scLowRestFontAddr + 5 * mvReg[iRegDst];
       break;
     case 0xF033: // FX33 - convert to bcd
-      mvMemory[mvSpecialReg[SR_I]]     = (mvReg[iRegDst] / 100) % 10;
+      mvMemory.at(mvSpecialReg[SR_I])     = (mvReg[iRegDst] / 100) % 10;
-      mvMemory[mvSpecialReg[SR_I] + 1] = (mvReg[iRegDst] / 10) % 10; 
+      mvMemory.at(mvSpecialReg[SR_I] + 1) = (mvReg[iRegDst] / 10) % 10;
-      mvMemory[mvSpecialReg[SR_I] + 2] = mvReg[iRegDst] % 10; 
+      mvMemory.at(mvSpecialReg[SR_I] + 2) = mvReg[iRegDst] % 10;
       break;
     case 0xF055: // FX55 - dump registers
       for(int i = 0; i <= iRegDst - R_V0; i++) {
-        mvMemory[mvSpecialReg[SR_I]++] = mvReg[R_V0 + i];
+        mvMemory.at(mvSpecialReg[SR_I]++) = mvReg[R_V0 + i];
       }
       break;
     case 0xF065: // FX65 - restore registers
       for(int i = 0; i <= iRegDst - R_V0; i++) {
-        mvReg[R_V0 + i] = mvMemory[mvSpecialReg[SR_I]++];
+        mvReg[R_V0 + i] = mvMemory.at(mvSpecialReg[SR_I]++);
       }
       break;
     default:
@@ -272,14 +272,14 @@ void Interpreter::executeDraw(uint8_t x, uint8_t y, uint8_t n) {
     uint16_t spriteRowBits;
     if(mIsHighResMode) {
       // draws an 8xN sprite
-      spriteRowBits = mvMemory[iMemAddr++] << 8;
+      spriteRowBits = mvMemory.at(iMemAddr++) << 8;
       if(n == 0) {
         // draws an 16xN sprite, so fetch another byte from sprite data
-        spriteRowBits |= mvMemory[iMemAddr++];
+        spriteRowBits |= mvMemory.at(iMemAddr++);
       }
     } else {
       // in low-res mode, each sprite pixel draws two on-screen pixels
-      spriteRowBits = gcvLowResToHighResRowLookupTable[mvMemory[iMemAddr++]];
+      spriteRowBits = gcvLowResToHighResRowLookupTable[mvMemory.at(iMemAddr++)];
     }
 
     // convert to bitset and shift into absolute horizontal position on the screen

Interpreter.hpp

@@ -16,6 +16,7 @@ private:
 public:
   constexpr static sreg_t scLowRestFontAddr = 0x0000;
   constexpr static sreg_t scResetVector = 0x0200;
+  constexpr static sreg_t scTimerFreq = 60;
   constexpr static size_t scMemorySize = 4096;
 
   enum {