From 12079acaa0a3349b4119372345ebab7a9c1d3988 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 5 Mar 2015 00:43:21 -0500 Subject: [PATCH] cmd/internal/obj/x86: fix nacl/amd64p32 Change-Id: I815b685e261065bad3416b55feb4fec68974c9a0 Reviewed-on: https://go-review.googlesource.com/6896 Reviewed-by: Rob Pike --- src/cmd/internal/obj/x86/obj6.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/cmd/internal/obj/x86/obj6.go b/src/cmd/internal/obj/x86/obj6.go index a096561803..e5bc3584fd 100644 --- 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. -- 2.48.1