From 81e1be8d90ea6537d790549d11504d1992961e28 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Sat, 4 Jan 2025 22:54:54 +0800 Subject: [PATCH 1/2] Revert "temporarily disable the default S/DSCAL kernel" This reverts commit 9b9c0aa5c9ab08df01fb5acfe83a50b4c7ce6bdd. --- kernel/power/KERNEL.PPC970 | 3 --- 1 file changed, 3 deletions(-) diff --git a/kernel/power/KERNEL.PPC970 b/kernel/power/KERNEL.PPC970 index d8e8c66466..fee5fa5290 100644 --- a/kernel/power/KERNEL.PPC970 +++ b/kernel/power/KERNEL.PPC970 @@ -89,6 +89,3 @@ DROTKERNEL = ../arm/rot.c CROTKERNEL = ../arm/zrot.c ZROTKERNEL = ../arm/zrot.c endif - -SSCALKERNEL = ../arm/scal.c -DSCALKERNEL = ../arm/scal.c From 229efa42ffc2d0623062f1646f72ad9beb71f2cc Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Sun, 5 Jan 2025 00:31:27 +0800 Subject: [PATCH 2/2] scal.S: use r11 on 32-bit Darwin on powerpc --- kernel/power/scal.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/power/scal.S b/kernel/power/scal.S index 5e92a88aa1..eceb9fe8ed 100644 --- a/kernel/power/scal.S +++ b/kernel/power/scal.S @@ -59,7 +59,7 @@ #if !defined(__64BIT__) && defined(DOUBLE) #define X r8 #define INCX r9 -#define FLAG r13 +#define FLAG r11 #else #define X r7 #define INCX r8 @@ -91,7 +91,7 @@ fcmpu cr0, FZERO, ALPHA bne- cr0, LL(A1I1) - ld FLAG, 48+64+8(SP) + LDLONG FLAG, 48+64+8(SP) cmpwi cr0, FLAG, 1 beq- cr0, LL(A1I1)