asm

3 files changed, 43 insertions, 44 deletions

diff --git a/lib/assembler.c b/lib/assembler.c
index 79fcbce..dec26e8 100644
--- a/lib/assembler.c
+++ b/lib/assembler.c
@@ -1371,8 +1371,7 @@ static void evaluate_pattern(_TableauVariable * it, expression_t * e)
 			m = m->left;
 			if (m->string) {
 				if (m->type) {
-					if (strcmp(m->name, "I") || strcmp(m->string, "O")
-					    || strcmp(m->string, "o")) {
+					if (strcmp(m->name, "I") || strcmp(m->string, "O")) {
 						exception(1, _("Unknow constant type in the meta language"));
 					}
 					tv = 0;
diff --git a/lib/instructions.txt b/lib/instructions.txt
index d93edba..8b04e1b 100644
--- a/lib/instructions.txt
+++ b/lib/instructions.txt
@@ -9,7 +9,7 @@ Pr:R0;R1;R2;R3;R4;R5;R6;R7;R8;R9;R10;R11;R12;R13;R14;R15;R16;R17;R18;R19;R20;R21
 
 # Pattern des adressages
 # .O = Adresse absolue (relogée)
-# .o = Adresse relative à l'instruction en cours (ex: Label, Label + 2, __current__ + 4)
+# .O = Adresse relative à l'instruction en cours (ex: Label, Label + 2, __current__ + 4)
 Pm:regop=.Pr;.I=.O;[regop=.Pr;.I=.O[regop=.Pr
 
 # bits 3 - 2
@@ -94,24 +94,24 @@ I:NOP;op=0x9
 # 10 test1 && !test2 == !(!test1 || test2)
 # 11 test1 || !test2 == !(!test1 && test2)
 
-I:JE c1=.Pr,c2=.Pr,.I=.o;op=0xb;e=0x0
-I:JNE c1=.Pr,c2=.Pr,.I=.o;op=0xb;e=0x1
-I:JL c1=.Pr,c2=.Pr,.I=.o;op=0xb;e=0x2
-I:JLE c1=.Pr,c2=.Pr,.I=.o;op=0xb;e=0x3
-I:JG c2=.Pr,c1=.Pr,.I=.o;op=0xb;e=0x2
-I:JGE c2=.Pr,c1=.Pr,.I=.o;op=0xb;e=0x3
+I:JE c1=.Pr,c2=.Pr,.I=.O;op=0xa;e=0x0
+I:JNE c1=.Pr,c2=.Pr,.I=.O;op=0xa;e=0x1
+I:JL c1=.Pr,c2=.Pr,.I=.O;op=0xa;e=0x2
+I:JLE c1=.Pr,c2=.Pr,.I=.O;op=0xa;e=0x3
+I:JG c2=.Pr,c1=.Pr,.I=.O;op=0xa;e=0x2
+I:JGE c2=.Pr,c1=.Pr,.I=.O;op=0xa;e=0x3
 
-I:JO .I=.o;op=0xb;e=0x10
-I:JZ .I=.o;op=0xb;e=0x14
-I:JS .I=.o;op=0xb;e=0x18
-I:JP .I=.o;op=0xb;e=0x1c
+I:JO .I=.O;op=0xa;e=0x10
+I:JZ .I=.O;op=0xa;e=0x14
+I:JS .I=.O;op=0xa;e=0x18
+I:JP .I=.O;op=0xa;e=0x1c
 
-I:JNO .I=.o;op=0xb;e=0x30
-I:JNZ .I=.o;op=0xb;e=0x34
-I:JNS .I=.o;op=0xb;e=0x38
-I:JNP .I=.o;op=0xb;e=0x3c
+I:JNO .I=.O;op=0xa;e=0x30
+I:JNZ .I=.O;op=0xa;e=0x34
+I:JNS .I=.O;op=0xa;e=0x38
+I:JNP .I=.O;op=0xa;e=0x3c
 
-I:JMP .I=.o;op=0x0d;e=0x2
+I:JMP .I=.O;op=0x0c;e=0x2
 
 I:HALT;op=0x7f
 I:RESET;op=0x7f;e=1
diff --git a/po/ProjetArchi.pot b/po/ProjetArchi.pot
index 08a80f2..57a114f 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 02:38+0200\n"
+"POT-Creation-Date: 2001-04-16 02: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"
@@ -131,101 +131,101 @@ msgstr ""
 msgid "Pattern not matching..."
 msgstr ""
 
-#: lib/assembler.c:1343 lib/assembler.c:1376 lib/assembler.c:1632
-#: lib/assembler.c:1648 lib/assembler.c:1665 lib/assembler.c:1681
+#: lib/assembler.c:1343 lib/assembler.c:1375 lib/assembler.c:1631
+#: lib/assembler.c:1647 lib/assembler.c:1664 lib/assembler.c:1680
 msgid "Unknow constant type in the meta language"
 msgstr ""
 
-#: lib/assembler.c:1356 lib/assembler.c:1400 lib/assembler.c:1428
+#: lib/assembler.c:1356 lib/assembler.c:1399 lib/assembler.c:1427
 msgid ""
 "Error in the metalanguage (pattern should be here if not a constant type)"
 msgstr ""
 
-#: lib/assembler.c:1388 lib/assembler.c:1414 lib/assembler.c:1422
-#: lib/assembler.c:1712
+#: lib/assembler.c:1387 lib/assembler.c:1413 lib/assembler.c:1421
+#: lib/assembler.c:1711
 msgid "Logical error in meta language"
 msgstr ""
 
-#: lib/assembler.c:1457
+#: lib/assembler.c:1456
 msgid "Unknow field in metalanguage"
 msgstr ""
 
-#: lib/assembler.c:1469
+#: lib/assembler.c:1468
 msgid "Can't evaluate directly expression"
 msgstr ""
 
-#: lib/assembler.c:1476
+#: lib/assembler.c:1475
 msgid "Value too large for field"
 msgstr ""
 
-#: lib/assembler.c:1529 lib/assembler.c:1738
+#: lib/assembler.c:1528 lib/assembler.c:1737
 msgid "Unknow instruction"
 msgstr ""
 
-#: lib/assembler.c:1554
+#: lib/assembler.c:1553
 msgid "Unknow constant"
 msgstr ""
 
-#: lib/assembler.c:1563
+#: lib/assembler.c:1562
 msgid "Bad constant for an immediate value"
 msgstr ""
 
-#: lib/assembler.c:1580
+#: lib/assembler.c:1579
 msgid "Bad constant for a string"
 msgstr ""
 
-#: lib/assembler.c:1597
+#: lib/assembler.c:1596
 msgid "Bad array size"
 msgstr ""
 
-#: lib/assembler.c:1607
+#: lib/assembler.c:1606
 msgid "You can only have an instruction into a .text segment"
 msgstr ""
 
-#: lib/assembler.c:1610
+#: lib/assembler.c:1609
 msgid "Unmatched instruction"
 msgstr ""
 
-#: lib/assembler.c:1657
+#: lib/assembler.c:1656
 msgid "Can't have a direct value for a relative offset"
 msgstr ""
 
-#: lib/assembler.c:1777
+#: lib/assembler.c:1776
 msgid "Loading file"
 msgstr ""
 
-#: lib/assembler.c:1778 lib/meta.c:516
+#: lib/assembler.c:1777 lib/meta.c:516
 #, c-format
 msgid "Opening file '%s'"
 msgstr ""
 
-#: lib/assembler.c:1786 lib/meta.c:524
+#: lib/assembler.c:1785 lib/meta.c:524
 msgid "Reading file"
 msgstr ""
 
-#: lib/assembler.c:1788 lib/meta.c:526
+#: lib/assembler.c:1787 lib/meta.c:526
 #, c-format
 msgid "Reading line %i"
 msgstr ""
 
-#: lib/assembler.c:1797
+#: lib/assembler.c:1796
 #, c-format
 msgid "Summering line %s"
 msgstr ""
 
-#: lib/assembler.c:1814
+#: lib/assembler.c:1813
 msgid "Opening output file"
 msgstr ""
 
-#: lib/assembler.c:1817
+#: lib/assembler.c:1816
 msgid "Error writing output file"
 msgstr ""
 
-#: lib/assembler.c:1821
+#: lib/assembler.c:1820
 msgid "Error reading file"
 msgstr ""
 
-#: lib/assembler.c:1823
+#: lib/assembler.c:1822
 msgid "Writing output file"
 msgstr ""