pan/mdg: Fix output types for scalar fields
authorAlyssa Rosenzweig <alyssa@collabora.com>
Tue, 18 May 2021 18:44:08 +0000 (14:44 -0400)
committerMarge Bot <eric+marge@anholt.net>
Tue, 18 May 2021 19:19:01 +0000 (19:19 +0000)
Already fixed vector, but scalar was missed.

Fixes: 4d9c0a32e7e ("pan/mdg: Use _output_ type for outmod printing")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10866>

src/panfrost/midgard/disassemble.c

index dfeb10b..c16d850 100644 (file)
@@ -933,6 +933,7 @@ print_scalar_field(FILE *fp, const char *name, uint16_t *words, uint16_t reg_wor
         midgard_reg_info *reg_info = (midgard_reg_info *)&reg_word;
         midgard_scalar_alu *alu_field = (midgard_scalar_alu *) words;
         bool is_int = midgard_is_integer_op(alu_field->op);
+        bool is_int_out = midgard_is_integer_out_op(alu_field->op);
         bool full = alu_field->output_full;
 
         if (alu_field->unknown)
@@ -945,7 +946,7 @@ print_scalar_field(FILE *fp, const char *name, uint16_t *words, uint16_t reg_wor
 
         /* Print lane width, in this case the lane width is always 32-bit, but
          * we print it anyway to make it consistent with the other instructions. */
-        fprintf(fp, ".%c32", is_int ? 'i' : 'f');
+        fprintf(fp, ".%c32", is_int_out ? 'i' : 'f');
 
         fprintf(fp, " ");
 
@@ -959,7 +960,7 @@ print_scalar_field(FILE *fp, const char *name, uint16_t *words, uint16_t reg_wor
 
         fprintf(fp, ".%c", components[c]);
 
-        print_alu_outmod(fp, alu_field->outmod, is_int, !full);
+        print_alu_outmod(fp, alu_field->outmod, is_int_out, !full);
 
         fprintf(fp, ", ");