Skip to content

Commit 4f1d2f0

Browse files
committed
Merged back from Moira repo
1 parent 5740f50 commit 4f1d2f0

File tree

6 files changed

+369
-975
lines changed

6 files changed

+369
-975
lines changed

Emulator/VAmiga/Components/CPU/CPU.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@ Moira::willExecute(M68kException exc, u16 vector)
174174
switch (exc) {
175175
176176
case RESET: xfiles("RESET\n"); break;
177-
case EXC_BUS_ERROR: xfiles("EXC_BUS_ERROR\n"); break;
177+
case EXC_BUS_ERROR: xfiles("EXC_BUS_ERROR\n"); break;
178178
case ADDRESS_ERROR: xfiles("ADDRESS_ERROR\n"); break;
179179
case ILLEGAL: xfiles("ILLEGAL\n"); break;
180180
case DIVIDE_BY_ZERO: xfiles("DIVIDE_BY_ZERO\n"); break;
181181
case CHK: xfiles("CHK\n"); break;
182182
case TRAPV: xfiles("TRAPV\n"); break;
183-
case EXC_PRIVILEGE: xfiles("EXC_PRIVILEGE\n"); break;
183+
case EXC_PRIVILEGE: xfiles("EXC_PRIVILEGE\n"); break;
184184
case TRACE: xfiles("TRACE\n"); break;
185185
case LINEA: xfiles("LINEA\n"); break;
186186
case LINEF: xfiles("LINEF\n"); break;

Emulator/VAmiga/Components/CPU/Moira/Moira.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,18 @@ Moira::execute()
358358
assert(reg.pc0 == reg.pc);
359359
}
360360

361+
void
362+
Moira::execute(i64 cycles)
363+
{
364+
executeUntil(clock + cycles);
365+
}
366+
367+
void
368+
Moira::executeUntil(i64 cycle)
369+
{
370+
while (clock < cycle) { execute(); }
371+
}
372+
361373
void
362374
Moira::processException(const std::exception &exc)
363375
{

0 commit comments

Comments
 (0)