detached e5188d3

Revert "remove unnecessary separation (#204)"

This reverts commit eff418c3e3191a8f0f43ca303d809bb54bd2d1f9.

Reason: test fails on Arm Windows

Closes #205
commit
e5188d34036c2346456a4b119c1df21aea1fc649
author
Hajime Hoshi · · 2024-01-21 06:15 UTC
parent
eff418c
signature
unsigned
refs
tag: v0.6.0-alpha.4
2 files · +71 -64
Unified
UnifiedSplit
M sys_arm64.s +1 -64
@@ -1,12 +1,11 @@
11 // SPDX-License-Identifier: Apache-2.0
22 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
33
4-//go:build darwin || freebsd || linux
4+//go:build darwin || freebsd || linux || windows
55
66 #include "textflag.h"
77 #include "go_asm.h"
88 #include "funcdata.h"
9-#include "abi_arm64.h"
109
1110 #define STACK_SIZE 64
1211 #define PTR_ADDRESS (STACK_SIZE - 8)
@@ -84,65 +83,3 @@ TEXT syscall15X(SB), NOSPLIT, $0
8483 MOVD R0, syscall15Args_r1(R2) // save r1
8584 FMOVD F0, syscall15Args_r2(R2) // save r2
8685 RET
87-
88-TEXT callbackasm1(SB), NOSPLIT|NOFRAME, $0
89- NO_LOCAL_POINTERS
90-
91- // On entry, the trampoline in zcallback_darwin_arm64.s left
92- // the callback index in R12 (which is volatile in the C ABI).
93-
94- // Save callback register arguments R0-R7 and F0-F7.
95- // We do this at the top of the frame so they're contiguous with stack arguments.
96- SUB $(16*8), RSP, R14
97- FSTPD (F0, F1), (0*8)(R14)
98- FSTPD (F2, F3), (2*8)(R14)
99- FSTPD (F4, F5), (4*8)(R14)
100- FSTPD (F6, F7), (6*8)(R14)
101- STP (R0, R1), (8*8)(R14)
102- STP (R2, R3), (10*8)(R14)
103- STP (R4, R5), (12*8)(R14)
104- STP (R6, R7), (14*8)(R14)
105-
106- // Adjust SP by frame size.
107- SUB $(26*8), RSP
108-
109- // It is important to save R27 because the go assembler
110- // uses it for move instructions for a variable.
111- // This line:
112- // MOVD ·callbackWrap_call(SB), R0
113- // Creates the instructions:
114- // ADRP 14335(PC), R27
115- // MOVD 388(27), R0
116- // R27 is a callee saved register so we are responsible
117- // for ensuring its value doesn't change. So save it and
118- // restore it at the end of this function.
119- // R30 is the link register. crosscall2 doesn't save it
120- // so it's saved here.
121- STP (R27, R30), 0(RSP)
122-
123- // Create a struct callbackArgs on our stack.
124- MOVD $(callbackArgs__size)(RSP), R13
125- MOVD R12, callbackArgs_index(R13) // callback index
126- MOVD R14, callbackArgs_args(R13) // address of args vector
127- MOVD ZR, callbackArgs_result(R13) // result
128-
129- // Move parameters into registers
130- // Get the ABIInternal function pointer
131- // without <ABIInternal> by using a closure.
132- MOVD ·callbackWrap_call(SB), R0
133- MOVD (R0), R0 // fn unsafe.Pointer
134- MOVD R13, R1 // frame (&callbackArgs{...})
135- MOVD $0, R3 // ctxt uintptr
136-
137- BL crosscall2(SB)
138-
139- // Get callback result.
140- MOVD $(callbackArgs__size)(RSP), R13
141- MOVD callbackArgs_result(R13), R0
142-
143- // Restore LR and R27
144- LDP 0(RSP), (R27, R30)
145- ADD $(26*8), RSP
146-
147- RET
148-
@@ -1,12 +1,11 @@
1 // SPDX-License-Identifier: Apache-2.01 // SPDX-License-Identifier: Apache-2.0
2 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors2 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
3 3
4-//go:build darwin || freebsd || linux4+//go:build darwin || freebsd || linux || windows
5 5
6 #include "textflag.h"6 #include "textflag.h"
7 #include "go_asm.h"7 #include "go_asm.h"
8 #include "funcdata.h"8 #include "funcdata.h"
9-#include "abi_arm64.h"
10 9
11 #define STACK_SIZE 6410 #define STACK_SIZE 64
12 #define PTR_ADDRESS (STACK_SIZE - 8)11 #define PTR_ADDRESS (STACK_SIZE - 8)
@@ -84,65 +83,3 @@ TEXT syscall15X(SB), NOSPLIT, $0
84 MOVD R0, syscall15Args_r1(R2) // save r183 MOVD R0, syscall15Args_r1(R2) // save r1
85 FMOVD F0, syscall15Args_r2(R2) // save r284 FMOVD F0, syscall15Args_r2(R2) // save r2
86 RET85 RET
87-
88-TEXT callbackasm1(SB), NOSPLIT|NOFRAME, $0
89- NO_LOCAL_POINTERS
90-
91- // On entry, the trampoline in zcallback_darwin_arm64.s left
92- // the callback index in R12 (which is volatile in the C ABI).
93-
94- // Save callback register arguments R0-R7 and F0-F7.
95- // We do this at the top of the frame so they're contiguous with stack arguments.
96- SUB $(16*8), RSP, R14
97- FSTPD (F0, F1), (0*8)(R14)
98- FSTPD (F2, F3), (2*8)(R14)
99- FSTPD (F4, F5), (4*8)(R14)
100- FSTPD (F6, F7), (6*8)(R14)
101- STP (R0, R1), (8*8)(R14)
102- STP (R2, R3), (10*8)(R14)
103- STP (R4, R5), (12*8)(R14)
104- STP (R6, R7), (14*8)(R14)
105-
106- // Adjust SP by frame size.
107- SUB $(26*8), RSP
108-
109- // It is important to save R27 because the go assembler
110- // uses it for move instructions for a variable.
111- // This line:
112- // MOVD ·callbackWrap_call(SB), R0
113- // Creates the instructions:
114- // ADRP 14335(PC), R27
115- // MOVD 388(27), R0
116- // R27 is a callee saved register so we are responsible
117- // for ensuring its value doesn't change. So save it and
118- // restore it at the end of this function.
119- // R30 is the link register. crosscall2 doesn't save it
120- // so it's saved here.
121- STP (R27, R30), 0(RSP)
122-
123- // Create a struct callbackArgs on our stack.
124- MOVD $(callbackArgs__size)(RSP), R13
125- MOVD R12, callbackArgs_index(R13) // callback index
126- MOVD R14, callbackArgs_args(R13) // address of args vector
127- MOVD ZR, callbackArgs_result(R13) // result
128-
129- // Move parameters into registers
130- // Get the ABIInternal function pointer
131- // without <ABIInternal> by using a closure.
132- MOVD ·callbackWrap_call(SB), R0
133- MOVD (R0), R0 // fn unsafe.Pointer
134- MOVD R13, R1 // frame (&callbackArgs{...})
135- MOVD $0, R3 // ctxt uintptr
136-
137- BL crosscall2(SB)
138-
139- // Get callback result.
140- MOVD $(callbackArgs__size)(RSP), R13
141- MOVD callbackArgs_result(R13), R0
142-
143- // Restore LR and R27
144- LDP 0(RSP), (R27, R30)
145- ADD $(26*8), RSP
146-
147- RET
148-
A sys_unix_arm64.s +70 -0
@@ -0,0 +1,70 @@
1+// SPDX-License-Identifier: Apache-2.0
2+// SPDX-FileCopyrightText: 2023 The Ebitengine Authors
3+
4+//go:build darwin || freebsd || linux
5+
6+#include "textflag.h"
7+#include "go_asm.h"
8+#include "funcdata.h"
9+#include "abi_arm64.h"
10+
11+TEXT callbackasm1(SB), NOSPLIT|NOFRAME, $0
12+ NO_LOCAL_POINTERS
13+
14+ // On entry, the trampoline in zcallback_darwin_arm64.s left
15+ // the callback index in R12 (which is volatile in the C ABI).
16+
17+ // Save callback register arguments R0-R7 and F0-F7.
18+ // We do this at the top of the frame so they're contiguous with stack arguments.
19+ SUB $(16*8), RSP, R14
20+ FSTPD (F0, F1), (0*8)(R14)
21+ FSTPD (F2, F3), (2*8)(R14)
22+ FSTPD (F4, F5), (4*8)(R14)
23+ FSTPD (F6, F7), (6*8)(R14)
24+ STP (R0, R1), (8*8)(R14)
25+ STP (R2, R3), (10*8)(R14)
26+ STP (R4, R5), (12*8)(R14)
27+ STP (R6, R7), (14*8)(R14)
28+
29+ // Adjust SP by frame size.
30+ SUB $(26*8), RSP
31+
32+ // It is important to save R27 because the go assembler
33+ // uses it for move instructions for a variable.
34+ // This line:
35+ // MOVD ·callbackWrap_call(SB), R0
36+ // Creates the instructions:
37+ // ADRP 14335(PC), R27
38+ // MOVD 388(27), R0
39+ // R27 is a callee saved register so we are responsible
40+ // for ensuring its value doesn't change. So save it and
41+ // restore it at the end of this function.
42+ // R30 is the link register. crosscall2 doesn't save it
43+ // so it's saved here.
44+ STP (R27, R30), 0(RSP)
45+
46+ // Create a struct callbackArgs on our stack.
47+ MOVD $(callbackArgs__size)(RSP), R13
48+ MOVD R12, callbackArgs_index(R13) // callback index
49+ MOVD R14, callbackArgs_args(R13) // address of args vector
50+ MOVD ZR, callbackArgs_result(R13) // result
51+
52+ // Move parameters into registers
53+ // Get the ABIInternal function pointer
54+ // without <ABIInternal> by using a closure.
55+ MOVD ·callbackWrap_call(SB), R0
56+ MOVD (R0), R0 // fn unsafe.Pointer
57+ MOVD R13, R1 // frame (&callbackArgs{...})
58+ MOVD $0, R3 // ctxt uintptr
59+
60+ BL crosscall2(SB)
61+
62+ // Get callback result.
63+ MOVD $(callbackArgs__size)(RSP), R13
64+ MOVD callbackArgs_result(R13), R0
65+
66+ // Restore LR and R27
67+ LDP 0(RSP), (R27, R30)
68+ ADD $(26*8), RSP
69+
70+ RET
@@ -0,0 +1,70 @@
1+// SPDX-License-Identifier: Apache-2.0
2+// SPDX-FileCopyrightText: 2023 The Ebitengine Authors
3+
4+//go:build darwin || freebsd || linux
5+
6+#include "textflag.h"
7+#include "go_asm.h"
8+#include "funcdata.h"
9+#include "abi_arm64.h"
10+
11+TEXT callbackasm1(SB), NOSPLIT|NOFRAME, $0
12+ NO_LOCAL_POINTERS
13+
14+ // On entry, the trampoline in zcallback_darwin_arm64.s left
15+ // the callback index in R12 (which is volatile in the C ABI).
16+
17+ // Save callback register arguments R0-R7 and F0-F7.
18+ // We do this at the top of the frame so they're contiguous with stack arguments.
19+ SUB $(16*8), RSP, R14
20+ FSTPD (F0, F1), (0*8)(R14)
21+ FSTPD (F2, F3), (2*8)(R14)
22+ FSTPD (F4, F5), (4*8)(R14)
23+ FSTPD (F6, F7), (6*8)(R14)
24+ STP (R0, R1), (8*8)(R14)
25+ STP (R2, R3), (10*8)(R14)
26+ STP (R4, R5), (12*8)(R14)
27+ STP (R6, R7), (14*8)(R14)
28+
29+ // Adjust SP by frame size.
30+ SUB $(26*8), RSP
31+
32+ // It is important to save R27 because the go assembler
33+ // uses it for move instructions for a variable.
34+ // This line:
35+ // MOVD ·callbackWrap_call(SB), R0
36+ // Creates the instructions:
37+ // ADRP 14335(PC), R27
38+ // MOVD 388(27), R0
39+ // R27 is a callee saved register so we are responsible
40+ // for ensuring its value doesn't change. So save it and
41+ // restore it at the end of this function.
42+ // R30 is the link register. crosscall2 doesn't save it
43+ // so it's saved here.
44+ STP (R27, R30), 0(RSP)
45+
46+ // Create a struct callbackArgs on our stack.
47+ MOVD $(callbackArgs__size)(RSP), R13
48+ MOVD R12, callbackArgs_index(R13) // callback index
49+ MOVD R14, callbackArgs_args(R13) // address of args vector
50+ MOVD ZR, callbackArgs_result(R13) // result
51+
52+ // Move parameters into registers
53+ // Get the ABIInternal function pointer
54+ // without <ABIInternal> by using a closure.
55+ MOVD ·callbackWrap_call(SB), R0
56+ MOVD (R0), R0 // fn unsafe.Pointer
57+ MOVD R13, R1 // frame (&callbackArgs{...})
58+ MOVD $0, R3 // ctxt uintptr
59+
60+ BL crosscall2(SB)
61+
62+ // Get callback result.
63+ MOVD $(callbackArgs__size)(RSP), R13
64+ MOVD callbackArgs_result(R13), R0
65+
66+ // Restore LR and R27
67+ LDP 0(RSP), (R27, R30)
68+ ADD $(26*8), RSP
69+
70+ RET

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 1

Tags 102

↑↓ moveenter openesc close