orc-bugreport: Fix program generation

1 files changed, 53 insertions, 29 deletions

diff --git a/tools/orc-bugreport.c b/tools/orc-bugreport.c
index dadc0c1..28e295d 100644
--- a/tools/orc-bugreport.c
+++ b/tools/orc-bugreport.c
@@ -70,10 +70,23 @@ main (int argc, char *argv[])
   {
     int family, model, stepping;
     orc_get_cpu_family_model_stepping (&family, &model, &stepping);
-    printf("family/model/stepping: %d/%d/%d\n", family, model, stepping);
+    printf("Family/Model/Stepping: %d/%d/%d\n", family, model, stepping);
     printf("CPU name: %s\n", orc_get_cpu_name ());
   }
 
+  {
+    int i;
+    int flags = orc_target_get_default_flags (orc_target_get_default());
+
+    printf("Compiler options: ");
+    for(i=0;i<32;i++){
+      if (flags & (1<<i)) {
+        printf("%s ", orc_target_get_flag_name (orc_target_get_default(), i));
+      }
+    }
+    printf("\n");
+  }
+
   if (filename) {
     int n;
     int ret;
@@ -96,23 +109,10 @@ main (int argc, char *argv[])
       }
     }
   } else {
-    printf("Opcode test\n");
+    printf("Opcode test:\n");
     test_opcodes();
   }
 
-  {
-    int i;
-    int flags = orc_target_get_default_flags (orc_target_get_default());
-
-    printf("Compiler options: ");
-    for(i=0;i<32;i++){
-      if (flags & (1<<i)) {
-        printf("%s ", orc_target_get_flag_name (orc_target_get_default(), i));
-      }
-    }
-    printf("\n");
-  }
-
   if (error) {
     printf("Errors detected.  Please send entire output to ds@schleef.org.\n");
     return 1;
@@ -256,6 +256,8 @@ test_opcode_const (OrcStaticOpcode *opcode)
   char s[40];
   int ret;
   int flags = 0;
+  int args[4] = { -1, -1, -1, -1 };
+  int n_args = 0;
 
   if (opcode->src_size[1] == 0) {
     return;
@@ -263,25 +265,35 @@ test_opcode_const (OrcStaticOpcode *opcode)
 
   p = orc_program_new ();
   if (opcode->flags & ORC_STATIC_OPCODE_ACCUMULATOR) {
-    orc_program_add_accumulator (p, opcode->dest_size[0], "d1");
+    args[n_args++] =
+      orc_program_add_accumulator (p, opcode->dest_size[0], "d1");
   } else {
-    orc_program_add_destination (p, opcode->dest_size[0], "d1");
+    args[n_args++] =
+      orc_program_add_destination (p, opcode->dest_size[0], "d1");
   }
   if (opcode->dest_size[1] != 0) {
-    orc_program_add_destination (p, opcode->dest_size[1], "d2");
+    args[n_args++] =
+      orc_program_add_destination (p, opcode->dest_size[1], "d2");
+  }
+  args[n_args++] =
+    orc_program_add_source (p, opcode->src_size[0], "s1");
+  args[n_args++] =
+    orc_program_add_constant (p, opcode->src_size[1], 1, "c1");
+  if (opcode->src_size[2]) {
+    args[n_args++] =
+      orc_program_add_constant (p, opcode->src_size[2], 1, "c2");
   }
-  orc_program_add_source (p, opcode->src_size[0], "s1");
-  orc_program_add_constant (p, opcode->src_size[1], 1, "c1");
 
   if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) ||
       (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) {
     flags = ORC_TEST_FLAGS_FLOAT;
   }
 
-  sprintf(s, "test_c_%s", opcode->name);
+  sprintf(s, "test_const_%s", opcode->name);
   orc_program_set_name (p, s);
 
-  orc_program_append_str (p, opcode->name, "d1", "s1", "c1");
+  orc_program_append_2 (p, opcode->name, 0, args[0], args[1],
+      args[2], args[3]);
 
   ret = orc_test_compare_output_full (p, flags);
   if (!ret) {
@@ -299,31 +311,43 @@ test_opcode_param (OrcStaticOpcode *opcode)
   char s[40];
   int ret;
   int flags = 0;
+  int args[4] = { -1, -1, -1, -1 };
+  int n_args = 0;
 
   if (opcode->src_size[1] == 0) {
     return;
   }
   p = orc_program_new ();
   if (opcode->flags & ORC_STATIC_OPCODE_ACCUMULATOR) {
-    orc_program_add_accumulator (p, opcode->dest_size[0], "d1");
+    args[n_args++] =
+      orc_program_add_accumulator (p, opcode->dest_size[0], "d1");
   } else {
-    orc_program_add_destination (p, opcode->dest_size[0], "d1");
+    args[n_args++] =
+      orc_program_add_destination (p, opcode->dest_size[0], "d1");
   }
   if (opcode->dest_size[1] != 0) {
-    orc_program_add_destination (p, opcode->dest_size[1], "d2");
+    args[n_args++] =
+      orc_program_add_destination (p, opcode->dest_size[1], "d2");
+  }
+  args[n_args++] =
+    orc_program_add_source (p, opcode->src_size[0], "s1");
+  args[n_args++] =
+    orc_program_add_parameter (p, opcode->src_size[1], "p1");
+  if (opcode->src_size[2]) {
+    args[n_args++] =
+      orc_program_add_parameter (p, opcode->src_size[2], "p2");
   }
-  orc_program_add_source (p, opcode->src_size[0], "s1");
-  orc_program_add_parameter (p, opcode->src_size[1], "p1");
 
   if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) ||
       (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) {
     flags = ORC_TEST_FLAGS_FLOAT;
   }
 
-  sprintf(s, "test_c_%s", opcode->name);
+  sprintf(s, "test_p_%s", opcode->name);
   orc_program_set_name (p, s);
 
-  orc_program_append_str (p, opcode->name, "d1", "s1", "p1");
+  orc_program_append_2 (p, opcode->name, 0, args[0], args[1],
+      args[2], args[3]);
 
   ret = orc_test_compare_output_full (p, flags);
   if (!ret) {