Fix debug printing for Neon VLDn/VSTn instructions.

(Kirill Batuzov <batuzovk@ispras.ru)

git-svn-id: svn://svn.valgrind.org/vex/trunk@2022

diff --git a/VEX/priv/guest_arm_toIR.c b/VEX/priv/guest_arm_toIR.c
index 7d64d836de5a8e578944c61c77ba9fb664e802d7..b2e30d4375c68016579f83bed5214ca108f61cd3 100644 (file)
--- a/VEX/priv/guest_arm_toIR.c
+++ b/VEX/priv/guest_arm_toIR.c
@@ -7817,7 +7817,12 @@ Bool dis_neon_elem_or_struct_load ( UInt theInstr,
                DIP(", ");
             DIP("d%u[%u]", rD + j * inc, i);
          }
-         DIP("}, [r%u]%s\n", rN, (rM != 15) ? "!" : "");
+         DIP("}, [r%u]", rN);
+         if (rM != 13 && rM != 15) {
+            DIP(", r%u\n", rM);
+         } else {
+            DIP("%s\n", (rM != 15) ? "!" : "");
+         }
       } else {
          /* VLDn (single element to all lanes) */
          UInt r;
@@ -7908,7 +7913,12 @@ Bool dis_neon_elem_or_struct_load ( UInt theInstr,
                DIP("d%u[]", rD + r + i * inc);
             }
          }
-         DIP("}, [r%u]%s\n", rN, (rM != 15) ? "!" : "");
+         DIP("}, [r%u]", rN);
+         if (rM != 13 && rM != 15) {
+            DIP(", r%u\n", rM);
+         } else {
+            DIP("%s\n", (rM != 15) ? "!" : "");
+         }
       }
       /* Writeback.  We're uncond here, so no condT-ing. */
       if (rM != 15) {
@@ -8022,7 +8032,12 @@ Bool dis_neon_elem_or_struct_load ( UInt theInstr,
             }
          }
       }
-      DIP("}, [r%u]%s\n", rN, (rM != 15) ? "!" : "");
+      DIP("}, [r%u]", rN);
+      if (rM != 13 && rM != 15) {
+         DIP(", r%u\n", rM);
+      } else {
+         DIP("%s\n", (rM != 15) ? "!" : "");
+      }
       return True;
    }
 #  undef INSN