Skip to content

include support for arm32 windows #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wmjb wants to merge 4 commits into
base: main
Choose a base branch
from
Open

include support for arm32 windows #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bbe980
Create pe_arm.go
wmjb Jan 2, 2025
24270e3
Merge pull request #1 from wmjb/wmjb-patch-1
wmjb Jan 2, 2025
0395e20
Update pe.go
wmjb Jan 2, 2025
3fdf2a3
Merge pull request #2 from wmjb/wmjb-patch-2
wmjb Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pe/pe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ type DataDirectoryEntry = dpe.DataDirectory

func resolveOptionalHeader(machine uint16, r peReader, offset uint32) (OptionalHeader, error) {
switch machine {
case dpe.IMAGE_FILE_MACHINE_I386:
case dpe.IMAGE_FILE_MACHINE_I386, dpe.IMAGE_FILE_MACHINE_ARM:
return readStruct[optionalHeader32](r, offset)
case dpe.IMAGE_FILE_MACHINE_AMD64, dpe.IMAGE_FILE_MACHINE_ARM64:
return readStruct[optionalHeader64](r, offset)
Expand All @@ -132,7 +132,7 @@ func resolveOptionalHeader(machine uint16, r peReader, offset uint32) (OptionalH
func checkMagic(oh OptionalHeader, machine uint16) bool {
var expectedMagic uint16
switch machine {
case dpe.IMAGE_FILE_MACHINE_I386:
case dpe.IMAGE_FILE_MACHINE_I386, dpe.IMAGE_FILE_MACHINE_ARM:
expectedMagic = 0x010B
case dpe.IMAGE_FILE_MACHINE_AMD64, dpe.IMAGE_FILE_MACHINE_ARM64:
expectedMagic = 0x020B
Expand Down
16 changes: 16 additions & 0 deletions pe/pe_arm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause

//go:build windows

package pe

import (
dpe "debug/pe"
)

type optionalHeaderForGOARCH = optionalHeader32

const (
expectedMachineForGOARCH = dpe.IMAGE_FILE_MACHINE_ARM
)