debug/pe: support windows/arm

jordanrh1 · bradfitz · commit 18034e6b9f0f · 2018-08-20T18:12:47.000Z
Enable 'go tool objdump' to disassemble windows/arm images. Updates #26148 Change-Id: I7d11226f01d92288061f8e25980334b9bd82c41f Reviewed-on: https://go-review.googlesource.com/125649 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/src/debug/pe/file.go b/src/debug/pe/file.go
@@ -91,7 +91,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
 		return nil, err
 	}
 	switch f.FileHeader.Machine {
-	case IMAGE_FILE_MACHINE_UNKNOWN, IMAGE_FILE_MACHINE_AMD64, IMAGE_FILE_MACHINE_I386:
+	case IMAGE_FILE_MACHINE_UNKNOWN, IMAGE_FILE_MACHINE_ARMNT, IMAGE_FILE_MACHINE_AMD64, IMAGE_FILE_MACHINE_I386:
 	default:
 		return nil, fmt.Errorf("Unrecognised COFF file header machine value of 0x%x.", f.FileHeader.Machine)
 	}
diff --git a/src/debug/pe/pe.go b/src/debug/pe/pe.go
@@ -91,6 +91,7 @@ const (
 	IMAGE_FILE_MACHINE_AM33      = 0x1d3
 	IMAGE_FILE_MACHINE_AMD64     = 0x8664
 	IMAGE_FILE_MACHINE_ARM       = 0x1c0
+	IMAGE_FILE_MACHINE_ARMNT     = 0x1c4
 	IMAGE_FILE_MACHINE_ARM64     = 0xaa64
 	IMAGE_FILE_MACHINE_EBC       = 0xebc
 	IMAGE_FILE_MACHINE_I386      = 0x14c

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func NewFile(r io.ReaderAt) (*File, error) {`
`91`	`91`	`return nil, err`
`92`	`92`	`}`
`93`	`93`	`switch f.FileHeader.Machine {`
`94`		`- case IMAGE_FILE_MACHINE_UNKNOWN, IMAGE_FILE_MACHINE_AMD64, IMAGE_FILE_MACHINE_I386:`
	`94`	`+ case IMAGE_FILE_MACHINE_UNKNOWN, IMAGE_FILE_MACHINE_ARMNT, IMAGE_FILE_MACHINE_AMD64, IMAGE_FILE_MACHINE_I386:`
`95`	`95`	`default:`
`96`	`96`	`return nil, fmt.Errorf("Unrecognised COFF file header machine value of 0x%x.", f.FileHeader.Machine)`
`97`	`97`	`}`