cli/q
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Simplified build struct
All checks were successful
/ test (push) Successful in 17s
Details

Browse source
This commit is contained in:
Eduard Urbach 2025-07-03 17:24:42 +02:00
parent 3f481d0bd3
commit 85cea5cbee
Signed by: akyoto
GPG key ID: 49226B848C78F6C8
15 changed files with 48 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/asm/Assembler.go
View file

@ -59,7 +59,7 @@ func (a *Assembler) Compile(b *build.Build) (code []byte, data []byte, libs dll.
}
}
x := exe.New(elf.HeaderEnd, b.FileAlign, b.MemoryAlign)
x := exe.New(elf.HeaderEnd, b.FileAlign(), b.MemoryAlign())
x.InitSections(c.code, c.data, nil)
dataSectionOffset := x.Sections[1].MemoryOffset - x.Sections[0].MemoryOffset

14
src/build/Arch.go
View file

@ -8,17 +8,3 @@ const (
ARM
X86
)
// SetArch sets the architecture which also influences the default alignment.
func (build *Build) SetArch(arch Arch) {
build.Arch = arch
switch arch {
case ARM:
build.MemoryAlign = 0x4000
default:
build.MemoryAlign = 0x1000
}
build.FileAlign = build.MemoryAlign
}

2
src/build/Build.go
View file

@ -5,8 +5,6 @@ type Build struct {
Files []string
Arch Arch
OS OS
FileAlign int
MemoryAlign int
Dry bool
ShowSSA bool
}

6
src/build/FileAlign.go Normal file
View file

@ -0,0 +1,6 @@
package build
// FileAlign returns the file alignment.
func (build *Build) FileAlign() int {
return build.MemoryAlign()
}

11
src/build/MemoryAlign.go Normal file
View file

@ -0,0 +1,11 @@
package build
// MemoryAlign returns the memory alignment.
func (build *Build) MemoryAlign() int {
switch build.Arch {
case ARM:
return 0x4000
default:
return 0x1000
}
}

4
src/build/New.go
View file

@ -12,9 +12,9 @@ func New(files ...string) *Build {
switch global.Arch {
case "amd64":
b.SetArch(X86)
b.Arch = X86
case "arm64":
b.SetArch(ARM)
b.Arch = ARM
}
switch global.OS {

4
src/cli/build.go
View file

@ -46,9 +46,9 @@ func newBuildFromArgs(args []string) (*build.Build, error) {
switch args[i] {
case "arm":
b.SetArch(build.ARM)
b.Arch = build.ARM
case "x86":
b.SetArch(build.X86)
b.Arch = build.X86
default:
return b, &invalidValueError{Value: args[i], Parameter: "arch"}
}

6
src/elf/ELF.go
View file

@ -18,7 +18,7 @@ type ELF struct {
// Write writes the ELF64 format to the given writer.
func Write(writer io.WriteSeeker, b *build.Build, codeBytes []byte, dataBytes []byte) {
x := exe.New(HeaderEnd, b.FileAlign, b.MemoryAlign)
x := exe.New(HeaderEnd, b.FileAlign(), b.MemoryAlign())
x.InitSections(codeBytes, dataBytes)
code := x.Sections[0]
data := x.Sections[1]
@ -52,7 +52,7 @@ func Write(writer io.WriteSeeker, b *build.Build, codeBytes []byte, dataBytes []
VirtualAddress: int64(code.MemoryOffset),
SizeInFile: int64(len(code.Bytes)),
SizeInMemory: int64(len(code.Bytes)),
Align: int64(b.MemoryAlign),
Align: int64(b.MemoryAlign()),
},
DataHeader: ProgramHeader{
Type: ProgramTypeLOAD,
@ -61,7 +61,7 @@ func Write(writer io.WriteSeeker, b *build.Build, codeBytes []byte, dataBytes []
VirtualAddress: int64(data.MemoryOffset),
SizeInFile: int64(len(data.Bytes)),
SizeInMemory: int64(len(data.Bytes)),
Align: int64(b.MemoryAlign),
Align: int64(b.MemoryAlign()),
},
}

6
src/elf/ELF_test.go
View file

@ -9,7 +9,7 @@ import (
)
func TestWrite(t *testing.T) {
elf.Write(&exe.Discard{}, &build.Build{Arch: build.ARM, FileAlign: 0x4000, MemoryAlign: 0x4000}, nil, nil)
elf.Write(&exe.Discard{}, &build.Build{Arch: build.X86, FileAlign: 0x1000, MemoryAlign: 0x1000}, nil, nil)
elf.Write(&exe.Discard{}, &build.Build{Arch: build.UnknownArch, FileAlign: 0x1000, MemoryAlign: 0x1000}, nil, nil)
elf.Write(&exe.Discard{}, &build.Build{Arch: build.ARM}, nil, nil)
elf.Write(&exe.Discard{}, &build.Build{Arch: build.X86}, nil, nil)
elf.Write(&exe.Discard{}, &build.Build{Arch: build.UnknownArch}, nil, nil)
}

4
src/linker/WriteFile_test.go
View file

@ -28,11 +28,11 @@ func TestWriteFile(t *testing.T) {
env, err := compiler.Compile(b)
assert.Nil(t, err)
b.SetArch(build.ARM)
b.Arch = build.ARM
err = linker.WriteFile(b.Executable(), b, env)
assert.Nil(t, err)
b.SetArch(build.X86)
b.Arch = build.X86
err = linker.WriteFile(b.Executable(), b, env)
assert.Nil(t, err)
}

2
src/macho/MachO.go
View file

@ -19,7 +19,7 @@ type MachO struct {
// Write writes the Mach-O format to the given writer.
func Write(writer io.WriteSeeker, b *build.Build, codeBytes []byte, dataBytes []byte) {
x := exe.New(HeaderEnd, b.FileAlign, b.MemoryAlign)
x := exe.New(HeaderEnd, b.FileAlign(), b.MemoryAlign())
x.InitSections(codeBytes, dataBytes)
code := x.Sections[0]
data := x.Sections[1]

6
src/macho/MachO_test.go
View file

@ -9,7 +9,7 @@ import (
)
func TestWrite(t *testing.T) {
macho.Write(&exe.Discard{}, &build.Build{Arch: build.ARM, FileAlign: 0x4000, MemoryAlign: 0x4000}, nil, nil)
macho.Write(&exe.Discard{}, &build.Build{Arch: build.X86, FileAlign: 0x1000, MemoryAlign: 0x1000}, nil, nil)
macho.Write(&exe.Discard{}, &build.Build{Arch: build.UnknownArch, FileAlign: 0x1000, MemoryAlign: 0x1000}, nil, nil)
macho.Write(&exe.Discard{}, &build.Build{Arch: build.ARM}, nil, nil)
macho.Write(&exe.Discard{}, &build.Build{Arch: build.X86}, nil, nil)
macho.Write(&exe.Discard{}, &build.Build{Arch: build.UnknownArch}, nil, nil)
}

8
src/pe/EXE.go
View file

@ -20,7 +20,7 @@ type EXE struct {
// Write writes the EXE file to the given writer.
func Write(writer io.WriteSeeker, b *build.Build, codeBytes []byte, dataBytes []byte, libs dll.List) {
x := exe.New(HeaderEnd, b.FileAlign, b.MemoryAlign)
x := exe.New(HeaderEnd, b.FileAlign(), b.MemoryAlign())
x.InitSections(codeBytes, dataBytes, nil)
code := x.Sections[0]
data := x.Sections[1]
@ -36,7 +36,7 @@ func Write(writer io.WriteSeeker, b *build.Build, codeBytes []byte, dataBytes []
imports.Bytes = buffer.Bytes()
importDirectoryStart := dllDataStart + len(dllData)
importDirectorySize := DLLImportSize * len(dllImports)
imageSize := exe.Align(imports.MemoryOffset+len(imports.Bytes), b.MemoryAlign)
imageSize := exe.Align(imports.MemoryOffset+len(imports.Bytes), b.MemoryAlign())
if libs.Contains("user32") {
subSystem = IMAGE_SUBSYSTEM_WINDOWS_GUI
@ -67,8 +67,8 @@ func Write(writer io.WriteSeeker, b *build.Build, codeBytes []byte, dataBytes []
AddressOfEntryPoint: uint32(code.MemoryOffset),
BaseOfCode: uint32(code.MemoryOffset),
ImageBase: BaseAddress,
SectionAlignment: uint32(b.MemoryAlign), // power of 2, must be greater than or equal to FileAlignment
FileAlignment: uint32(b.FileAlign), // power of 2
SectionAlignment: uint32(b.MemoryAlign()), // power of 2, must be greater than or equal to FileAlignment
FileAlignment: uint32(b.FileAlign()), // power of 2
MajorOperatingSystemVersion: 0x06,
MinorOperatingSystemVersion: 0,
MajorImageVersion: 0,

6
src/pe/EXE_test.go
View file

@ -9,7 +9,7 @@ import (
)
func TestWrite(t *testing.T) {
pe.Write(&exe.Discard{}, &build.Build{Arch: build.ARM, FileAlign: 0x4000, MemoryAlign: 0x4000}, nil, nil, nil)
pe.Write(&exe.Discard{}, &build.Build{Arch: build.X86, FileAlign: 0x1000, MemoryAlign: 0x1000}, nil, nil, nil)
pe.Write(&exe.Discard{}, &build.Build{Arch: build.UnknownArch, FileAlign: 0x1000, MemoryAlign: 0x1000}, nil, nil, nil)
pe.Write(&exe.Discard{}, &build.Build{Arch: build.ARM}, nil, nil, nil)
pe.Write(&exe.Discard{}, &build.Build{Arch: build.X86}, nil, nil, nil)
pe.Write(&exe.Discard{}, &build.Build{Arch: build.UnknownArch}, nil, nil, nil)
}

2
src/ssa2asm/Compiler_test.go
View file

@ -17,7 +17,7 @@ func TestHelloExample(t *testing.T) {
b.OS = os
for _, arch := range architectures {
b.SetArch(arch)
b.Arch = arch
_, err := compiler.Compile(b)
assert.Nil(t, err)
}