Skip to content

Commit

Permalink
Merge pull request #119 from stefanberndtsson/temp-cycle-align-fix
Browse files Browse the repository at this point in the history
Revert 2c wait in cpu_step_cycle until prefetch is handled the correct way
  • Loading branch information
larsbrinkhoff committed Apr 4, 2016
2 parents 01fd775 + adb58fc commit 5aa12aa
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1159,8 +1159,13 @@ static int cpu_step_cycle(int cpu_run_state)

/* A new instruction will only start on multiple of 2 cycles, so if
* that is not the case, exit and let it increment up to the proper point
*
* Until all instructions handle their own prefetch (of the next instruction)
* completely as a state of its own, this needs to do 4c align, so while
* this is a temporary revert, it is necessary until prefetch is done
* the right way.
*/
if((cpu->cycle&1) != 0) {
if((cpu->cycle&3) != 0) {
return CPU_OK;
}

Expand Down

0 comments on commit 5aa12aa

Please sign in to comment.