SPE fixes. Some other fixes for gcc6

AmigaLabs · Jul 13, 2023 · cf8c530 · cf8c530
1 parent e5e9b4f
commit cf8c530
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 27 deletions.
diff --git a/GNUmakefile.os4 b/GNUmakefile.os4
@@ -117,8 +117,8 @@ AFLAGS     := -Wa,-mregnames
 
 ifdef SPE
     CC := ppc-amigaos-gcc-6.4.0
-    CFLAGS := $(CFLAGS) -DSPE -mspe -mcpu=8540 -mfloat-gprs=double -mabi=spe -fno-inline-functions -fno-partial-inlining \
-                -fno-align-functions -fno-align-jumps -fno-align-loops -fno-align-labels -fno-inline-small-functions -fno-indirect-inlining
+    CFLAGS := $(CFLAGS) -DSPE -D_SOFT_FLOAT -D__SPE__ -mspe -mcpu=8540 -mfloat-gprs=double -mabi=spe -fno-inline-functions -fno-partial-inlining \
+                -fno-align-functions -fno-align-jumps -fno-align-loops -fno-align-labels -fno-inline-small-functions -fno-indirect-inlining -Wno-unused-but-set-variable -Wno-uninitialized
     AFLAGS := $(AFLAGS) -mspe -mcpu=8540 -mfloat-gprs=double
 endif
 
@@ -295,6 +295,12 @@ $(VERBOSE)echo -e "\rAssembling altivec \033[0;33m[$(@D)]\033[0m \r\t\t\t\t\t\t\
 $(VERBOSE)$(CC) -maltivec -mabi=altivec -mvrsave -mregnames -DVRSAVE -o $@ -c $< $(LOG_COMMAND)
 endef
 
+define COMPILE_SPE_REG
+$(VERBOSE)@$(MAKEDIR) $(@D)
+$(VERBOSE)echo -e "\rAssembling with regnames \033[0;33m[$(@D)]\033[0m \r\t\t\t\t\t\t\t\t\t\t\t \033[0;31m$(@F)\033[0m"
+$(VERBOSE)$(CC) -mvrsave -mregnames -DVRSAVE -mspe -mcpu=8540 -mfloat-gprs=double -o $@ -c $< $(LOG_COMMAND)
+endef
+
 define COMPILE_SPE
 $(VERBOSE)@$(MAKEDIR) $(@D)
 $(VERBOSE)echo -e "\rCompiling SPE \033[0;33m[$(@D)]\033[0m \r\t\t\t\t\t\t\t\t\t\t\t \033[0;31m$(@F)\033[0m"

diff --git a/libc.gmk b/libc.gmk
@@ -954,9 +954,6 @@ OBJ_C_SRC += $(patsubst %.o, $(LIB_DIR)/%.c, $(C_LIBRARY))
 $(OUT_STATIC)/c.lib_rev.o : $(LIB_DIR)/c.lib_rev.c $(LIB_DIR)/c.lib_rev.h
 $(OUT_SHARED)/c.lib_rev.o : $(LIB_DIR)/c.lib_rev.c $(LIB_DIR)/c.lib_rev.h
 
-$(OUT_STATIC)/cpu/spe/%.o : $(LIB_DIR)/cpu/spe/%.S
-	$(VERBOSE)$(COMPILE_SPE)
-
 $(OUT_STATIC)/%.o : $(LIB_DIR)/%.sx
 	$(VERBOSE)$(COMPILE_ALTIVEC_REG)
 $(OUT_STATIC)/%.o : $(LIB_DIR)/%.S

diff --git a/library/cpu/spe/memcmpE500.S b/library/cpu/spe/memcmpE500.S
@@ -55,7 +55,7 @@
 	.file	"memcmp.S"
 	.section	".text"
 	.align 4
-	#define FUNCTION e500_memcmp
+	#define FUNCTION __memcmp_e500
 	.globl FUNCTION
 	.type FUNCTION,@function
 FUNCTION:

diff --git a/library/include/dos.h b/library/include/dos.h
@@ -501,6 +501,9 @@ struct _clib2 {
 
     BPTR error;
     BPTR old_error;
+
+    /* termcap */
+    char tgoto_buf[50];
 };
 
 #ifndef __getClib2

diff --git a/library/include/fenv.h b/library/include/fenv.h
@@ -142,7 +142,7 @@ fetestexcept(int __excepts) {
 
 __fenv_static inline int
 fegetround(void) {
-    union __fpscr __r;
+    union __fpscr __r = {0};
 
     __mffs(&__r.__d);
     return (__r.__bits.__reg & _ROUND_MASK);

diff --git a/library/libc_init_global.c b/library/libc_init_global.c
@@ -228,6 +228,7 @@ reent_init(struct _clib2 *__clib2) {
         /* We use an invalid priority value to indicate "do not change the program's task priority". */
         .__priority = 256,
         .pipenum = 0,
+        .tgoto_buf = {0},
 #ifdef DISABLE_OPTIMIZED_FUNCTIONS_AT_START
         .__optimizedCPUFunctions = FALSE,
 #else

diff --git a/library/math/fabs.c b/library/math/fabs.c
@@ -1,29 +1,35 @@
 /*
- * $Id: math_fabs.c,v 1.9 2021-01-31 12:04:23 clib2devs Exp $
+ * $Id: math_fabs.c,v 1.10 2023-07-13 12:04:23 clib2devs Exp $
 */
 
 #ifndef _MATH_HEADERS_H
 #include "math_headers.h"
 #endif /* _MATH_HEADERS_H */
 
-INLINE STATIC double
-__fabs(double x)
-{
-	double res;
+inline static double
+__fabs(double x) {
+#ifndef _SOFT_FLOAT
+    double res;
 
-	__asm volatile("fabs %0, %1"
-				   : "=f"(res)
-				   : "f"(x));
+    __asm volatile("fabs %0, %1"
+                   : "=f"(res)
+                   : "f"(x));
 
-	return res;
+    return res;
+#else
+    uint32_t high;
+    GET_HIGH_WORD(high, x);
+    SET_HIGH_WORD(x, high & 0x7fffffff);
+
+    return x;
+#endif
 }
 
 double
-fabs(double x)
-{
-	double result;
+fabs(double x) {
+    double result;
 
-	result = __fabs(x);
+    result = __fabs(x);
 
-	return (result);
+    return (result);
 }
diff --git a/library/ndbm/hash_buf.c b/library/ndbm/hash_buf.c
@@ -63,7 +63,7 @@ __get_buf(HTAB *hashp, uint32_t addr,
     BUFHEAD *bp;
     uint32_t is_disk_mask;
     int is_disk, segment_ndx;
-    SEGMENT segp;
+    SEGMENT segp = NULL;
 
     is_disk = 0;
     is_disk_mask = 0;
@@ -92,7 +92,7 @@ __get_buf(HTAB *hashp, uint32_t addr,
         if (!bp ||
             __get_page(hashp, bp->page, addr, !prev_bp, is_disk, 0))
             return (NULL);
-        if (!prev_bp)
+        if (!prev_bp && segp != NULL)
             segp[segment_ndx] =
                     (BUFHEAD *) ((ptrdiff_t) bp | is_disk_mask);
     } else {

diff --git a/library/stat/utimensat.c b/library/stat/utimensat.c
@@ -146,7 +146,8 @@ int utimensat(int fd, const char *path, const struct timespec times[2], int flag
          * Changing symlink time or regular file will always change both files
          */
         if (isLink && FLAG_IS_SET(flags, AT_SYMLINK_FOLLOW)) {
-            struct DevProc *dvp = GetDeviceProc(buffer, dvp);
+            struct DevProc *dvp = NULL;
+            dvp = GetDeviceProc(buffer, dvp);
             if (dvp == NULL) {
                 free(buffer);
                 goto out;

diff --git a/library/termcap/tparam.c b/library/termcap/tparam.c
@@ -72,8 +72,6 @@ tparam(const char *string, char *outstring, int len, int arg0, int arg1, int arg
     return tparam1(string, outstring, len, NULL, NULL, arg);
 }
 
-static char tgoto_buf[50] = {0};
-
 char *
 tgoto(const char *string, int hpos, int vpos) {
     int args[2];
@@ -84,7 +82,7 @@ tgoto(const char *string, int hpos, int vpos) {
 
     args[0] = vpos;
     args[1] = hpos;
-    return tparam1(string, tgoto_buf, 50, __clib2->__UP, __clib2->__BC, args);
+    return tparam1(string, __clib2->tgoto_buf, 50, __clib2->__UP, __clib2->__BC, args);
 }
 
 static char *

diff --git a/shared.gmk b/shared.gmk
@@ -33,6 +33,9 @@ $(OUT_SHARED_LIB)/%.o : $(LIB_DIR)/%.sx
 $(OUT_SHARED_LIB)/cpu/generic/%.o : $(LIB_DIR)/cpu/generic/%.S
 	$(VERBOSE)$(COMPILE_REG)
 
+$(OUT_SHARED_LIB)/cpu/spe/%.o : $(LIB_DIR)/cpu/spe/%.S
+	$(VERBOSE)$(COMPILE_SPE_REG)
+
 $(OUT_SHARED_LIB)/%.o : $(LIB_DIR)/%.S
 	$(VERBOSE)$(COMPILE_ASM)