commit 2dddd5f440a15d5406032fac20f206484513646f
author Eugene Tarassov <eugene.tarassov@xilinx.com> Tue Jul 05 11:46:31 2016 -0700
committer Eugene Tarassov <eugene.tarassov@xilinx.com> Tue Jul 05 11:46:31 2016 -0700
tree 92c95009b028f11e4662c8dac67e8f96f605a635
parent 133ed630995af353c888fb62c4487484a7a6c96c

TCF Agent: fixed missing condition name in disassembly of Thumb pop instruction

agent/machine/arm/tcf/disassembler-thumb.c

diff --git a/agent/machine/arm/tcf/disassembler-thumb.c b/agent/machine/arm/tcf/disassembler-thumb.c
index a680732..e782700 100644
--- a/agent/machine/arm/tcf/disassembler-thumb.c
+++ b/agent/machine/arm/tcf/disassembler-thumb.c
@@ -966,9 +966,11 @@
         if (sh == 1 && imm2 == 0 && imm3 == 0) {
             /* SSAT16, USAT16 : nothing to add. */
             return;
-        } else if (sh == 1) {
+        }
+        else if (sh == 1) {
             add_str(", asr #");
-        } else {
+        }
+        else {
             add_str(", lsl #");
         }
         add_dec_uint32((imm3 << 2) + imm2);
@@ -1615,8 +1617,10 @@
 
         if (((instr & 0xf84d) == 0xf84d) &&
             (((suffix & 0x0bff) == 0x0b04) || ((suffix & 0x0dff) == 0x0d04))) {
-            if ((suffix & 0x0bff) == 0x0b04) add_str("pop.w {");
-            else add_str("push.w {");
+            if ((suffix & 0x0bff) == 0x0b04) add_str("pop");
+            else add_str("push");
+            if (it_cond_name) add_str(it_cond_name);
+            add_str(".w {");
             add_reg_name((suffix >> 12) & 0xf);
             add_char('}');
             return;