diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..beb84ac --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# OS generated files +.DS_Store diff --git a/Z80.CPU/default b/Z80.CPU/default index 9f8e9b6..472de5a 120000 --- a/Z80.CPU/default +++ b/Z80.CPU/default @@ -1 +1 @@ -1.0 \ No newline at end of file +v1.0 \ No newline at end of file diff --git a/Z80.CPU/1.0/API/C/modules/emulation/CPU/Z80.h b/Z80.CPU/v1.0/API/C/modules/emulation/CPU/Z80.h similarity index 100% rename from Z80.CPU/1.0/API/C/modules/emulation/CPU/Z80.h rename to Z80.CPU/v1.0/API/C/modules/emulation/CPU/Z80.h diff --git a/Z80.CPU/1.0/sources/Z80.c b/Z80.CPU/v1.0/sources/Z80.c similarity index 99% rename from Z80.CPU/1.0/sources/Z80.c rename to Z80.CPU/v1.0/sources/Z80.c index 0974ccc..ef02a49 100644 --- a/Z80.CPU/1.0/sources/Z80.c +++ b/Z80.CPU/v1.0/sources/Z80.c @@ -1405,14 +1405,14 @@ EXPORTED(qsize, run)(Z80 *object, qsize cycles) '--------------------------------------*/ if (NMI) { - EXIT_HALT; /* Resume CPU if halted. */ - R++; /* Consume memory refresh. */ - NMI = FALSE; /* Clear the NMI pulse. */ - /*IFF2 = IFF1;*/ /* Backup IFF1 (it doesn't occur, acording to Sean Young. */ - IFF1 = 0; /* Reset IFF1 to don't bother the NMI routine. */ - PUSH(PC); /* Save return addres in the stack. */ - PC = Q_Z80_ADDRESS_NMI_POINTER; /* Make PC point to the NMI routine. */ - TICKS += 11; /* Accepting a NMI consumes 11 ticks. */ + EXIT_HALT; /* Resume CPU if halted. */ + R++; /* Consume memory refresh. */ + NMI = FALSE; /* Clear the NMI pulse. */ + /*IFF2 = IFF1;*/ /* Backup IFF1 (it doesn't occur, acording to Sean Young). */ + IFF1 = 0; /* Reset IFF1 to don't bother the NMI routine. */ + PUSH(PC); /* Save return addres in the stack. */ + PC = Q_Z80_ADDRESS_NMI_POINTER; /* Make PC point to the NMI routine. */ + TICKS += 11; /* Accepting a NMI consumes 11 ticks. */ continue; } @@ -1425,9 +1425,9 @@ EXPORTED(qsize, run)(Z80 *object, qsize cycles) R++; /* Consume memory refresh. */ IFF1 = IFF2 = 0; /* Clear interrupt flip-flops. */ - #ifdef Z80_AUTOCLEARS_INT_LINE +# ifdef Z80_AUTOCLEARS_INT_LINE INT = FALSE; - #endif +# endif /*if (DAISY) pointer = object->daisy.call_requester_device(); else;*/