Linker + bugfixes

2 files changed, 139 insertions, 113 deletions

diff --git a/po/ProjetArchi.pot b/po/ProjetArchi.pot
index d23c660..5854352 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 04:31+0200\n"
+"POT-Creation-Date: 2001-04-16 16:14+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"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "You have to be into the .text or the .data segment to define a value."
 msgstr ""
 
-#: lib/assembler.c:198
+#: lib/assembler.c:196
 msgid "Label already defined"
 msgstr ""
 
@@ -123,167 +123,184 @@ msgstr ""
 msgid "Something wrong, should never got here..."
 msgstr ""
 
-#: lib/assembler.c:1277
+#: lib/assembler.c:1268
 msgid "Unknow predefined string into the meta language"
 msgstr ""
 
-#: lib/assembler.c:1334
+#: lib/assembler.c:1292
 msgid "Pattern not matching..."
 msgstr ""
 
-#: lib/assembler.c:1345 lib/assembler.c:1377 lib/assembler.c:1634
-#: lib/assembler.c:1651 lib/assembler.c:1667
+#: lib/assembler.c:1300 lib/assembler.c:1330 lib/assembler.c:1576
+#: lib/assembler.c:1592 lib/assembler.c:1606
 msgid "Unknow constant type in the meta language"
 msgstr ""
 
-#: lib/assembler.c:1359 lib/assembler.c:1402 lib/assembler.c:1429
+#: lib/assembler.c:1312 lib/assembler.c:1354 lib/assembler.c:1381
 msgid ""
 "Error in the metalanguage (pattern should be here if not a constant type)"
 msgstr ""
 
-#: lib/assembler.c:1390 lib/assembler.c:1415 lib/assembler.c:1423
-#: lib/assembler.c:1698
+#: lib/assembler.c:1342 lib/assembler.c:1367 lib/assembler.c:1375
+#: lib/assembler.c:1634
 msgid "Logical error in meta language"
 msgstr ""
 
-#: lib/assembler.c:1457
+#: lib/assembler.c:1409
 msgid "Unknow field in metalanguage"
 msgstr ""
 
-#: lib/assembler.c:1469
+#: lib/assembler.c:1419
 msgid "Can't evaluate directly expression"
 msgstr ""
 
-#: lib/assembler.c:1476
+#: lib/assembler.c:1425
 msgid "Value too large for field"
 msgstr ""
 
-#: lib/assembler.c:1529 lib/assembler.c:1725
+#: lib/assembler.c:1474 lib/assembler.c:1658
 msgid "Unknow instruction"
 msgstr ""
 
-#: lib/assembler.c:1555
+#: lib/assembler.c:1499
 msgid "Unknow constant"
 msgstr ""
 
-#: lib/assembler.c:1565
+#: lib/assembler.c:1508
 msgid "Bad constant for an immediate value"
 msgstr ""
 
-#: lib/assembler.c:1582
+#: lib/assembler.c:1525
 msgid "Bad constant for a string"
 msgstr ""
 
-#: lib/assembler.c:1599
+#: lib/assembler.c:1542
 msgid "Bad array size"
 msgstr ""
 
-#: lib/assembler.c:1609
+#: lib/assembler.c:1552
 msgid "You can only have an instruction into a .text segment"
 msgstr ""
 
-#: lib/assembler.c:1612
+#: lib/assembler.c:1555
 msgid "Unmatched instruction"
 msgstr ""
 
-#: lib/assembler.c:1762 lib/assembler.c:1799
+#: lib/assembler.c:1694 lib/assembler.c:1730
 msgid "Error writing file"
 msgstr ""
 
-#: lib/assembler.c:1808 lib/assembler.c:2116
+#: lib/assembler.c:1739 lib/assembler.c:2040
 msgid "Error reading file"
 msgstr ""
 
-#: lib/assembler.c:1824
+#: lib/assembler.c:1753
 msgid "Creating temporary files"
 msgstr ""
 
-#: lib/assembler.c:1827
+#: lib/assembler.c:1756
 msgid "Error writing file __text__"
 msgstr ""
 
-#: lib/assembler.c:1831
+#: lib/assembler.c:1760
 msgid "Error writing file __symbols__"
 msgstr ""
 
-#: lib/assembler.c:1835
+#: lib/assembler.c:1764
 msgid "Dumping memory into object file"
 msgstr ""
 
-#: lib/assembler.c:1837
+#: lib/assembler.c:1766
 msgid "Dumping text segment"
 msgstr ""
 
-#: lib/assembler.c:1839 lib/assembler.c:1922 lib/assembler.c:2007
+#: lib/assembler.c:1768 lib/assembler.c:1848 lib/assembler.c:1927
 #, c-format
 msgid "Processing word number %i coming from line %i of the file %s."
 msgstr ""
 
-#: lib/assembler.c:1873 lib/assembler.c:1876 lib/assembler.c:1956
-#: lib/assembler.c:1959
+#: lib/assembler.c:1795 lib/assembler.c:1798 lib/assembler.c:1875
+#: lib/assembler.c:1878
 msgid "Can't evaluate expression for a direct value"
 msgstr ""
 
-#: lib/assembler.c:1879 lib/assembler.c:1962
+#: lib/assembler.c:1801 lib/assembler.c:1881
 msgid "Can only use the diff() function onto labels"
 msgstr ""
 
-#: lib/assembler.c:1884 lib/assembler.c:1888 lib/assembler.c:1967
-#: lib/assembler.c:1971
+#: lib/assembler.c:1806 lib/assembler.c:1810 lib/assembler.c:1886
+#: lib/assembler.c:1890
 msgid "Can only evaluate a diff on local symbols"
 msgstr ""
 
-#: lib/assembler.c:1892 lib/assembler.c:1975
+#: lib/assembler.c:1814 lib/assembler.c:1894
 msgid "Can only evaluate a diff on symbols from the same segment"
 msgstr ""
 
-#: lib/assembler.c:1898 lib/assembler.c:1981
+#: lib/assembler.c:1820 lib/assembler.c:1900
 msgid "Can't evaluate expression"
 msgstr ""
 
-#: lib/assembler.c:1920
+#: lib/assembler.c:1846
 msgid "Dumping data segment"
 msgstr ""
 
-#: lib/assembler.c:2005
+#: lib/assembler.c:1925
 msgid "Dumping bss segment"
 msgstr ""
 
-#: lib/assembler.c:2072
+#: lib/assembler.c:1968
+#, 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:1995
 msgid "Loading file"
 msgstr ""
 
-#: lib/assembler.c:2073 lib/meta.c:516
+#: lib/assembler.c:1996 lib/meta.c:516
 #, c-format
 msgid "Opening file '%s'"
 msgstr ""
 
-#: lib/assembler.c:2081 lib/meta.c:524
+#: lib/assembler.c:2004 lib/meta.c:524
 msgid "Reading file"
 msgstr ""
 
-#: lib/assembler.c:2083 lib/meta.c:526
+#: lib/assembler.c:2006 lib/meta.c:526
 #, c-format
 msgid "Reading line %i"
 msgstr ""
 
-#: lib/assembler.c:2092
+#: lib/assembler.c:2015
 #, c-format
 msgid "Summering line %s"
 msgstr ""
 
-#: lib/assembler.c:2109
+#: lib/assembler.c:2032
+#, c-format
+msgid "Assembling file %s...\n"
+msgstr ""
+
+#: lib/assembler.c:2033
 msgid "Opening output file"
 msgstr ""
 
-#: lib/assembler.c:2112
+#: lib/assembler.c:2036
 msgid "Error writing output file"
 msgstr ""
 
-#: lib/assembler.c:2118
+#: lib/assembler.c:2042
 msgid "Writing output file"
 msgstr ""
 
+#: lib/assembler.c:2043
+#, c-format
+msgid "Generating output file %s...\n"
+msgstr ""
+
 #: lib/hash.c:14
 msgid "Internal error into hashing"
 msgstr ""
@@ -356,7 +373,7 @@ msgstr ""
 msgid "Loading meta file"
 msgstr ""
 
-#: lib/meta.c:558 src/compilo.c:22
+#: lib/meta.c:558 src/compilo.c:27
 msgid "Meta parser init failed."
 msgstr ""
 
@@ -435,57 +452,60 @@ msgstr ""
 
 #: src/compilo.c:15
 msgid ""
-"Assembler\n"
+"Assembler v1.0\n"
 "\n"
 msgstr ""
 
 #: src/compilo.c:19
+msgid "Usage: compilo program.asm objet.out\n"
+msgstr ""
+
+#: src/compilo.c:24
 msgid " o Initialising the meta engine...   "
 msgstr ""
 
-#: src/compilo.c:25
+#: src/compilo.c:30
 msgid ""
 " Done!\n"
 " o Meta language loading...          "
 msgstr ""
 
-#: src/compilo.c:28
+#: src/compilo.c:33
 msgid "Meta language loading failed."
 msgstr ""
 
-#: src/compilo.c:31
+#: src/compilo.c:36
 msgid ""
 " Done!\n"
 " o Initialising the assembler core..."
 msgstr ""
 
-#: src/compilo.c:34
+#: src/compilo.c:39
 msgid "Assembler core init failed."
 msgstr ""
 
-#: src/compilo.c:37
+#: src/compilo.c:42
 msgid " Done!\n"
 msgstr ""
 
-#: src/compilo.c:46
+#: src/compilo.c:51
 msgid "Signal received: segfault"
 msgstr ""
 
-#. signal(SIGSEGV, segfaulthand);
-#: src/compilo.c:54
+#: src/compilo.c:61
 msgid ""
 "\n"
 "Performing initialisation...\n"
 "\n"
 msgstr ""
 
-#: src/compilo.c:59
+#: src/compilo.c:66
 msgid ""
 "\n"
 "Performing shutdown...\n"
 "\n"
 msgstr ""
 
-#: src/compilo.c:62
+#: src/compilo.c:69
 msgid "Exitting, bye!\n"
 msgstr ""
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 1466fe7..b5cafca 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -65,73 +65,79 @@ Error in the metalanguage (pattern should be here if not a constant type)", 31},
   {"Can't evaluate expression", 55},
   {"Dumping data segment", 56},
   {"Dumping bss segment", 57},
-  {"Loading file", 58},
-  {"Opening file '%s'", 59},
-  {"Reading file", 60},
-  {"Reading line %i", 61},
-  {"Summering line %s", 62},
-  {"Opening output file", 63},
-  {"Error writing output file", 64},
-  {"Writing output file", 65},
-  {"Internal error into hashing", 66},
-  {"Read line '%s'", 67},
-  {"Analysing word '%s'", 68},
-  {"Missing operator ':'", 69},
-  {"Invalid number.", 70},
-  {"Expecting ';' for field separator.", 71},
-  {"Expecting ',' for field separator.", 72},
-  {"Identifier incorrect.", 73},
-  {"Error: Expecting a . after a =", 74},
-  {"Extra parameters for field 'p'.", 75},
-  {"Unexpected char at end of line.", 76},
-  {"Expecting operator '=' for field 'p'.", 77},
-  {"Error: character . expected.", 78},
-  {"= expected after an implicit name", 79},
-  {"Identifier incorrect", 80},
-  {"expecting ; as field separator", 81},
-  {"Loading meta file", 82},
-  {"Meta parser init failed.", 83},
-  {"Too many nested operators in expression.\n", 84},
-  {"Too many nested functions calls in expression.\n", 85},
-  {"Invalid unary operator", 86},
-  {"Invalid binary operator", 87},
-  {"Parse error: too much left parenthesis", 88},
-  {"Parse error: too much right parenthesis", 89},
-  {"Parse error: enclosure mismatch", 90},
-  {"Invalid character", 91},
-  {"Out of memory.", 92},
-  {"Too much error contexts during pushcontext().", 93},
-  {"Error context empty, but popcontext() called.", 94},
-  {"ResetBit: Incorrect Value", 95},
-  {"SetBit: Incorrect Value", 96},
-  {"ValeurBit: Incorrect Value", 97},
-  {"Adresse: Unmatched Addr Field", 98},
-  {"FPU not implemented", 99},
-  {"Invalid Memory Adress", 100},
-  {"Invalid Register Descriptor", 101},
   {"\
-Assembler\n\
-\n", 102},
-  {" o Initialising the meta engine...   ", 103},
+Statistics: %i words of text, %i words of data, and %i words reserved.\n\
+%i symbols generated with %i internal and %i external.\n", 58},
+  {"Loading file", 59},
+  {"Opening file '%s'", 60},
+  {"Reading file", 61},
+  {"Reading line %i", 62},
+  {"Summering line %s", 63},
+  {"Assembling file %s...\n", 64},
+  {"Opening output file", 65},
+  {"Error writing output file", 66},
+  {"Writing output file", 67},
+  {"Generating output file %s...\n", 68},
+  {"Internal error into hashing", 69},
+  {"Read line '%s'", 70},
+  {"Analysing word '%s'", 71},
+  {"Missing operator ':'", 72},
+  {"Invalid number.", 73},
+  {"Expecting ';' for field separator.", 74},
+  {"Expecting ',' for field separator.", 75},
+  {"Identifier incorrect.", 76},
+  {"Error: Expecting a . after a =", 77},
+  {"Extra parameters for field 'p'.", 78},
+  {"Unexpected char at end of line.", 79},
+  {"Expecting operator '=' for field 'p'.", 80},
+  {"Error: character . expected.", 81},
+  {"= expected after an implicit name", 82},
+  {"Identifier incorrect", 83},
+  {"expecting ; as field separator", 84},
+  {"Loading meta file", 85},
+  {"Meta parser init failed.", 86},
+  {"Too many nested operators in expression.\n", 87},
+  {"Too many nested functions calls in expression.\n", 88},
+  {"Invalid unary operator", 89},
+  {"Invalid binary operator", 90},
+  {"Parse error: too much left parenthesis", 91},
+  {"Parse error: too much right parenthesis", 92},
+  {"Parse error: enclosure mismatch", 93},
+  {"Invalid character", 94},
+  {"Out of memory.", 95},
+  {"Too much error contexts during pushcontext().", 96},
+  {"Error context empty, but popcontext() called.", 97},
+  {"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},
+  {"\
+Assembler v1.0\n\
+\n", 105},
+  {"Usage: compilo program.asm objet.out\n", 106},
+  {" o Initialising the meta engine...   ", 107},
   {"\
  Done!\n\
- o Meta language loading...          ", 104},
-  {"Meta language loading failed.", 105},
+ o Meta language loading...          ", 108},
+  {"Meta language loading failed.", 109},
   {"\
  Done!\n\
- o Initialising the assembler core...", 106},
-  {"Assembler core init failed.", 107},
-  {" Done!\n", 108},
-  {"Signal received: segfault", 109},
+ o Initialising the assembler core...", 110},
+  {"Assembler core init failed.", 111},
+  {" Done!\n", 112},
+  {"Signal received: segfault", 113},
   {"\
 \n\
 Performing initialisation...\n\
-\n", 110},
+\n", 114},
   {"\
 \n\
 Performing shutdown...\n\
-\n", 111},
-  {"Exitting, bye!\n", 112},
+\n", 115},
+  {"Exitting, bye!\n", 116},
 };
 
-int _msg_tbl_length = 112;
+int _msg_tbl_length = 116;