summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixel <>2001-04-16 00:01:00 +0000
committerPixel <>2001-04-16 00:01:00 +0000
commitcdd4766d59b8908b1e70e8f1117ea3dadd7e6adf (patch)
tree2e31dd222a537c2cb709388dfbc74d65eb9551df
parent8a16347ac6d9ebc6e10c16e5d762871c610c0c2d (diff)
Assembler bug fix
-rw-r--r--lib/assembler.c7
-rw-r--r--po/ProjetArchi.pot106
2 files changed, 59 insertions, 54 deletions
diff --git a/lib/assembler.c b/lib/assembler.c
index c3bc4a0..79fcbce 100644
--- a/lib/assembler.c
+++ b/lib/assembler.c
@@ -318,7 +318,7 @@ static expression_t *copy_expression(expression_t * e)
t = Emalloc(sizeof(expression_t));
*t = *e;
-
+
if (t->symbol) {
trouve = 0;
if (e->e_subtype == E_LABEL) {
@@ -989,6 +989,7 @@ static void evaluate(expression_t * e)
t = (expression_t *) Emalloc(sizeof(expression_t));
t->e_type = t->e_subtype = E_VALUE;
t->avalue = 0;
+ t->symbol = NULL;
t->pattern = NULL;
t->next = t->child = NULL;
t->prev = e->child;
@@ -1670,6 +1671,7 @@ void asm_eol(void)
t->avalue = e_current->index;
t->child = t->next = NULL;
t->pattern = NULL;
+ t->symbol = NULL;
fprintf(stderr, "Insertion de la variable %s, de valeur %i.\n",
instr->names[i], t->avalue);
InsererVarDansTab(&it, CreerElement(instr->names[i], t));
@@ -1697,6 +1699,7 @@ void asm_eol(void)
t->avalue = 0;
t->child = t->next = NULL;
t->pattern = NULL;
+ t->symbol = NULL;
fprintf(stderr, "Insertion de la variable %s, de valeur %i.\n",
instr->istrings[i], t->avalue);
}
@@ -1711,6 +1714,7 @@ void asm_eol(void)
t->avalue = evaluate_field(it, instr->istrings[i], fields);;
t->child = t->next = NULL;
t->pattern = NULL;
+ t->symbol = NULL;
InsererVarDansTab(&it, CreerElement(instr->implicits[i], t));
break;
case 2: /* type valeur */
@@ -1719,6 +1723,7 @@ void asm_eol(void)
t->avalue = instr->ivalues[i];
t->child = t->next = NULL;
t->pattern = NULL;
+ t->symbol = NULL;
InsererVarDansTab(&it, CreerElement(instr->implicits[i], t));
break;
}
diff --git a/po/ProjetArchi.pot b/po/ProjetArchi.pot
index 27017e0..a694a6b 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 01:21+0200\n"
+"POT-Creation-Date: 2001-04-16 01:57+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"
@@ -26,206 +26,206 @@ msgstr ""
msgid "You can't have the startpoint elsewhere than the .text segment"
msgstr ""
-#: lib/assembler.c:399
+#: lib/assembler.c:402
msgid "Not a valid . directive"
msgstr ""
-#: lib/assembler.c:428
+#: lib/assembler.c:431
msgid "Not a valid # directive"
msgstr ""
#. Cas des directives .
-#: lib/assembler.c:436
+#: lib/assembler.c:439
msgid "Error: extra parameters to a . directive."
msgstr ""
-#: lib/assembler.c:552
+#: lib/assembler.c:555
msgid "Too much arguments to #undef"
msgstr ""
-#: lib/assembler.c:556
+#: lib/assembler.c:559
msgid "Defined symbol not found."
msgstr ""
-#: lib/assembler.c:562
+#: lib/assembler.c:565
msgid "Too much arguments to #include"
msgstr ""
-#: lib/assembler.c:564
+#: lib/assembler.c:567
#, c-format
msgid "Including file at line %i"
msgstr ""
-#: lib/assembler.c:567
+#: lib/assembler.c:570
msgid "Error reading include file"
msgstr ""
-#: lib/assembler.c:619 lib/assembler.c:625
+#: lib/assembler.c:622 lib/assembler.c:628
msgid "Zero divide."
msgstr ""
-#: lib/assembler.c:638 lib/assembler.c:645
+#: lib/assembler.c:641 lib/assembler.c:648
msgid "Error: unable to compute the immediate value"
msgstr ""
-#: lib/assembler.c:654
+#: lib/assembler.c:657
msgid "Function unknow"
msgstr ""
-#: lib/assembler.c:661
+#: lib/assembler.c:664
msgid "Addresses addition not allowed"
msgstr ""
-#: lib/assembler.c:665
+#: lib/assembler.c:668
msgid "You can only use the decal operator on labels"
msgstr ""
-#: lib/assembler.c:670 lib/assembler.c:673 lib/assembler.c:704
+#: lib/assembler.c:673 lib/assembler.c:676 lib/assembler.c:707
msgid "Address operation invalid"
msgstr ""
-#: lib/assembler.c:676 lib/assembler.c:708
+#: lib/assembler.c:679 lib/assembler.c:711
msgid "Addresses operations not allowed"
msgstr ""
-#: lib/assembler.c:679 lib/assembler.c:801 lib/assembler.c:838
-#: lib/assembler.c:912
+#: lib/assembler.c:682 lib/assembler.c:804 lib/assembler.c:841
+#: lib/assembler.c:915
msgid "Expression too complex or invalid"
msgstr ""
-#: lib/assembler.c:712 lib/assembler.c:725 lib/assembler.c:778
-#: lib/assembler.c:790 lib/assembler.c:827
+#: lib/assembler.c:715 lib/assembler.c:728 lib/assembler.c:781
+#: lib/assembler.c:793 lib/assembler.c:830
msgid "Address type not supported"
msgstr ""
-#: lib/assembler.c:794
+#: lib/assembler.c:797
msgid "Address addition not supported"
msgstr ""
-#: lib/assembler.c:831 lib/assembler.c:883
+#: lib/assembler.c:834 lib/assembler.c:886
msgid "Expression invalid"
msgstr ""
#. Bon si l'on est ici, c'est pas bon signe non plus...
-#: lib/assembler.c:956
+#: lib/assembler.c:959
msgid "Expression too complex"
msgstr ""
-#: lib/assembler.c:1019
+#: lib/assembler.c:1023
msgid "Something wrong, nested operator called..."
msgstr ""
-#: lib/assembler.c:1090
+#: lib/assembler.c:1094
msgid "Something wrong, lparenthesis operator called..."
msgstr ""
-#: lib/assembler.c:1093
+#: lib/assembler.c:1097
msgid "Something wrong, should never got here..."
msgstr ""
-#: lib/assembler.c:1274
+#: lib/assembler.c:1278
msgid "Unknow predefined string into the meta language"
msgstr ""
-#: lib/assembler.c:1331
+#: lib/assembler.c:1335
msgid "Pattern not matching..."
msgstr ""
-#: lib/assembler.c:1342 lib/assembler.c:1375 lib/assembler.c:1631
-#: lib/assembler.c:1647 lib/assembler.c:1664 lib/assembler.c:1679
+#: lib/assembler.c:1346 lib/assembler.c:1379 lib/assembler.c:1635
+#: lib/assembler.c:1651 lib/assembler.c:1668 lib/assembler.c:1683
msgid "Unknow constant type in the meta language"
msgstr ""
-#: lib/assembler.c:1355 lib/assembler.c:1399 lib/assembler.c:1427
+#: lib/assembler.c:1359 lib/assembler.c:1403 lib/assembler.c:1431
msgid ""
"Error in the metalanguage (pattern should be here if not a constant type)"
msgstr ""
-#: lib/assembler.c:1387 lib/assembler.c:1413 lib/assembler.c:1421
-#: lib/assembler.c:1709
+#: lib/assembler.c:1391 lib/assembler.c:1417 lib/assembler.c:1425
+#: lib/assembler.c:1713
msgid "Logical error in meta language"
msgstr ""
-#: lib/assembler.c:1456
+#: lib/assembler.c:1460
msgid "Unknow field in metalanguage"
msgstr ""
-#: lib/assembler.c:1468
+#: lib/assembler.c:1472
msgid "Can't evaluate directly expression"
msgstr ""
-#: lib/assembler.c:1475
+#: lib/assembler.c:1479
msgid "Value too large for field"
msgstr ""
-#: lib/assembler.c:1528 lib/assembler.c:1733
+#: lib/assembler.c:1532 lib/assembler.c:1737
msgid "Unknow instruction"
msgstr ""
-#: lib/assembler.c:1553
+#: lib/assembler.c:1557
msgid "Unknow constant"
msgstr ""
-#: lib/assembler.c:1562
+#: lib/assembler.c:1566
msgid "Bad constant for an immediate value"
msgstr ""
-#: lib/assembler.c:1579
+#: lib/assembler.c:1583
msgid "Bad constant for a string"
msgstr ""
-#: lib/assembler.c:1596
+#: lib/assembler.c:1600
msgid "Bad array size"
msgstr ""
-#: lib/assembler.c:1606
+#: lib/assembler.c:1610
msgid "You can only have an instruction into a .text segment"
msgstr ""
-#: lib/assembler.c:1609
+#: lib/assembler.c:1613
msgid "Unmatched instruction"
msgstr ""
-#: lib/assembler.c:1656
+#: lib/assembler.c:1660
msgid "Can't have a direct value for a relative offset"
msgstr ""
-#: lib/assembler.c:1772
+#: lib/assembler.c:1776
msgid "Loading file"
msgstr ""
-#: lib/assembler.c:1773 lib/meta.c:516
+#: lib/assembler.c:1777 lib/meta.c:516
#, c-format
msgid "Opening file '%s'"
msgstr ""
-#: lib/assembler.c:1781 lib/meta.c:524
+#: lib/assembler.c:1785 lib/meta.c:524
msgid "Reading file"
msgstr ""
-#: lib/assembler.c:1783 lib/meta.c:526
+#: lib/assembler.c:1787 lib/meta.c:526
#, c-format
msgid "Reading line %i"
msgstr ""
-#: lib/assembler.c:1792
+#: lib/assembler.c:1796
#, c-format
msgid "Summering line %s"
msgstr ""
-#: lib/assembler.c:1809
+#: lib/assembler.c:1813
msgid "Opening output file"
msgstr ""
-#: lib/assembler.c:1812
+#: lib/assembler.c:1816
msgid "Error writing output file"
msgstr ""
-#: lib/assembler.c:1816
+#: lib/assembler.c:1820
msgid "Error reading file"
msgstr ""
-#: lib/assembler.c:1818
+#: lib/assembler.c:1822
msgid "Writing output file"
msgstr ""