Fix disassembly printing of cmpxchg insns (don't print "lock" twice).

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

diff --git a/VEX/priv/guest_amd64_toIR.c b/VEX/priv/guest_amd64_toIR.c
index ef5880f783122dd6669093b7ff3361e8b30f1623..9ce321549b46745ee7e33c848f582fef20df4f7b 100644 (file)
--- a/VEX/priv/guest_amd64_toIR.c
+++ b/VEX/priv/guest_amd64_toIR.c
@@ -7605,8 +7605,8 @@ ULong dis_cmpxchg_G_E ( /*OUT*/Bool* ok,
       assign( cond8, unop(Iop_1Uto8, mk_amd64g_calculate_condition(AMD64CondZ)) );
       assign( acc2,  IRExpr_Mux0X(mkexpr(cond8), mkexpr(dest), mkexpr(acc)) );
       putIRegRAX(size, mkexpr(acc2));
-      DIP("lock cmpxchg%c %s,%s\n", nameISize(size), 
-                                    nameIRegG(size,pfx,rm), dis_buf);
+      DIP("cmpxchg%c %s,%s\n", nameISize(size), 
+                               nameIRegG(size,pfx,rm), dis_buf);
    }
    else vassert(0);
 

diff --git a/VEX/priv/guest_x86_toIR.c b/VEX/priv/guest_x86_toIR.c
index 688e0ee72a9e35c648777957aa3a4085e4fd7b37..9f4fcce09dcdb5fdd46e629fce3c8e7b83cde1da 100644 (file)
--- a/VEX/priv/guest_x86_toIR.c
+++ b/VEX/priv/guest_x86_toIR.c
@@ -6529,8 +6529,8 @@ UInt dis_cmpxchg_G_E ( UChar       sorb,
       assign( cond8, unop(Iop_1Uto8, mk_x86g_calculate_condition(X86CondZ)) );
       assign( acc2,  IRExpr_Mux0X(mkexpr(cond8), mkexpr(dest), mkexpr(acc)) );
       putIReg(size, R_EAX, mkexpr(acc2));
-      DIP("lock cmpxchg%c %s,%s\n", nameISize(size), 
-                                    nameIReg(size,gregOfRM(rm)), dis_buf);
+      DIP("cmpxchg%c %s,%s\n", nameISize(size), 
+                               nameIReg(size,gregOfRM(rm)), dis_buf);
    }
    else vassert(0);