qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 15:44:44 -07:00
Code Releases Activity

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

Browse Source 
Fixes #22093
Fixes #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>
This commit is contained in:
Hiroshi Ioka 2017-10-02 08:17:15 +09:00 committed by Keith Randall
parent 3af20c06fe
commit dc3a4e4bca
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/internal/objfile/disasm.go
View File

@ -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) { 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 var text string
size := inst.Len size := inst.Len
if err != nil || size == 0 || inst.Op == 0 { if err != nil || size == 0 || inst.Op == 0 {

13
src/cmd/objdump/objdump_test.go
View File

@ -148,6 +148,13 @@ func testDisasm(t *testing.T, printCode bool, flags ...string) {
ok = false ok = false
} }
} }
if goarch == "386" {
if strings.Contains(text, "(IP)") {
t.Errorf("disassembly contains PC-Relative addressing on 386")
ok = false
}
}
if !ok { if !ok {
t.Logf("full disassembly:\n%s", text) t.Logf("full disassembly:\n%s", text)
} }
@ -234,6 +241,12 @@ func TestDisasmGoobj(t *testing.T) {
ok = false ok = false
} }
} }
if runtime.GOARCH == "386" {
if strings.Contains(text, "(IP)") {
t.Errorf("disassembly contains PC-Relative addressing on 386")
ok = false
}
}
if !ok { if !ok {
t.Logf("full disassembly:\n%s", text) t.Logf("full disassembly:\n%s", text)
} }