cmd/objdump: pass the correct execution mode to x86asm.Decode in disasm_x86 on 386

hirochachacha · randall77 · commit dc3a4e4bca1e · 2017-11-10T20:11:20.000Z
Fixes golang#22093 Fixes golang#19988 Change-Id: Ibd8ec89e091fd527f363999e484676931d7aa6e2 Reviewed-on: https://go-review.googlesource.com/67450 Reviewed-by: Keith Randall <khr@golang.org> Run-TryBot: Keith Randall <khr@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
diff --git a/src/cmd/internal/objfile/disasm.go b/src/cmd/internal/objfile/disasm.go
@@ -304,7 +304,7 @@ func disasm_amd64(code []byte, pc uint64, lookup lookupFunc, _ binary.ByteOrder)
 }
 
 func disasm_x86(code []byte, pc uint64, lookup lookupFunc, arch int) (string, int) {
-	inst, err := x86asm.Decode(code, 64)
+	inst, err := x86asm.Decode(code, arch)
 	var text string
 	size := inst.Len
 	if err != nil || size == 0 || inst.Op == 0 {
diff --git a/src/cmd/objdump/objdump_test.go b/src/cmd/objdump/objdump_test.go
@@ -148,6 +148,13 @@ func testDisasm(t *testing.T, printCode bool, flags ...string) {
 			ok = false
 		}
 	}
+	if goarch == "386" {
+		if strings.Contains(text, "(IP)") {
+			t.Errorf("disassembly contains PC-Relative addressing on 386")
+			ok = false
+		}
+	}
+
 	if !ok {
 		t.Logf("full disassembly:\n%s", text)
 	}
@@ -234,6 +241,12 @@ func TestDisasmGoobj(t *testing.T) {
 			ok = false
 		}
 	}
+	if runtime.GOARCH == "386" {
+		if strings.Contains(text, "(IP)") {
+			t.Errorf("disassembly contains PC-Relative addressing on 386")
+			ok = false
+		}
+	}
 	if !ok {
 		t.Logf("full disassembly:\n%s", text)
 	}

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ func disasm_amd64(code []byte, pc uint64, lookup lookupFunc, _ binary.ByteOrder)`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`func disasm_x86(code []byte, pc uint64, lookup lookupFunc, arch int) (string, int) {`
`307`		`- inst, err := x86asm.Decode(code, 64)`
	`307`	`+ inst, err := x86asm.Decode(code, arch)`
`308`	`308`	`var text string`
`309`	`309`	`size := inst.Len`
`310`	`310`	`if err != nil \|\| size == 0 \|\| inst.Op == 0 {`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,13 @@ func testDisasm(t *testing.T, printCode bool, flags ...string) {`
`148`	`148`	`ok = false`
`149`	`149`	`}`
`150`	`150`	`}`
	`151`	`+ if goarch == "386" {`
	`152`	`+ if strings.Contains(text, "(IP)") {`
	`153`	`+ t.Errorf("disassembly contains PC-Relative addressing on 386")`
	`154`	`+ ok = false`
	`155`	`+ }`
	`156`	`+ }`
	`157`	`+`
`151`	`158`	`if !ok {`
`152`	`159`	`t.Logf("full disassembly:\n%s", text)`
`153`	`160`	`}`
`@@ -234,6 +241,12 @@ func TestDisasmGoobj(t *testing.T) {`
`234`	`241`	`ok = false`
`235`	`242`	`}`
`236`	`243`	`}`
	`244`	`+ if runtime.GOARCH == "386" {`
	`245`	`+ if strings.Contains(text, "(IP)") {`
	`246`	`+ t.Errorf("disassembly contains PC-Relative addressing on 386")`
	`247`	`+ ok = false`
	`248`	`+ }`
	`249`	`+ }`
`237`	`250`	`if !ok {`
`238`	`251`	`t.Logf("full disassembly:\n%s", text)`
`239`	`252`	`}`