diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/alu.c | 4 | ||||
| -rw-r--r-- | lib/simulator.c | 12 |
2 files changed, 8 insertions, 8 deletions
@@ -746,9 +746,9 @@ Uint32 DivisionSigne(Uint32 a, Uint32 b) Uint32 AND(Uint32 a, Uint32 b) { if (Rapide) { - return RANDSigne(a, b); + return RAND(a, b); } else { - return NANDSigne(a, b); + return NAND(a, b); } } diff --git a/lib/simulator.c b/lib/simulator.c index 5ce27b7..7dde434 100644 --- a/lib/simulator.c +++ b/lib/simulator.c @@ -22,7 +22,7 @@ */ -int HasToRun = 1, Reset; +int HasToRun = 1, HasToReset; Uint32 LireInstruction(void) { @@ -62,9 +62,9 @@ Uint32 Adresse(Uint32 u, Uint32 instruction) void Initialisation(void) { int i; -/* + for (i = 0; i < TAILLE_MEMOIRE; i++) - Reset(&memoire_principale[i]); */ + Reset(&memoire_principale[i]); EcrireRegistreSP(ADD_SP); } @@ -336,7 +336,7 @@ void DecodeExec(Uint32 instruction, Uint32 entrypoint) if (ValeurBit(Extension(instruction), 0)) { HasToRun = 0; /* Halt */ } else { - Reset = 1; /* Reset */ + HasToReset = 1; /* Reset */ ResetRegistres(); } break; @@ -352,8 +352,8 @@ void Traitement(Uint32 entrypoint) while (HasToRun) { EcrireRegistrePC(entrypoint); HasToRun = 1; - Reset = 0; - while ((HasToRun) && (!Reset)) { + HasToReset = 0; + while ((HasToRun) && (!HasToReset)) { instruction = LireInstruction(); IncrementeCompteurOrdinal(); DecodeExec(instruction, entrypoint); |