summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/archi.tex2
-rw-r--r--po/ProjetArchi.pot237
-rw-r--r--po/fr.po298
-rw-r--r--samples/Makefile.am2
6 files changed, 306 insertions, 237 deletions
diff --git a/AUTHORS b/AUTHORS
index 2594f82..195ff09 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,4 +2,4 @@ Nicolas "Pixel" Noble <Pixel@nobis-crew.org>
Alain "Biou" Vagner <biouman@netcourrier.com>
Yves "Hercule" Rangoni
Ralph "Meddly" Schweitzer
-Jordi "Sh00m" Barrère \ No newline at end of file
+Jordi "Sh00m" Barrère
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 08651de..77a1d5a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = registres.txt archi.tex bib.tex compilateur.tex conclusion.tex description.tex encodage.tex exemples.tex extensions.tex intro.tex manuel.tex probs.tex simulateur.tex Makefile.doc
+EXTRA_DIST = registres.txt archi.tex bib.tex compilateur.tex conclusion.tex description.tex encodage.tex exemples.tex extensions.tex intro.tex manuel.tex probs.tex simulateur.tex Makefile.doc Compilo.fig Compilo.eps outils.tex
#all: archi.ps
diff --git a/doc/archi.tex b/doc/archi.tex
index f522549..6756df9 100644
--- a/doc/archi.tex
+++ b/doc/archi.tex
@@ -70,6 +70,8 @@
\part{Synthèse}
\input{manuel}
\clearemptydoublepage
+\input{outils}
+\clearemptydoublepage
\input{probs}
\clearemptydoublepage
\input{exemples}
diff --git a/po/ProjetArchi.pot b/po/ProjetArchi.pot
index 4c6ebf5..88e2640 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-17 06:23+0200\n"
+"POT-Creation-Date: 2001-04-17 11:23+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"
@@ -14,370 +14,370 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: lib/assembler.c:181
+#: lib/assembler.c:179
msgid "You have to be into the .text or the .data segment to define a value."
msgstr ""
-#: lib/assembler.c:205
+#: lib/assembler.c:203
msgid "Label already defined"
msgstr ""
-#: lib/assembler.c:272
+#: lib/assembler.c:268
msgid "You can't have the startpoint elsewhere than the .text segment"
msgstr ""
-#: lib/assembler.c:428
+#: lib/assembler.c:422
msgid "Not a valid . directive"
msgstr ""
-#: lib/assembler.c:457
+#: lib/assembler.c:451
msgid "Not a valid # directive"
msgstr ""
#. Cas des directives .
-#: lib/assembler.c:465
+#: lib/assembler.c:459
msgid "Error: extra parameters to a . directive."
msgstr ""
-#: lib/assembler.c:582
+#: lib/assembler.c:576
msgid "Too much arguments to #undef"
msgstr ""
-#: lib/assembler.c:586
+#: lib/assembler.c:580
msgid "Defined symbol not found."
msgstr ""
-#: lib/assembler.c:592
+#: lib/assembler.c:586
msgid "Too much arguments to #include"
msgstr ""
-#: lib/assembler.c:594
+#: lib/assembler.c:588
#, c-format
msgid "Including file at line %i"
msgstr ""
-#: lib/assembler.c:597
+#: lib/assembler.c:591
msgid "Error reading include file"
msgstr ""
-#: lib/assembler.c:635 lib/assembler.c:641
+#: lib/assembler.c:629 lib/assembler.c:635
msgid "Zero divide."
msgstr ""
-#: lib/assembler.c:655 lib/assembler.c:662
+#: lib/assembler.c:649 lib/assembler.c:656
msgid "Error: unable to compute the immediate value"
msgstr ""
-#: lib/assembler.c:672
+#: lib/assembler.c:665
msgid "Function unknow"
msgstr ""
-#: lib/assembler.c:680
+#: lib/assembler.c:673
msgid "Addresses addition not allowed"
msgstr ""
-#: lib/assembler.c:684
+#: lib/assembler.c:677
msgid "You can only use the decal operator on labels"
msgstr ""
-#: lib/assembler.c:690 lib/assembler.c:694 lib/assembler.c:727
+#: lib/assembler.c:683 lib/assembler.c:687 lib/assembler.c:719
msgid "Address operation invalid"
msgstr ""
-#: lib/assembler.c:697 lib/assembler.c:731
+#: lib/assembler.c:690 lib/assembler.c:723
msgid "Addresses operations not allowed"
msgstr ""
-#: lib/assembler.c:701 lib/assembler.c:827 lib/assembler.c:871
-#: lib/assembler.c:952
+#: lib/assembler.c:693 lib/assembler.c:816 lib/assembler.c:853
+#: lib/assembler.c:925
msgid "Expression too complex or invalid"
msgstr ""
-#: lib/assembler.c:735 lib/assembler.c:748 lib/assembler.c:801
-#: lib/assembler.c:815 lib/assembler.c:858
+#: lib/assembler.c:727 lib/assembler.c:740 lib/assembler.c:793
+#: lib/assembler.c:805 lib/assembler.c:842
msgid "Address type not supported"
msgstr ""
-#: lib/assembler.c:819
+#: lib/assembler.c:809
msgid "Address addition not supported"
msgstr ""
-#: lib/assembler.c:863 lib/assembler.c:919
+#: lib/assembler.c:846 lib/assembler.c:898
msgid "Expression invalid"
msgstr ""
#. Bon si l'on est ici, c'est pas bon signe non plus...
-#: lib/assembler.c:999
+#: lib/assembler.c:969
msgid "Expression too complex"
msgstr ""
-#: lib/assembler.c:1065
+#: lib/assembler.c:1035
msgid "Something wrong, nested operator called..."
msgstr ""
-#: lib/assembler.c:1136
+#: lib/assembler.c:1106
msgid "Something wrong, lparenthesis operator called..."
msgstr ""
-#: lib/assembler.c:1139
+#: lib/assembler.c:1109
msgid "Something wrong, should never got here..."
msgstr ""
-#: lib/assembler.c:1328
+#: lib/assembler.c:1293
msgid "Unknow predefined string into the meta language"
msgstr ""
-#: lib/assembler.c:1389
+#: lib/assembler.c:1352
msgid "Pattern not matching..."
msgstr ""
-#: lib/assembler.c:1398 lib/assembler.c:1433 lib/assembler.c:1691
-#: lib/assembler.c:1710 lib/assembler.c:1734
+#: lib/assembler.c:1360 lib/assembler.c:1393 lib/assembler.c:1647
+#: lib/assembler.c:1662 lib/assembler.c:1681
msgid "Unknow constant type in the meta language"
msgstr ""
-#: lib/assembler.c:1410 lib/assembler.c:1457 lib/assembler.c:1486
+#: lib/assembler.c:1372 lib/assembler.c:1417 lib/assembler.c:1446
msgid ""
"Error in the metalanguage (pattern should be here if not a constant type)"
msgstr ""
-#: lib/assembler.c:1445 lib/assembler.c:1472 lib/assembler.c:1480
-#: lib/assembler.c:1770
+#: lib/assembler.c:1405 lib/assembler.c:1432 lib/assembler.c:1440
+#: lib/assembler.c:1715
msgid "Logical error in meta language"
msgstr ""
-#: lib/assembler.c:1517
+#: lib/assembler.c:1477
msgid "Unknow field in metalanguage"
msgstr ""
-#: lib/assembler.c:1527
+#: lib/assembler.c:1487
msgid "Can't evaluate directly expression"
msgstr ""
-#: lib/assembler.c:1533
+#: lib/assembler.c:1493
msgid "Value too large for field"
msgstr ""
-#: lib/assembler.c:1585 lib/assembler.c:1805
+#: lib/assembler.c:1545 lib/assembler.c:1746
msgid "Unknow instruction"
msgstr ""
-#: lib/assembler.c:1610
+#: lib/assembler.c:1570
msgid "Unknow constant"
msgstr ""
-#: lib/assembler.c:1619
+#: lib/assembler.c:1579
msgid "Bad constant for an immediate value"
msgstr ""
-#: lib/assembler.c:1636
+#: lib/assembler.c:1596
msgid "Bad constant for a string"
msgstr ""
-#: lib/assembler.c:1653
+#: lib/assembler.c:1613
msgid "Bad array size"
msgstr ""
-#: lib/assembler.c:1665
+#: lib/assembler.c:1623
msgid "You can only have an instruction into a .text segment"
msgstr ""
-#: lib/assembler.c:1668
+#: lib/assembler.c:1626
msgid "Unmatched instruction"
msgstr ""
-#: lib/assembler.c:1830 lib/assembler.c:1872 lib/linker.c:45 lib/linker.c:67
+#: lib/assembler.c:1771 lib/assembler.c:1813 lib/linker.c:45 lib/linker.c:67
msgid "Error writing file"
msgstr ""
-#: lib/assembler.c:1881 lib/assembler.c:2315 lib/linker.c:56
+#: lib/assembler.c:1822 lib/assembler.c:2217 lib/linker.c:56
#: lib/simulator.c:40
msgid "Error reading file"
msgstr ""
-#: lib/assembler.c:1898
+#: lib/assembler.c:1839
msgid "Creating temporary files"
msgstr ""
-#: lib/assembler.c:1901
+#: lib/assembler.c:1842
msgid "Error writing file __text__"
msgstr ""
-#: lib/assembler.c:1905
+#: lib/assembler.c:1846
msgid "Error writing file __symbols__"
msgstr ""
-#: lib/assembler.c:1909
+#: lib/assembler.c:1850
msgid "Dumping memory into object file"
msgstr ""
#. Segment de texte
-#: lib/assembler.c:1914
+#: lib/assembler.c:1855
msgid "Dumping text segment"
msgstr ""
-#: lib/assembler.c:1918 lib/assembler.c:2085 lib/assembler.c:2189
+#: lib/assembler.c:1859 lib/assembler.c:2003 lib/assembler.c:2092
#, c-format
msgid "Processing word number %i coming from line %i of the file %s."
msgstr ""
-#: lib/assembler.c:2011 lib/assembler.c:2016 lib/assembler.c:2116
-#: lib/assembler.c:2121
+#: lib/assembler.c:1941 lib/assembler.c:1944 lib/assembler.c:2031
+#: lib/assembler.c:2034
msgid "Can't evaluate expression for a direct value"
msgstr ""
-#: lib/assembler.c:2022 lib/assembler.c:2127
+#: lib/assembler.c:1948 lib/assembler.c:2038
msgid "Can only use the diff() function onto labels"
msgstr ""
-#: lib/assembler.c:2030 lib/assembler.c:2038 lib/assembler.c:2135
-#: lib/assembler.c:2143
+#: lib/assembler.c:1953 lib/assembler.c:1958 lib/assembler.c:2043
+#: lib/assembler.c:2048
msgid "Can only evaluate a diff on local symbols"
msgstr ""
-#: lib/assembler.c:2044 lib/assembler.c:2149
+#: lib/assembler.c:1962 lib/assembler.c:2052
msgid "Can only evaluate a diff on symbols from the same segment"
msgstr ""
-#: lib/assembler.c:2050 lib/assembler.c:2155
+#: lib/assembler.c:1968 lib/assembler.c:2058
msgid "Can't evaluate expression"
msgstr ""
#. Segment de data
-#: lib/assembler.c:2081
+#: lib/assembler.c:1999
msgid "Dumping data segment"
msgstr ""
#. Segment bss
-#: lib/assembler.c:2185
+#: lib/assembler.c:2088
msgid "Dumping bss segment"
msgstr ""
-#: lib/assembler.c:2236
+#: lib/assembler.c:2139
#, c-format
msgid ""
"Statistics: %i words of text, %i words of data, and %i words reserved.\n"
"%i symbols generated with %i internal and %i external.\n"
msgstr ""
-#: lib/assembler.c:2266
+#: lib/assembler.c:2168
msgid "Loading file"
msgstr ""
-#: lib/assembler.c:2267 lib/meta.c:548
+#: lib/assembler.c:2169 lib/meta.c:540
#, c-format
msgid "Opening file '%s'"
msgstr ""
-#: lib/assembler.c:2276 lib/meta.c:556
+#: lib/assembler.c:2178 lib/meta.c:548
msgid "Reading file"
msgstr ""
-#: lib/assembler.c:2278 lib/meta.c:558
+#: lib/assembler.c:2180 lib/meta.c:550
#, c-format
msgid "Reading line %i"
msgstr ""
-#: lib/assembler.c:2287
+#: lib/assembler.c:2189
#, c-format
msgid "Summering line %s"
msgstr ""
-#: lib/assembler.c:2306
+#: lib/assembler.c:2208
#, c-format
msgid "Assembling file %s...\n"
msgstr ""
-#: lib/assembler.c:2307
+#: lib/assembler.c:2209
msgid "Opening output file"
msgstr ""
-#: lib/assembler.c:2310
+#: lib/assembler.c:2212
msgid "Error writing output file"
msgstr ""
-#: lib/assembler.c:2317 lib/linker.c:293
+#: lib/assembler.c:2219 lib/linker.c:284
msgid "Writing output file"
msgstr ""
-#: lib/assembler.c:2318
+#: lib/assembler.c:2220
#, c-format
msgid "Generating output file %s...\n"
msgstr ""
-#: lib/hash.c:16
+#: lib/hash.c:14
msgid "Internal error into hashing"
msgstr ""
-#: lib/meta.c:86
+#: lib/meta.c:82
#, c-format
msgid "Read line '%s'"
msgstr ""
-#: lib/meta.c:91 lib/meta.c:178 lib/meta.c:191 lib/meta.c:270 lib/meta.c:280
-#: lib/meta.c:305 lib/meta.c:312
+#: lib/meta.c:87 lib/meta.c:173 lib/meta.c:186 lib/meta.c:263 lib/meta.c:273
+#: lib/meta.c:298 lib/meta.c:305
#, c-format
msgid "Analysing word '%s'"
msgstr ""
-#: lib/meta.c:96
+#: lib/meta.c:92
msgid "Missing operator ':'"
msgstr ""
-#: lib/meta.c:126
+#: lib/meta.c:122
msgid "Invalid number."
msgstr ""
-#: lib/meta.c:131
+#: lib/meta.c:126
msgid "Expecting ';' for field separator."
msgstr ""
-#: lib/meta.c:154
+#: lib/meta.c:149
msgid "Expecting ',' for field separator."
msgstr ""
-#: lib/meta.c:182 lib/meta.c:194 lib/meta.c:235 lib/meta.c:258 lib/meta.c:283
-#: lib/meta.c:297
+#: lib/meta.c:177 lib/meta.c:189 lib/meta.c:230 lib/meta.c:251 lib/meta.c:276
+#: lib/meta.c:290
msgid "Identifier incorrect."
msgstr ""
-#: lib/meta.c:187
+#: lib/meta.c:182
msgid "Error: Expecting a . after a ="
msgstr ""
-#: lib/meta.c:230
+#: lib/meta.c:225
msgid "Extra parameters for field 'p'."
msgstr ""
-#: lib/meta.c:238
+#: lib/meta.c:233
msgid "Unexpected char at end of line."
msgstr ""
-#: lib/meta.c:254
+#: lib/meta.c:247
msgid "Expecting operator '=' for field 'p'."
msgstr ""
-#: lib/meta.c:276
+#: lib/meta.c:269
msgid "Error: character . expected."
msgstr ""
-#: lib/meta.c:301
+#: lib/meta.c:294
msgid "= expected after an implicit name"
msgstr ""
-#: lib/meta.c:315 lib/meta.c:324
+#: lib/meta.c:308 lib/meta.c:317
msgid "Identifier incorrect"
msgstr ""
-#: lib/meta.c:334
+#: lib/meta.c:327
msgid "expecting ; as field separator"
msgstr ""
-#: lib/meta.c:547
+#: lib/meta.c:539
msgid "Loading meta file"
msgstr ""
-#: lib/meta.c:590 src/compilo.c:30
+#: lib/meta.c:582 src/compilo.c:30
msgid "Meta parser init failed."
msgstr ""
@@ -397,19 +397,19 @@ msgstr ""
msgid "Invalid binary operator"
msgstr ""
-#: lib/parser.c:233
+#: lib/parser.c:232
msgid "Parse error: too much left parenthesis"
msgstr ""
-#: lib/parser.c:244 lib/parser.c:265
+#: lib/parser.c:242 lib/parser.c:262
msgid "Parse error: too much right parenthesis"
msgstr ""
-#: lib/parser.c:249 lib/parser.c:270
+#: lib/parser.c:247 lib/parser.c:267
msgid "Parse error: enclosure mismatch"
msgstr ""
-#: lib/parser.c:289
+#: lib/parser.c:286
msgid "Invalid character"
msgstr ""
@@ -479,70 +479,71 @@ msgstr ""
msgid "Reading symbols"
msgstr ""
-#: lib/linker.c:167
+#: lib/linker.c:165
msgid "Reading text and data segments"
msgstr ""
-#: lib/linker.c:221
+#: lib/linker.c:219
#, c-format
msgid "Symbol %s not found"
msgstr ""
-#: lib/linker.c:240 lib/linker.c:266 lib/linker.c:279
+#: lib/linker.c:235 lib/linker.c:258 lib/linker.c:270
msgid "Internal error"
msgstr ""
-#: lib/linker.c:297
+#: lib/linker.c:288
msgid "No startpoint defined."
msgstr ""
-#: lib/linker.c:300
+#: lib/linker.c:291
msgid "Writing headers"
msgstr ""
-#: lib/linker.c:309
+#: lib/linker.c:300
msgid "Writing relocating informations"
msgstr ""
-#: lib/linker.c:312
+#: lib/linker.c:303
msgid "Writing text segments"
msgstr ""
-#: lib/linker.c:317
+#: lib/linker.c:308
msgid "Writing data segments"
msgstr ""
-#: lib/linker.c:326
+#: lib/linker.c:317
#, c-format
msgid "Statistics: %i words of text, %i words of data and reserving %i words\n"
msgstr ""
-#: lib/linker.c:330
+#: lib/linker.c:321
#, c-format
msgid "Output file size: %i words containing %i relocating offsets.\n"
msgstr ""
-#: lib/simulator.c:62
+#: lib/simulator.c:61
msgid "Adresse: Call With Invalid r/m Field State ( r/m=00 )"
msgstr ""
-#: lib/simulator.c:75
+#: lib/simulator.c:74
msgid "Adresse: Unmatched Addr Field"
msgstr ""
-#: lib/simulator.c:264
+#. arg2 = imm32
+#: lib/simulator.c:255
msgid "MOV: Memory to Memory Forbidden On This Type Of Processor"
msgstr ""
-#: lib/simulator.c:407
+#: lib/simulator.c:388
msgid "DecodeExec: Invalid Opcode"
msgstr ""
-#: lib/simulator.c:465
+#: lib/simulator.c:444
msgid "Shutdown requested"
msgstr ""
-#: lib/simulator.c:469
+#: lib/simulator.c:446
msgid ""
"Help:\n"
"G: go\n"
@@ -551,22 +552,22 @@ msgid ""
"Q: quit\n"
msgstr ""
-#: lib/simulator.c:502
+#: lib/simulator.c:479
#, c-format
msgid "Opening file %s"
msgstr ""
#. verification de la signature
-#: lib/simulator.c:506
+#: lib/simulator.c:483
msgid "Invalid Signature"
msgstr ""
-#: lib/simulator.c:510
+#: lib/simulator.c:487
#, c-format
msgid "Loading file %s"
msgstr ""
-#: lib/simulator.c:545
+#: lib/simulator.c:521
#, c-format
msgid "Executing file %s"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 5b42f8e..3c86e59 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-04-16 20:02+0200\n"
+"POT-Creation-Date: 2001-04-17 11:23+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"
@@ -41,222 +41,223 @@ msgstr "Directive # non valide"
msgid "Error: extra parameters to a . directive."
msgstr "Erreur: paramètres en trop à une directive ."
-#: lib/assembler.c:575
+#: lib/assembler.c:576
msgid "Too much arguments to #undef"
msgstr "Trop de paramètres à #undef"
-#: lib/assembler.c:579
+#: lib/assembler.c:580
msgid "Defined symbol not found."
msgstr "Symbole défini non trouvé."
-#: lib/assembler.c:585
+#: lib/assembler.c:586
msgid "Too much arguments to #include"
msgstr "Trop de parametres apres #include"
-#: lib/assembler.c:587
+#: lib/assembler.c:588
#, c-format
msgid "Including file at line %i"
msgstr "Inclusion d'un fichier à la ligne %i"
-#: lib/assembler.c:590
+#: lib/assembler.c:591
msgid "Error reading include file"
msgstr "Erreur lors de l'inclusion d'un fichier"
-#: lib/assembler.c:627 lib/assembler.c:633
+#: lib/assembler.c:629 lib/assembler.c:635
msgid "Zero divide."
msgstr "Division par zero."
-#: lib/assembler.c:646 lib/assembler.c:653
+#: lib/assembler.c:649 lib/assembler.c:656
msgid "Error: unable to compute the immediate value"
msgstr "Erreur: impossible de calculer la valeur immédiate"
-#: lib/assembler.c:662
+#: lib/assembler.c:665
msgid "Function unknow"
msgstr "Fonction inconnue"
-#: lib/assembler.c:669
+#: lib/assembler.c:673
msgid "Addresses addition not allowed"
msgstr "Addition d'adresses non permise"
-#: lib/assembler.c:673
+#: lib/assembler.c:677
msgid "You can only use the decal operator on labels"
msgstr "Vous ne pouvez utiliser l'operateur de décalage que sur les labels"
-#: lib/assembler.c:678 lib/assembler.c:681 lib/assembler.c:712
+#: lib/assembler.c:683 lib/assembler.c:687 lib/assembler.c:719
msgid "Address operation invalid"
msgstr "Operation invalide sur une adresse"
-#: lib/assembler.c:684 lib/assembler.c:716
+#: lib/assembler.c:690 lib/assembler.c:723
msgid "Addresses operations not allowed"
msgstr "Operations non permises sur des adresses"
-#: lib/assembler.c:687 lib/assembler.c:809 lib/assembler.c:846
-#: lib/assembler.c:920
+#: lib/assembler.c:693 lib/assembler.c:816 lib/assembler.c:853
+#: lib/assembler.c:925
msgid "Expression too complex or invalid"
msgstr "Expression trop complexe ou invalide"
-#: lib/assembler.c:720 lib/assembler.c:733 lib/assembler.c:786
-#: lib/assembler.c:798 lib/assembler.c:835
+#: lib/assembler.c:727 lib/assembler.c:740 lib/assembler.c:793
+#: lib/assembler.c:805 lib/assembler.c:842
msgid "Address type not supported"
msgstr "Type d'adresse non supportée"
-#: lib/assembler.c:802
+#: lib/assembler.c:809
msgid "Address addition not supported"
msgstr "Addition d'adresse non supportée"
-#: lib/assembler.c:839 lib/assembler.c:891
+#: lib/assembler.c:846 lib/assembler.c:898
msgid "Expression invalid"
msgstr "Expression invalide"
#. Bon si l'on est ici, c'est pas bon signe non plus...
-#: lib/assembler.c:964
+#: lib/assembler.c:969
msgid "Expression too complex"
msgstr "Expression trop complexe"
-#: lib/assembler.c:1030
+#: lib/assembler.c:1035
msgid "Something wrong, nested operator called..."
msgstr "Pas bon... Appel à l'operateur imbriquation"
-#: lib/assembler.c:1101
+#: lib/assembler.c:1106
msgid "Something wrong, lparenthesis operator called..."
msgstr "Pas bon... Appel l'opérateur de parenthèse gauche..."
-#: lib/assembler.c:1104
+#: lib/assembler.c:1109
msgid "Something wrong, should never got here..."
msgstr "Pas bon... On ne devrait pas arriver ici..."
-#: lib/assembler.c:1281
+#: lib/assembler.c:1293
msgid "Unknow predefined string into the meta language"
msgstr "Chaîne de caractère prédéfinie inconnue dans le màta langage"
-#: lib/assembler.c:1307
+#: lib/assembler.c:1352
msgid "Pattern not matching..."
msgstr "La pattern ne correspond pas..."
-#: lib/assembler.c:1315 lib/assembler.c:1345 lib/assembler.c:1595
-#: lib/assembler.c:1611 lib/assembler.c:1625
+#: lib/assembler.c:1360 lib/assembler.c:1393 lib/assembler.c:1647
+#: lib/assembler.c:1662 lib/assembler.c:1681
msgid "Unknow constant type in the meta language"
msgstr "Type de constante inconnu dans le méta langage"
-#: lib/assembler.c:1327 lib/assembler.c:1369 lib/assembler.c:1396
+#: lib/assembler.c:1372 lib/assembler.c:1417 lib/assembler.c:1446
msgid ""
"Error in the metalanguage (pattern should be here if not a constant type)"
msgstr ""
"Erreur dans le métalangage (une expression devrait être ici s'il n'y a pas "
"de type constant)"
-#: lib/assembler.c:1357 lib/assembler.c:1382 lib/assembler.c:1390
-#: lib/assembler.c:1653
+#: lib/assembler.c:1405 lib/assembler.c:1432 lib/assembler.c:1440
+#: lib/assembler.c:1715
msgid "Logical error in meta language"
msgstr "Erreur de logique dans le métalangage"
-#: lib/assembler.c:1426
+#: lib/assembler.c:1477
msgid "Unknow field in metalanguage"
msgstr "Champ inconnu dans le métalangage"
-#: lib/assembler.c:1436
+#: lib/assembler.c:1487
msgid "Can't evaluate directly expression"
msgstr "Impossible d'évaluer directement l'expression"
-#: lib/assembler.c:1442
+#: lib/assembler.c:1493
msgid "Value too large for field"
msgstr "Valeur trop importante pour ce champ"
-#: lib/assembler.c:1493 lib/assembler.c:1677
+#: lib/assembler.c:1545 lib/assembler.c:1746
msgid "Unknow instruction"
msgstr "Instruction inconnue"
-#: lib/assembler.c:1518
+#: lib/assembler.c:1570
msgid "Unknow constant"
msgstr "Constante inconnue"
-#: lib/assembler.c:1527
+#: lib/assembler.c:1579
msgid "Bad constant for an immediate value"
msgstr "Mauvaise constante pour une valeur immediate"
-#: lib/assembler.c:1544
+#: lib/assembler.c:1596
msgid "Bad constant for a string"
msgstr "Mauvaise constante pour une chaîne de caractères"
-#: lib/assembler.c:1561
+#: lib/assembler.c:1613
msgid "Bad array size"
msgstr "Mauvaise taille de tableau"
-#: lib/assembler.c:1571
+#: lib/assembler.c:1623
msgid "You can only have an instruction into a .text segment"
msgstr "Vous ne pouvez avoir une instruction que dans un segment .text"
-#: lib/assembler.c:1574
+#: lib/assembler.c:1626
msgid "Unmatched instruction"
msgstr "Instruction non trouvée"
-#: lib/assembler.c:1699 lib/assembler.c:1744 lib/linker.c:45 lib/linker.c:67
+#: lib/assembler.c:1771 lib/assembler.c:1813 lib/linker.c:45 lib/linker.c:67
msgid "Error writing file"
msgstr "Erreur en écrivant le fichier"
-#: lib/assembler.c:1753 lib/assembler.c:2078 lib/linker.c:56
+#: lib/assembler.c:1822 lib/assembler.c:2217 lib/linker.c:56
+#: lib/simulator.c:40
msgid "Error reading file"
msgstr "Erreur en lisant le fichier"
-#: lib/assembler.c:1770
+#: lib/assembler.c:1839
msgid "Creating temporary files"
msgstr "Création des fichiers temporaires"
-#: lib/assembler.c:1773
+#: lib/assembler.c:1842
msgid "Error writing file __text__"
msgstr "Erreur en écrivant le fichier __text__"
-#: lib/assembler.c:1777
+#: lib/assembler.c:1846
msgid "Error writing file __symbols__"
msgstr "Erreur en écrivant le fichier __symbols__"
-#: lib/assembler.c:1781
+#: lib/assembler.c:1850
msgid "Dumping memory into object file"
msgstr "Vidage de la mémoire dans un fichier objet"
#. Segment de texte
-#: lib/assembler.c:1786
+#: lib/assembler.c:1855
msgid "Dumping text segment"
msgstr "Vidage du segment text"
-#: lib/assembler.c:1788 lib/assembler.c:1872 lib/assembler.c:1955
+#: lib/assembler.c:1859 lib/assembler.c:2003 lib/assembler.c:2092
#, c-format
msgid "Processing word number %i coming from line %i of the file %s."
msgstr "Traitement du mot numéro %i de la ligne %i du fichier %s."
-#: lib/assembler.c:1816 lib/assembler.c:1819 lib/assembler.c:1900
-#: lib/assembler.c:1903
+#: lib/assembler.c:1941 lib/assembler.c:1944 lib/assembler.c:2031
+#: lib/assembler.c:2034
msgid "Can't evaluate expression for a direct value"
msgstr "Impossible d'évaluer l'expression pour une valeur directe"
-#: lib/assembler.c:1823 lib/assembler.c:1907
+#: lib/assembler.c:1948 lib/assembler.c:2038
msgid "Can only use the diff() function onto labels"
msgstr "Seule la fonction diff() peut être utilisée sur des labels"
-#: lib/assembler.c:1828 lib/assembler.c:1832 lib/assembler.c:1912
-#: lib/assembler.c:1916
+#: lib/assembler.c:1953 lib/assembler.c:1958 lib/assembler.c:2043
+#: lib/assembler.c:2048
msgid "Can only evaluate a diff on local symbols"
msgstr "Ne peut évaluer un diff que sur des symboles locaux"
-#: lib/assembler.c:1836 lib/assembler.c:1920
+#: lib/assembler.c:1962 lib/assembler.c:2052
msgid "Can only evaluate a diff on symbols from the same segment"
msgstr "Ne peut évaluer un diff peut que sur des symboles d'un même segment"
-#: lib/assembler.c:1842 lib/assembler.c:1926
+#: lib/assembler.c:1968 lib/assembler.c:2058
msgid "Can't evaluate expression"
msgstr "L'expression ne peut etre évaluee"
#. Segment de data
-#: lib/assembler.c:1870
+#: lib/assembler.c:1999
msgid "Dumping data segment"
msgstr "Vidage du segment data"
#. Segment bss
-#: lib/assembler.c:1953
+#: lib/assembler.c:2088
msgid "Dumping bss segment"
msgstr "Vidage du segment BSS"
-#: lib/assembler.c:1999
+#: lib/assembler.c:2139
#, c-format
msgid ""
"Statistics: %i words of text, %i words of data, and %i words reserved.\n"
@@ -265,47 +266,47 @@ msgstr ""
"Statistiques: %i mots de texte, %i mots de données, et %i mots réservés.\n"
"%i symboles generes dont %i internes et %i externes.\n"
-#: lib/assembler.c:2031
+#: lib/assembler.c:2168
msgid "Loading file"
msgstr "Chargement du fichier"
-#: lib/assembler.c:2032 lib/meta.c:516
+#: lib/assembler.c:2169 lib/meta.c:540
#, c-format
msgid "Opening file '%s'"
msgstr "Ouverture du fichier '%s'"
-#: lib/assembler.c:2040 lib/meta.c:524
+#: lib/assembler.c:2178 lib/meta.c:548
msgid "Reading file"
msgstr "Lecture du fichier"
-#: lib/assembler.c:2042 lib/meta.c:526
+#: lib/assembler.c:2180 lib/meta.c:550
#, c-format
msgid "Reading line %i"
msgstr "Lecture de la ligne %i"
-#: lib/assembler.c:2051
+#: lib/assembler.c:2189
#, c-format
msgid "Summering line %s"
msgstr "Résumé de la ligne %s"
-#: lib/assembler.c:2070
+#: lib/assembler.c:2208
#, c-format
msgid "Assembling file %s...\n"
msgstr "Assemblage du fichier %s...\n"
-#: lib/assembler.c:2071
+#: lib/assembler.c:2209
msgid "Opening output file"
msgstr "Ouverture du fichier de sortie"
-#: lib/assembler.c:2074
+#: lib/assembler.c:2212
msgid "Error writing output file"
msgstr "Erreur lors de l'ecriture du fichier de sortie"
-#: lib/assembler.c:2080 lib/linker.c:277
+#: lib/assembler.c:2219 lib/linker.c:284
msgid "Writing output file"
msgstr "Ecriture du fichier de sortie"
-#: lib/assembler.c:2081
+#: lib/assembler.c:2220
#, c-format
msgid "Generating output file %s...\n"
msgstr "Génération du fichier de sortie %s...\n"
@@ -314,75 +315,75 @@ msgstr "Génération du fichier de sortie %s...\n"
msgid "Internal error into hashing"
msgstr "Erreur interne dans le hachage"
-#: lib/meta.c:79
+#: lib/meta.c:82
#, c-format
msgid "Read line '%s'"
msgstr "Lecture de la ligne '%s'"
-#: lib/meta.c:84 lib/meta.c:164 lib/meta.c:177 lib/meta.c:252 lib/meta.c:262
-#: lib/meta.c:287 lib/meta.c:294
+#: lib/meta.c:87 lib/meta.c:173 lib/meta.c:186 lib/meta.c:263 lib/meta.c:273
+#: lib/meta.c:298 lib/meta.c:305
#, c-format
msgid "Analysing word '%s'"
msgstr "Analyse du mot '%s'"
-#: lib/meta.c:89
+#: lib/meta.c:92
msgid "Missing operator ':'"
msgstr "Opérateur ':' manquant"
-#: lib/meta.c:118
+#: lib/meta.c:122
msgid "Invalid number."
msgstr "Nombre invalide."
-#: lib/meta.c:122
+#: lib/meta.c:126
msgid "Expecting ';' for field separator."
msgstr "Séparateur de champ ';' manquant."
-#: lib/meta.c:142
+#: lib/meta.c:149
msgid "Expecting ',' for field separator."
msgstr "Separateur de champ ',' manquant."
-#: lib/meta.c:168 lib/meta.c:180 lib/meta.c:220 lib/meta.c:240 lib/meta.c:265
-#: lib/meta.c:279
+#: lib/meta.c:177 lib/meta.c:189 lib/meta.c:230 lib/meta.c:251 lib/meta.c:276
+#: lib/meta.c:290
msgid "Identifier incorrect."
msgstr "Identifiant manquant."
-#: lib/meta.c:173
+#: lib/meta.c:182
msgid "Error: Expecting a . after a ="
msgstr "Erreur: il manque un . après un ="
-#: lib/meta.c:215
+#: lib/meta.c:225
msgid "Extra parameters for field 'p'."
msgstr "Paramètres en trop pour le champs 'p'."
-#: lib/meta.c:223
+#: lib/meta.c:233
msgid "Unexpected char at end of line."
msgstr "Caractère inattendu en fin de ligne."
-#: lib/meta.c:236
+#: lib/meta.c:247
msgid "Expecting operator '=' for field 'p'."
msgstr "Il manque un operateur '=' pour le champ 'p'."
-#: lib/meta.c:258
+#: lib/meta.c:269
msgid "Error: character . expected."
msgstr "Erreur: caractère . attendu."
-#: lib/meta.c:283
+#: lib/meta.c:294
msgid "= expected after an implicit name"
msgstr "= attendu apres un nom implicite"
-#: lib/meta.c:297 lib/meta.c:306
+#: lib/meta.c:308 lib/meta.c:317
msgid "Identifier incorrect"
msgstr "Identifiant incorrect"
-#: lib/meta.c:316
+#: lib/meta.c:327
msgid "expecting ; as field separator"
msgstr "; attendu comme séparateur de champs"
-#: lib/meta.c:515
+#: lib/meta.c:539
msgid "Loading meta file"
msgstr "Chargement du fichier meta"
-#: lib/meta.c:558 src/compilo.c:30
+#: lib/meta.c:582 src/compilo.c:30
msgid "Meta parser init failed."
msgstr "L'initialisation du metaparseur a echouée."
@@ -394,27 +395,27 @@ msgstr "Trop d'operateurs imbriqués dans l'expression.\n"
msgid "Too many nested functions calls in expression.\n"
msgstr "Trop d'appels imbriqués de fonction dans l'expression.\n"
-#: lib/parser.c:202
+#: lib/parser.c:204
msgid "Invalid unary operator"
msgstr "Opérateur unaire invalide"
-#: lib/parser.c:204
+#: lib/parser.c:206
msgid "Invalid binary operator"
msgstr "Operateur binaire invalide"
-#: lib/parser.c:228
+#: lib/parser.c:232
msgid "Parse error: too much left parenthesis"
msgstr "Erreur d'analyse: trop de parenthèses ouvrantes"
-#: lib/parser.c:238 lib/parser.c:258
+#: lib/parser.c:242 lib/parser.c:262
msgid "Parse error: too much right parenthesis"
msgstr "Erreur d'analyse: trop de parenthèses fermantes"
-#: lib/parser.c:243 lib/parser.c:263
+#: lib/parser.c:247 lib/parser.c:267
msgid "Parse error: enclosure mismatch"
msgstr "Erreur d'analyse: Délimitations incompatibles"
-#: lib/parser.c:279
+#: lib/parser.c:286
msgid "Invalid character"
msgstr "Caractère invalide"
@@ -442,11 +443,11 @@ msgstr "SetBit: Valeur incorrecte"
msgid "ValeurBit: Incorrect Value"
msgstr "ValeurBit: Valeur incorrecte"
-#: lib/alu.c:100
+#: lib/alu.c:286
msgid "ValeurIbitsAuDeb: position not in interval"
msgstr "ValeurIBitsAuDeb: position non comprise dans l'intervalle"
-#: lib/alu.c:160
+#: lib/alu.c:346
msgid "InverseIbit: position not in interval"
msgstr "InverseIbit: position non comprise dans l'intervalle"
@@ -454,16 +455,16 @@ msgstr "InverseIbit: position non comprise dans l'intervalle"
msgid "FPU not implemented"
msgstr "FPU non programmé"
-#: lib/memoire.c:35 lib/memoire.c:105
+#: lib/memoire.c:57 lib/memoire.c:131
msgid "Invalid Memory Adress"
msgstr "Adresse memoire invalide"
#. Si on voudrait diminuer le nombre de registres
-#: lib/registre.c:76 lib/registre.c:92 lib/registre.c:106 lib/registre.c:120
+#: lib/registre.c:77 lib/registre.c:93 lib/registre.c:107 lib/registre.c:121
msgid "Invalid Register Descriptor"
msgstr "Descripteur de registre invalide"
-#: lib/linker.c:76
+#: lib/linker.c:76 lib/simulator.c:50
msgid "premature end of file"
msgstr "Fin de fichier prématurée"
@@ -488,66 +489,108 @@ msgstr "Lecture des symboles"
msgid "Reading text and data segments"
msgstr "Lecture des segments TEXT et DATA"
-#: lib/linker.c:218
+#: lib/linker.c:219
#, c-format
msgid "Symbol %s not found"
msgstr "Symbole %s non trouvé"
-#: lib/linker.c:237 lib/linker.c:257 lib/linker.c:263
+#: lib/linker.c:235 lib/linker.c:258 lib/linker.c:270
msgid "Internal error"
msgstr "Erreur interne"
-#: lib/linker.c:281
+#: lib/linker.c:288
msgid "No startpoint defined."
msgstr "Pas de point d'entrée defini."
-#: lib/linker.c:284
+#: lib/linker.c:291
msgid "Writing headers"
msgstr "Ecriture des entêtes"
-#: lib/linker.c:292
+#: lib/linker.c:300
msgid "Writing relocating informations"
msgstr "Ecriture des informations de relogement"
-#: lib/linker.c:295
+#: lib/linker.c:303
msgid "Writing text segments"
msgstr "Ecriture des segments text"
-#: lib/linker.c:300
+#: lib/linker.c:308
msgid "Writing data segments"
msgstr "Ecriture des segments data"
-#: lib/linker.c:307
+#: lib/linker.c:317
#, c-format
msgid "Statistics: %i words of text, %i words of data and reserving %i words\n"
msgstr ""
"Statistiques: %i mots de texte, %i mots de données and réservation de %i "
"mots\n"
-#: lib/linker.c:309
+#: lib/linker.c:321
#, c-format
msgid "Output file size: %i words containing %i relocating offsets.\n"
msgstr ""
"Taille du fichier de sortie: %i mots contenant %i pointeurs de relogements.\n"
-#: lib/simulator.c:43
+#: lib/simulator.c:61
msgid "Adresse: Call With Invalid r/m Field State ( r/m=00 )"
msgstr "Adresse: Appel avec un champ d'etat r/m invalide ( r/m=00 )"
-#: lib/simulator.c:56
+#: lib/simulator.c:74
msgid "Adresse: Unmatched Addr Field"
msgstr "Adresse: Le champ Addr ne correspond pas"
#. arg2 = imm32
-#: lib/simulator.c:224
+#: lib/simulator.c:255
msgid "MOV: Memory to Memory Forbidden On This Type Of Processor"
msgstr ""
"MOV: Déplacement de mémoire à mémoire interdit sur ce type de processeur"
-#: lib/simulator.c:344
+#: lib/simulator.c:388
msgid "DecodeExec: Invalid Opcode"
msgstr "DecodeExec: Opcode invalide"
+#: lib/simulator.c:444
+msgid "Shutdown requested"
+msgstr ""
+
+#: lib/simulator.c:446
+msgid ""
+"Help:\n"
+"G: go\n"
+"P: Proceed\n"
+"R: display registers\n"
+"Q: quit\n"
+msgstr ""
+
+#: lib/simulator.c:479
+#, fuzzy, c-format
+msgid "Opening file %s"
+msgstr "Ouverture du fichier '%s'"
+
+#. verification de la signature
+#: lib/simulator.c:483
+#, fuzzy
+msgid "Invalid Signature"
+msgstr "Mauvaise signature"
+
+#: lib/simulator.c:487
+#, fuzzy, c-format
+msgid "Loading file %s"
+msgstr "Chargement du fichier"
+
+#: lib/simulator.c:521
+#, fuzzy, c-format
+msgid "Executing file %s"
+msgstr "Ouverture du fichier '%s'"
+
+#: lib/terminal.c:23
+msgid "could not set terminal attributes"
+msgstr ""
+
+#: lib/terminal.c:36
+msgid "could not open terminal"
+msgstr ""
+
#: src/compilo.c:16
msgid ""
"Assembler v1.0\n"
@@ -588,15 +631,15 @@ msgstr ""
msgid "Assembler core init failed."
msgstr "L'initialisation de l'assembleur a échouée."
-#: src/compilo.c:45 src/linker.c:27
+#: src/compilo.c:45 src/linker.c:27 src/simul.c:30
msgid " Done!\n"
msgstr " Fait!\n"
-#: src/compilo.c:56 src/linker.c:37
+#: src/compilo.c:56 src/linker.c:37 src/simul.c:40
msgid "Signal received: segfault"
msgstr "Signal reçu: SEGFAULT"
-#: src/compilo.c:68 src/linker.c:51
+#: src/compilo.c:69 src/linker.c:51 src/simul.c:97
msgid ""
"\n"
"Performing initialisation...\n"
@@ -606,7 +649,7 @@ msgstr ""
"Initialisation en cours...\n"
"\n"
-#: src/compilo.c:73 src/linker.c:63
+#: src/compilo.c:74 src/linker.c:63 src/simul.c:110
msgid ""
"\n"
"Performing shutdown...\n"
@@ -616,10 +659,33 @@ msgstr ""
"Exctinction en cours...\n"
"\n"
-#: src/compilo.c:76 src/linker.c:66
+#: src/compilo.c:79 src/linker.c:68 src/simul.c:116
msgid "Exitting, bye!\n"
msgstr "Fin de programme, Ciao!\n"
+#: src/simul.c:16
+#, fuzzy
+msgid ""
+"Simul v1.0\n"
+"\n"
+msgstr ""
+"Assembleur v1.0\n"
+"\n"
+
+#: src/simul.c:21
+#, fuzzy
+msgid "Usage: linker [-s] [-d] binary\n"
+msgstr "Utilisation: linker obj1 [obj2 [obj3 [...]]] binaire\n"
+
+#: src/simul.c:27
+#, fuzzy
+msgid " o Initialising the simulator... "
+msgstr "o Initialisation de l'editeur de liens... "
+
+#: src/simul.c:100
+msgid "Beginning simulation"
+msgstr ""
+
#: src/linker.c:13
msgid ""
"Linker v1.0\n"
diff --git a/samples/Makefile.am b/samples/Makefile.am
index 92a419b..cc31c35 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = fichier1.s fichier2.s rechcara.s recherche.s sommeentiers.s testtout.s Makefile.samples instructions.txt boucle.s
+EXTRA_DIST = fichier1.s fichier2.s rechcara.s recherche.s sommeentiers.s testtout.s Makefile.samples instructions.txt boucle.s hello.s
all:
make -f Makefile.samples