Fix tests

diff --git a/testsuite/test2.c b/testsuite/test2.c
index 20b3ce1..b8a8eb9 100644 (file)
--- a/testsuite/test2.c
+++ b/testsuite/test2.c
@@ -8,7 +8,7 @@
 
 int error = FALSE;
 
-void test_opcode (const char *name);
+void test_opcode (OrcStaticOpcode *opcode);
 
 int
 main (int argc, char *argv[])
@@ -27,7 +27,7 @@ main (int argc, char *argv[])
         opcode_set->opcodes[i].src_size[0],
         opcode_set->opcodes[i].src_size[1],
         opcode_set->opcodes[i].emulate);
-    test_opcode (opcode_set->opcodes[i].name);
+    test_opcode (opcode_set->opcodes+i);
   }
 
   if (error) return 1;
@@ -39,19 +39,20 @@ uint8_t s1[100];
 uint8_t s2[100];
 
 void
-test_opcode (const char *name)
+test_opcode (OrcStaticOpcode *opcode)
 {
   OrcProgram *p;
   char s[40];
   int ret;
   OrcExecutor *ex;
 
-  p = orc_program_new_dss (2,2,2);
+  p = orc_program_new_dss (opcode->dest_size[0],
+      opcode->src_size[0], opcode->src_size[1]);
 
-  sprintf(s, "test_%s", name);
+  sprintf(s, "test_%s", opcode->name);
   orc_program_set_name (p, s);
 
-  orc_program_append_str (p, name, "d1", "s1", "s2");
+  orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
 
   ret = orc_program_compile_for_target (p, orc_target_get_by_name("c"));
   if (!ret) {

diff --git a/testsuite/test3.c b/testsuite/test3.c
index 765ce19..286f53c 100644 (file)
--- a/testsuite/test3.c
+++ b/testsuite/test3.c
@@ -8,7 +8,7 @@
 
 int error = FALSE;
 
-void test_opcode (const char *name);
+void test_opcode (OrcStaticOpcode *opcode);
 
 int
 main (int argc, char *argv[])
@@ -27,7 +27,7 @@ main (int argc, char *argv[])
         opcode_set->opcodes[i].src_size[0],
         opcode_set->opcodes[i].src_size[1],
         opcode_set->opcodes[i].emulate);
-    test_opcode (opcode_set->opcodes[i].name);
+    test_opcode (opcode_set->opcodes + i);
   }
 
   if (error) return 1;
@@ -35,18 +35,19 @@ main (int argc, char *argv[])
 }
 
 void
-test_opcode (const char *name)
+test_opcode (OrcStaticOpcode *opcode)
 {
   OrcProgram *p;
   char s[40];
   int ret;
 
-  p = orc_program_new_dss (2,2,2);
+  p = orc_program_new_dss (opcode->dest_size[0],
+        opcode->src_size[0], opcode->src_size[1]);
 
-  sprintf(s, "test_%s", name);
+  sprintf(s, "test_%s", opcode->name);
   orc_program_set_name (p, s);
 
-  orc_program_append_str (p, name, "d1", "s1", "s2");
+  orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
 
   ret = orc_program_compile (p);
   if (!ret) {

diff --git a/testsuite/test4.c b/testsuite/test4.c
index 34c21ec..3df4273 100644 (file)
--- a/testsuite/test4.c
+++ b/testsuite/test4.c
@@ -8,7 +8,7 @@
 
 int error = FALSE;
 
-void test_opcode (const char *name);
+void test_opcode (OrcStaticOpcode *opcode);
 
 int
 main (int argc, char *argv[])
@@ -27,7 +27,7 @@ main (int argc, char *argv[])
         opcode_set->opcodes[i].src_size[0],
         opcode_set->opcodes[i].src_size[1],
         opcode_set->opcodes[i].emulate);
-    test_opcode (opcode_set->opcodes[i].name);
+    test_opcode (opcode_set->opcodes + i);
   }
 
   if (error) return 1;
@@ -35,18 +35,19 @@ main (int argc, char *argv[])
 }
 
 void
-test_opcode (const char *name)
+test_opcode (OrcStaticOpcode *opcode)
 {
   OrcProgram *p;
   char s[40];
   int ret;
 
-  p = orc_program_new_dss (2,2,2);
+  p = orc_program_new_dss (opcode->dest_size[0],
+        opcode->src_size[0], opcode->src_size[1]);
 
-  sprintf(s, "test_%s", name);
+  sprintf(s, "test_%s", opcode->name);
   orc_program_set_name (p, s);
 
-  orc_program_append_str (p, name, "d1", "s1", "s2");
+  orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
 
   ret = orc_program_compile_for_target (p, orc_target_get_by_name("arm"));
   if (!ret) {