authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-06 17:26:40+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-10-06 17:26:40+02:00
log148b5b4c7806a694084f1e6f9514b0333cb75c6a
treec007c9dbe9a3b5155c5e7d639378e695019902bf
parentece265b1c23202adedfdfdbbcb537ba4e81801d1
parent665d0157d5f333ebc6b353703e77661b11bcac8c
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #21608 from mikdusan/ppc64

ppc64: get further along into system bootstrap

2 files changed, 6 insertions(+), 5 deletions(-)

lib/std/os/linux/powerpc64.zig+5-5
......@@ -48,7 +48,7 @@ pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize {
4848 : [number] "{r0}" (@intFromEnum(number)),
4949 [arg1] "{r3}" (arg1),
5050 [arg2] "{r4}" (arg2),
51 : "memory", "cr0", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12"
51 : "memory", "cr0", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12"
5252 );
5353}
5454
......@@ -63,7 +63,7 @@ pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize {
6363 [arg1] "{r3}" (arg1),
6464 [arg2] "{r4}" (arg2),
6565 [arg3] "{r5}" (arg3),
66 : "memory", "cr0", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12"
66 : "memory", "cr0", "r6", "r7", "r8", "r9", "r10", "r11", "r12"
6767 );
6868}
6969
......@@ -79,7 +79,7 @@ pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize)
7979 [arg2] "{r4}" (arg2),
8080 [arg3] "{r5}" (arg3),
8181 [arg4] "{r6}" (arg4),
82 : "memory", "cr0", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12"
82 : "memory", "cr0", "r7", "r8", "r9", "r10", "r11", "r12"
8383 );
8484}
8585
......@@ -96,7 +96,7 @@ pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize,
9696 [arg3] "{r5}" (arg3),
9797 [arg4] "{r6}" (arg4),
9898 [arg5] "{r7}" (arg5),
99 : "memory", "cr0", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12"
99 : "memory", "cr0", "r8", "r9", "r10", "r11", "r12"
100100 );
101101}
102102
......@@ -122,7 +122,7 @@ pub fn syscall6(
122122 [arg4] "{r6}" (arg4),
123123 [arg5] "{r7}" (arg5),
124124 [arg6] "{r8}" (arg6),
125 : "memory", "cr0", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12"
125 : "memory", "cr0", "r9", "r10", "r11", "r12"
126126 );
127127}
128128
lib/std/start.zig+1
......@@ -391,6 +391,7 @@ fn _start() callconv(.Naked) noreturn {
391391 \\ stdu 0, -32(1)
392392 \\ mtlr 0
393393 \\ b %[posixCallMainAndExit]
394 \\ nop
394395 ,
395396 .s390x =>
396397 // Set up the stack frame (register save area and cleared back-chain slot).