Misc adjustments to avoid having to inline routines from .inc files

Author: mintsuki

.github/workflows/pack.yml

@@ -15,12 +15,9 @@ jobs:
 
       - name: Pack cc-runtime
         run: |
-          set -e
-          cat assembly.h int_endianness.h int_types.h int_lib.h int_util.h $(find . -name '*.c' | LC_ALL=C sort) > /tmp/cc-runtime.c
-          grep '#include <' /tmp/cc-runtime.c > /tmp/saved-includes
-          sed -i '/#include/d' /tmp/cc-runtime.c
-          cat /tmp/saved-includes /tmp/cc-runtime.c > /tmp/cc-runtime.c.tmp
-          mv /tmp/cc-runtime.c.tmp /tmp/cc-runtime.c
+          set -ex
+          ./pack.sh
+          mv cc-runtime.c /tmp/
 
       - name: Push packed cc-runtime
         run: |

.gitignore

@@ -0,0 +1,2 @@
+/cc-runtime.c
+/cc-runtime.o

clzdi2.c

@@ -22,9 +22,6 @@
 // On 64-bit architectures with neither a native clz instruction nor a native
 // ctz instruction, gcc resolves __builtin_clz to __clzdi2 rather than
 // __clzsi2, leading to infinite recursion.
-#ifdef __builtin_clz
-#undef __builtin_clz
-#endif
 #define __builtin_clz(a) __clzsi2(a)
 extern int __clzsi2(si_int);
 #endif

ctzdi2.c

@@ -22,9 +22,6 @@
 // On 64-bit architectures with neither a native clz instruction nor a native
 // ctz instruction, gcc resolves __builtin_ctz to __ctzdi2 rather than
 // __ctzsi2, leading to infinite recursion.
-#ifdef __builtin_ctz
-#undef __builtin_ctz
-#endif
 #define __builtin_ctz(a) __ctzsi2(a)
 extern int __ctzsi2(si_int);
 #endif

divdi3.c

@@ -22,3 +22,7 @@
 #include "int_div_impl.inc"
 
 COMPILER_RT_ABI di_int __divdi3(di_int a, di_int b) { return __divXi3(a, b); }
+
+#undef fixint_t
+#undef fixuint_t
+#undef COMPUTE_UDIV

divsi3.c

@@ -30,3 +30,7 @@ COMPILER_RT_ABI si_int __divsi3(si_int a, si_int b) { return __divXi3(a, b); }
 #if defined(__ARM_EABI__)
 COMPILER_RT_ALIAS(__divsi3, __aeabi_idiv)
 #endif
+
+#undef fixint_t
+#undef fixuint_t
+#undef COMPUTE_UDIV

divti3.c

@@ -25,4 +25,8 @@
 
 COMPILER_RT_ABI ti_int __divti3(ti_int a, ti_int b) { return __divXi3(a, b); }
 
+#undef fixint_t
+#undef fixuint_t
+#undef COMPUTE_UDIV
+
 #endif // CRT_HAS_128BIT

int_div_impl.inc

@@ -4,6 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
+// 2024/10/20 - Modified by mintsuki for use inside cc-runtime
+//
 //===----------------------------------------------------------------------===//
 //
 // Helpers used by __udivsi3, __umodsi3, __udivdi3, and __umodsi3.
@@ -12,6 +14,9 @@
 
 #define clz(a) (sizeof(a) == sizeof(unsigned long long) ? __builtin_clzll(a) : clzsi(a))
 
+#undef __udivXi3
+#define __udivXi3 __udivXi3__EXTERNAL_COUNTER
+
 // Adapted from Figure 3-40 of The PowerPC Compiler Writer's Guide
 static __inline fixuint_t __udivXi3(fixuint_t n, fixuint_t d) {
   const unsigned N = sizeof(fixuint_t) * CHAR_BIT;
@@ -41,6 +46,9 @@ static __inline fixuint_t __udivXi3(fixuint_t n, fixuint_t d) {
   return n;
 }
 
+#undef __umodXi3
+#define __umodXi3 __umodXi3__EXTERNAL_COUNTER
+
 // Mostly identical to __udivXi3 but the return values are different.
 static __inline fixuint_t __umodXi3(fixuint_t n, fixuint_t d) {
   const unsigned N = sizeof(fixuint_t) * CHAR_BIT;
@@ -69,7 +77,12 @@ static __inline fixuint_t __umodXi3(fixuint_t n, fixuint_t d) {
   return r;
 }
 
+#undef __divXi3
+
 #ifdef COMPUTE_UDIV
+
+#define __divXi3 __divXi3__EXTERNAL_COUNTER
+
 static __inline fixint_t __divXi3(fixint_t a, fixint_t b) {
   const int N = (int)(sizeof(fixint_t) * CHAR_BIT) - 1;
   fixint_t s_a = a >> N;                            // s_a = a < 0 ? -1 : 0
@@ -81,7 +94,12 @@ static __inline fixint_t __divXi3(fixint_t a, fixint_t b) {
 }
 #endif // COMPUTE_UDIV
 
+#undef __modXi3
+
 #ifdef ASSIGN_UMOD
+
+#define __modXi3 __modXi3__EXTERNAL_COUNTER
+
 static __inline fixint_t __modXi3(fixint_t a, fixint_t b) {
   const int N = (int)(sizeof(fixint_t) * CHAR_BIT) - 1;
   fixint_t s = b >> N;                              // s = b < 0 ? -1 : 0
@@ -93,3 +111,5 @@ static __inline fixint_t __modXi3(fixint_t a, fixint_t b) {
   return (res ^ s) + (-s);                          // negate if s == -1
 }
 #endif // ASSIGN_UMOD
+
+#undef clz

int_mulo_impl.inc

@@ -4,6 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
+// 2024/10/20 - Modified by mintsuki for use inside cc-runtime
+//
 //===----------------------------------------------------------------------===//
 //
 // Helper used by __mulosi4, __mulodi4 and __muloti4.
@@ -16,6 +18,9 @@
 
 // Effects: sets *overflow to 1  if a * b overflows
 
+#undef __muloXi4
+#define __muloXi4 __muloXi4__EXTERNAL_COUNTER
+
 static __inline fixint_t __muloXi4(fixint_t a, fixint_t b, int *overflow) {
   const int N = (int)(sizeof(fixint_t) * CHAR_BIT);
   const fixint_t MIN = (fixint_t)((fixuint_t)1 << (N - 1));

int_mulv_impl.inc

@@ -4,6 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
+// 2024/10/20 - Modified by mintsuki for use inside cc-runtime
+//
 //===----------------------------------------------------------------------===//
 //
 // Helper used by __mulvsi3, __mulvdi3 and __mulvti3.
@@ -16,6 +18,9 @@
 
 // Effects: aborts if a * b overflows
 
+#undef __mulvXi3
+#define __mulvXi3 __mulvXi3__EXTERNAL_COUNTER
+
 static __inline fixint_t __mulvXi3(fixint_t a, fixint_t b) {
   const int N = (int)(sizeof(fixint_t) * CHAR_BIT);
   const fixint_t MIN = (fixint_t)((fixuint_t)1 << (N - 1));