diff options
| -rw-r--r-- | lib/alu.c | 4 | ||||
| -rw-r--r-- | lib/simulator.c | 12 | ||||
| -rw-r--r-- | po/ProjetArchi.pot | 4 | ||||
| -rw-r--r-- | po/cat-id-tbl.c | 61 |
4 files changed, 54 insertions, 27 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); diff --git a/po/ProjetArchi.pot b/po/ProjetArchi.pot index 7f819b3..ba11529 100644 --- a/po/ProjetArchi.pot +++ b/po/ProjetArchi.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-04-16 18:42+0200\n" +"POT-Creation-Date: 2001-04-16 19:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -530,7 +530,7 @@ msgid "Adresse: Unmatched Addr Field" msgstr "" #. arg2 = imm32 -#: lib/simulator.c:222 +#: lib/simulator.c:224 msgid "MOV: Memory to Memory Forbidden On This Type Of Processor" msgstr "" diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index b5cafca..0fb6905 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -110,34 +110,61 @@ Statistics: %i words of text, %i words of data, and %i words reserved.\n\ {"ResetBit: Incorrect Value", 98}, {"SetBit: Incorrect Value", 99}, {"ValeurBit: Incorrect Value", 100}, - {"Adresse: Unmatched Addr Field", 101}, - {"FPU not implemented", 102}, - {"Invalid Memory Adress", 103}, - {"Invalid Register Descriptor", 104}, + {"ValeurIbitsAuDeb: position not in interval", 101}, + {"InverseIbit: position not in interval", 102}, + {"FPU not implemented", 103}, + {"Invalid Memory Adress", 104}, + {"Invalid Register Descriptor", 105}, + {"premature end of file", 106}, + {"Processing file %s", 107}, + {"Bad signature", 108}, + {"Startpoint already defined.", 109}, + {"Reading symbols", 110}, + {"Reading text and data segments", 111}, + {"Symbol %s not found", 112}, + {"Internal error", 113}, + {"No startpoint defined.", 114}, + {"Writing headers", 115}, + {"Writing relocating informations", 116}, + {"Writing text segments", 117}, + {"Writing data segments", 118}, + {"Statistics: %i words of text, %i words of data and reserving %i words\n", 119}, + {"Output file size: %i words containing %i relocating offsets.\n", 120}, + {"Adresse: Call With Invalid r/m Field State ( r/m=00 )", 121}, + {"Adresse: Unmatched Addr Field", 122}, + {"MOV: Memory to Memory Forbidden On This Type Of Processor", 123}, + {"DecodeExec: Invalid Opcode", 124}, {"\ Assembler v1.0\n\ -\n", 105}, - {"Usage: compilo program.asm objet.out\n", 106}, - {" o Initialising the meta engine... ", 107}, +\n", 125}, + {"Usage: compilo program.asm objet.out\n", 126}, + {" o Initialising the meta engine... ", 127}, {"\ Done!\n\ - o Meta language loading... ", 108}, - {"Meta language loading failed.", 109}, + o Meta language loading... ", 128}, + {"Meta language loading failed.", 129}, {"\ Done!\n\ - o Initialising the assembler core...", 110}, - {"Assembler core init failed.", 111}, - {" Done!\n", 112}, - {"Signal received: segfault", 113}, + o Initialising the assembler core...", 130}, + {"Assembler core init failed.", 131}, + {" Done!\n", 132}, + {"Signal received: segfault", 133}, {"\ \n\ Performing initialisation...\n\ -\n", 114}, +\n", 134}, {"\ \n\ Performing shutdown...\n\ -\n", 115}, - {"Exitting, bye!\n", 116}, +\n", 135}, + {"Exitting, bye!\n", 136}, + {"\ +Linker v1.0\n\ +\n", 137}, + {"Usage: linker obj1 [obj2 [obj3 [...]]] binary\n", 138}, + {" o Initialising the linker... ", 139}, + {"Linking files...\n", 140}, + {"Generating output file...\n", 141}, }; -int _msg_tbl_length = 116; +int _msg_tbl_length = 141; |