Skip to content

Fix arm64 argument corruption on alignment flush #360

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

Merged
merged 6 commits into from
Oct 31, 2025
Merged

Fix arm64 argument corruption on alignment flush #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e49e529
purego: add FourInt32s struct argument test case
tmc Oct 29, 2025
e116003
purego: fix ARM64 struct register corruption on alignment flush
tmc Oct 30, 2025
a859792
structtest: fix imports
tmc Oct 31, 2025
f70ccf9
structtest: simplify FourInt32s and Array4Chars test cases
tmc Oct 31, 2025
7111922
structtest: enhance FourInt32s test with mixed positive/negative values
tmc Oct 31, 2025
599f44c
struct_test: change to more random values, tidy c imports
tmc Oct 31, 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
2 changes: 2 additions & 0 deletions struct_arm64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ func placeRegisters(v reflect.Value, addFloat func(uintptr), addInt func(uintptr
} else {
addInt(uintptr(val))
}
val = 0
class = _NO_CLASS
}
switch f.Type().Kind() {
case reflect.Struct:
Expand Down
17 changes: 15 additions & 2 deletions struct_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,9 @@ func TestRegisterFunc_structArgs(t *testing.T) {
}
var Array4CharsFn func(chars Array4Chars) int32
purego.RegisterLibFunc(&Array4CharsFn, lib, "Array4Chars")
if ret := Array4CharsFn(Array4Chars{a: [...]int8{100, -127, 4, -100}}); ret != expectedSigned {
t.Fatalf("Array4CharsFn returned %#x wanted %#x", ret, expectedSigned)
const expectedSum = 1 + 2 + 4 + 8
if ret := Array4CharsFn(Array4Chars{a: [...]int8{1, 2, 4, 8}}); ret != expectedSum {
t.Fatalf("Array4CharsFn returned %d wanted %d", ret, expectedSum)
}
}
{
Expand Down Expand Up @@ -486,6 +487,18 @@ func TestRegisterFunc_structArgs(t *testing.T) {
t.Fatalf("FloatAndBool(y: false) = %d, want 0", ret)
}
}
{
type FourInt32s struct {
f0, f1, f2, f3 int32
}
var FourInt32sFn func(FourInt32s) int32
purego.RegisterLibFunc(&FourInt32sFn, lib, "FourInt32s")
result := FourInt32sFn(FourInt32s{100, -127, 4, -100})
const want = 100 - 127 + 4 - 100
if result != want {
t.Fatalf("FourInt32s returned %d wanted %d", result, want)
}
}
}

func TestRegisterFunc_structReturns(t *testing.T) {
Expand Down
15 changes: 14 additions & 1 deletion testdata/structtest/struct_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: 2024 The Ebitengine Authors

#include "stdint.h"
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>

#if defined(__x86_64__) || defined(__aarch64__)
typedef int64_t GoInt;
Expand Down Expand Up @@ -361,3 +363,14 @@ struct FloatAndBool {
int FloatAndBool(struct FloatAndBool f) {
return f.has_value;
}

struct FourInt32s {
int32_t f0;
int32_t f1;
int32_t f2;
int32_t f3;
};

int32_t FourInt32s(struct FourInt32s s) {
return s.f0 + s.f1 + s.f2 + s.f3;
}