cmd/internal/obj/x86: fix nacl/amd64p32

Change-Id: I815b685e261065bad3416b55feb4fec68974c9a0
Reviewed-on: https://go-review.googlesource.com/6896
Reviewed-by: Rob Pike <r@golang.org>

diff --git a/src/cmd/internal/obj/x86/obj6.go b/src/cmd/internal/obj/x86/obj6.go
index a096561803d2de1a282dbf05f32e508f43ed3b12..e5bc3584fd95a550052212ffb9113af7b6757908 100644 (file)
--- a/src/cmd/internal/obj/x86/obj6.go
+++ b/src/cmd/internal/obj/x86/obj6.go
@@ -173,9 +173,13 @@ func progedit(ctxt *obj.Link, p *obj.Prog) {
                }
        }
 
-       if ctxt.Headtype == obj.Hnacl && p.Mode == 64 {
-               nacladdr(ctxt, p, &p.From)
-               nacladdr(ctxt, p, &p.To)
+       // Rewrite 0 to $0 in 3rd argment to CMPPS etc.
+       // That's what the tables expect.
+       switch p.As {
+       case ACMPPD, ACMPPS, ACMPSD, ACMPSS:
+               if p.To.Type == obj.TYPE_MEM && p.To.Name == obj.NAME_NONE && p.To.Reg == REG_NONE && p.To.Index == REG_NONE && p.To.Sym == nil {
+                       p.To.Type = obj.TYPE_CONST
+               }
        }
 
        // Rewrite CALL/JMP/RET to symbol as TYPE_BRANCH.
@@ -186,13 +190,9 @@ func progedit(ctxt *obj.Link, p *obj.Prog) {
                }
        }
 
-       // Rewrite 0 to $0 in 3rd argment to CMPPS etc.
-       // That's what the tables expect.
-       switch p.As {
-       case ACMPPD, ACMPPS, ACMPSD, ACMPSS:
-               if p.To.Type == obj.TYPE_MEM && p.To.Name == obj.NAME_NONE && p.To.Reg == REG_NONE && p.To.Index == REG_NONE && p.To.Sym == nil {
-                       p.To.Type = obj.TYPE_CONST
-               }
+       if ctxt.Headtype == obj.Hnacl && p.Mode == 64 {
+               nacladdr(ctxt, p, &p.From)
+               nacladdr(ctxt, p, &p.To)
        }
 
        // Rewrite float constants to values stored in memory.