516903 - nanojit: fix printing of cmov, cmovq

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Nicholas Nethercote [inactive]]

When cmov/cmovq is debug printed, the condition is not shown.  This patch fixes it, treating cmov conditions like guard conditions.  The output now looks like this:

      eq20 = eq and14, 0       # codegen'd with the guard/cmov
      cmov4 = cmov eq20 ? and13 : and11
               test esi,esi           eax(ld16) ecx(and13) edx(and11) ebx(ld14)
esi(and14) edi(sp) 
               mov esi,-24(ebp)       eax(ld16) ecx(and13) edx(and11) ebx(ld14) 
edi(sp)  <= restore add4
               cmovne ecx,edx         eax(ld16) edx(and11) ebx(ld14) esi(add4) e
di(sp)         

Previously the eq20 definition wasn't shown.

It's possible the condition's definition will be printed twice as a result of this change, but that's (a) hard to avoid, (b) how it works for guards already, and (c) it makes a certain kind of sense because it reflects the way the code generation works.  Eg. in the above example, if eq20 is used elsewhere, it will be regenerated via a "test esi,esi" instruction... I added a comment to asm_cmp() explaining this as it is non-obvious.

Comment 1

[Nicholas Nethercote [inactive]]

Attachment: patch

Comment 2

[Nicholas Nethercote [inactive]]

http://hg.mozilla.org/tracemonkey/rev/44329a36182c

Comment 3

[Robert Sayre]

http://hg.mozilla.org/mozilla-central/rev/44329a36182c

Comment 4

[Robert Sayre]

http://hg.mozilla.org/releases/mozilla-1.9.2/rev/3c62dbf3b586