testsuite, tools: Fix warning caused by inserting unneeded source operands

Fixes #61

Part-of: <https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/166>

3 files changed, 37 insertions, 11 deletions

diff --git a/testsuite/exec_opcodes_sys.c b/testsuite/exec_opcodes_sys.c
index 345dd74..f8a9743 100644
--- a/testsuite/exec_opcodes_sys.c
+++ b/testsuite/exec_opcodes_sys.c
@@ -150,8 +150,10 @@ test_opcode_src (OrcStaticOpcode *opcode)
 
   if (opcode->dest_size[1] != 0) {
     orc_program_append_dds_str (p, opcode->name, "d1", "d2", "s1");
-  } else {
+  } else if (opcode->src_size[1] != 0) {
     orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "s1", NULL);
   }
 
   ret = orc_test_compare_output_full_for_target (p, flags, TARGET);
@@ -371,7 +373,11 @@ test_opcode_inplace (OrcStaticOpcode *opcode)
   sprintf(s, "test_inplace_%s", opcode->name);
   orc_program_set_name (p, s);
 
-  orc_program_append_str (p, opcode->name, "d1", "d1", "s2");
+  if (opcode->src_size[1] != 0) {
+    orc_program_append_str (p, opcode->name, "d1", "d1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "d1", NULL);
+  }
 
   ret = orc_test_compare_output_full_for_target (p, flags, TARGET);
   total_tests++;
@@ -429,8 +435,10 @@ test_opcode_src_2d (OrcStaticOpcode *opcode)
 
   if (opcode->dest_size[1] != 0) {
     orc_program_append_dds_str (p, opcode->name, "d1", "d2", "s1");
-  } else {
+  } else if (opcode->src_size[1] != 0) {
     orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "s1", NULL);
   }
 
   ret = orc_test_compare_output_full_for_target (p, flags, TARGET);
@@ -489,8 +497,10 @@ test_opcode_src_const_n (OrcStaticOpcode *opcode)
 
   if (opcode->dest_size[1] != 0) {
     orc_program_append_dds_str (p, opcode->name, "d1", "d2", "s1");
-  } else {
+  } else if (opcode->src_size[1] != 0) {
     orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "s1", NULL);
   }
 
   ret = orc_test_compare_output_full_for_target (p, flags, TARGET);
@@ -550,8 +560,10 @@ test_opcode_src_const_n_2d (OrcStaticOpcode *opcode)
 
   if (opcode->dest_size[1] != 0) {
     orc_program_append_dds_str (p, opcode->name, "d1", "d2", "s1");
-  } else {
+  } else if (opcode->src_size[1] != 0) {
     orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "s1", NULL);
   }
 
   ret = orc_test_compare_output_full_for_target (p, flags, TARGET);
diff --git a/testsuite/perf_opcodes_sys_compare.c b/testsuite/perf_opcodes_sys_compare.c
index bd89b7d..a04c55c 100644
--- a/testsuite/perf_opcodes_sys_compare.c
+++ b/testsuite/perf_opcodes_sys_compare.c
@@ -66,8 +66,10 @@ test_opcode_src (OrcStaticOpcode *opcode)
 
   if (opcode->dest_size[1] != 0) {
     orc_program_append_dds_str (p, opcode->name, "d1", "d2", "s1");
-  } else {
+  } else if (opcode->src_size[1] != 0) {
     orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "s1", NULL);
   }
 
   perf_mmx = orc_test_performance_full (p, flags, "mmx");
diff --git a/tools/orc-bugreport.c b/tools/orc-bugreport.c
index 6ba49a9..973d54b 100644
--- a/tools/orc-bugreport.c
+++ b/tools/orc-bugreport.c
@@ -242,8 +242,10 @@ test_opcode_src (OrcStaticOpcode *opcode)
 
   if (opcode->dest_size[1] != 0) {
     orc_program_append_dds_str (p, opcode->name, "d1", "d2", "s1");
-  } else {
+  } else if (opcode->src_size[1] != 0) {
     orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "s1", NULL);
   }
 
   ret = orc_test_compare_output_full (p, flags);
@@ -396,7 +398,11 @@ test_opcode_inplace (OrcStaticOpcode *opcode)
   sprintf(s, "test_inplace_%s", opcode->name);
   orc_program_set_name (p, s);
 
-  orc_program_append_str (p, opcode->name, "d1", "d1", "s2");
+  if (opcode->src_size[1] != 0) {
+    orc_program_append_str (p, opcode->name, "d1", "d1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "d1", NULL);
+  }
 
   ret = orc_test_compare_output_full (p, flags);
   if (!ret) {
@@ -444,8 +450,10 @@ test_opcode_src_2d (OrcStaticOpcode *opcode)
 
   if (opcode->dest_size[1] != 0) {
     orc_program_append_dds_str (p, opcode->name, "d1", "d2", "s1");
-  } else {
+  } else if (opcode->src_size[1] != 0) {
     orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "s1", NULL);
   }
 
   ret = orc_test_compare_output_full (p, flags);
@@ -494,8 +502,10 @@ test_opcode_src_const_n (OrcStaticOpcode *opcode)
 
   if (opcode->dest_size[1] != 0) {
     orc_program_append_dds_str (p, opcode->name, "d1", "d2", "s1");
-  } else {
+  } else if (opcode->src_size[1] != 0) {
     orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "s1", NULL);
   }
 
   ret = orc_test_compare_output_full (p, flags);
@@ -545,8 +555,10 @@ test_opcode_src_const_n_2d (OrcStaticOpcode *opcode)
 
   if (opcode->dest_size[1] != 0) {
     orc_program_append_dds_str (p, opcode->name, "d1", "d2", "s1");
-  } else {
+  } else if (opcode->src_size[1] != 0) {
     orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
+  } else {
+    orc_program_append_str (p, opcode->name, "d1", "s1", NULL);
   }
 
   ret = orc_test_compare_output_full (p, flags);