Add support for -mfastcall

Author: th-otto

include/sys/gmon.h

@@ -173,8 +173,7 @@ extern struct gmonparam _gmonparam;
 __BEGIN_DECLS
 
 /* Set up data structures and start profiling.  */
-extern void monstartup (u_long __lowpc, u_long __highpc) __THROW;
-extern void __monstartup (u_long __lowpc, u_long __highpc) __THROW;
+extern void monstartup (void *__lowpc, void *__highpc) __THROW;
 
 /* Clean up profiling and write out gmon.out.  */
 extern void _mcleanup (void) __THROW;

mintlib/_normdf.S

@@ -1,4 +1,4 @@
-| mjr: not needed _normdf for -__M68881__ or the sfp004
+| mjr: not needed _normdf for -__HAVE_68881__ or the sfp004
 
 |#######################################################################
 
@@ -55,7 +55,7 @@
 	.even
 	.globl	C_SYMBOL_NAME(_infinitydf)
 
-#if !defined (__M68881__) && !defined (sfp004)
+#if !defined (__HAVE_68881__) && !defined (sfp004)
 	.globl	C_SYMBOL_NAME(__normdf)
 	.globl	C_SYMBOL_NAME(__norm_df)
 #include "errbase.h"
@@ -68,6 +68,7 @@ LC0:
 	| C entry, for procs dealing with the internal representation :
 	| double __normdf(long long mant, int exp, int sign, int rbits);
 C_SYMBOL_NAME(__normdf):
+/* note: long long value is passed on stack, even for -mfastcall */
 	lea	%sp@(4),%a0	| parameter pointer
 #ifdef __mcoldfire__
 	lea	%sp@(-24),%sp
@@ -80,17 +81,37 @@ C_SYMBOL_NAME(__normdf):
 #endif
 
 # ifdef __MSHORT__
+#ifdef __FASTCALL__
+#ifdef __mcoldfire__
+	movel   %d2,%d3
+	movel   %d1,%d2
+	movel   %d3,%d1
+#else
+	exg		%d1,%d2
+#endif
+#else
 	movew	%a0@+,%d0		| get exponent
 	movew	%a0@+,%d2		| get sign
 	movew	%a0@+,%d1		| rounding information
+#endif
 # else
+#ifdef __FASTCALL__
+#ifdef __mcoldfire__
+	movel   %d2,%d3
+	movel   %d1,%d2
+	movel   %d3,%d1
+#else
+	exg		%d1,%d2
+#endif
+#else
 	movel	%a0@+,%d0		| get exponent
 	movel	%a0@+,%d2		| get sign
+	movel	%a0@+,%d1		| rounding information
+#endif
+	tstl	%d2
 	jpl	0f		| or bit 31 to bit 15 for later tests
 	bset	#15,%d2
-0:	movel	%a0@+,%d1		| rounding information
-
-	movel	#0x7fff,%d3
+0:	movel	#0x7fff,%d3
 	cmpl	%d3,%d0		| test exponent
 	jgt	oflow
 	notl	%d3		| #-0x8000 -> d3
@@ -202,18 +223,18 @@ C_SYMBOL_NAME(__norm_df):
 #ifdef __mcoldfire__
 	cmpb	#0x80,%d1
 	jne	7f		| round up
-        movew   %d5,%d1           | tie case - round to even
-                                | dont need rounding bits any more
-        andl    #1,%d1           | check if even
+	movew   %d5,%d1           | tie case - round to even
+				| dont need rounding bits any more
+	andl    #1,%d1           | check if even
 #else
 	negb	%d1
 	jvc	7f		| round up
-        movew   %d5,%d1           | tie case - round to even
-                                | dont need rounding bits any more
-        andw    #1,%d1           | check if even
+	movew   %d5,%d1           | tie case - round to even
+				| dont need rounding bits any more
+	andw    #1,%d1           | check if even
 #endif
-        jeq     8f              | mantissa is even - no action necessary
-                                | fall through
+	jeq     8f              | mantissa is even - no action necessary
+				| fall through
 7:
 	clrl	%d1		| zero rounding bits
 	addl	#1,%d5
@@ -276,21 +297,27 @@ retzok:
 	movw	%d2,%d0
 	swap	%d0
 	andil	#0x80000000,%d0
-0:	moveml	%sp@,%d2-%d7
+	moveml	%sp@,%d2-%d7
 	lea	%sp@(24),%sp
 #else
 	lslw	#1,%d2		| set value of extension
 	roxrl	#1,%d0		| and move it to hight bit of d0
-0:	moveml	%sp@+,%d2-%d7
+	moveml	%sp@+,%d2-%d7
 #endif
 	rts
 
 oflow:
 #ifdef	ERROR_CHECK
+#ifdef __FASTCALL__
+	lea	%pc@(LC0),%a1
+	movel	Stderr,%a0
+	jbsr	C_SYMBOL_NAME(fprintf)	|
+#else
 	pea	%pc@(LC0)
 	movel	Stderr,%sp@-
 	jbsr	C_SYMBOL_NAME(fprintf)	|
-	addql	#8,%%sp		|
+	addql	#8,%sp		|
+#endif
 	moveq	#Erange,%d0
 	Emove	%d0,Errno
 #endif	/* ERROR_CHECK */
@@ -314,4 +341,4 @@ oflow:
 #endif
 	rts
 
-#endif /* __M68881__ */
+#endif /* __HAVE_68881__ */

mintlib/checkcpu.S

@@ -26,13 +26,19 @@
 
 	.globl	C_SYMBOL_NAME(_checkcpu)
 C_SYMBOL_NAME(_checkcpu):
-#ifdef __M68020__
+#if defined(__mc68020__) || defined(__mc68030__) || defined(__mc68040__) || defined(__mc68060__)
 	subql	#4,%sp			| Local variable for cookie value
 
+#ifdef __FASTCALL__
+	movl	%sp,%a0
+	movl	#0x5f435055,%d0	| "_CPU"
+	jsr	C_SYMBOL_NAME(Getcookie)
+#else
 	pea	%sp@
 	movl	#0x5f435055,%sp@-	| "_CPU"
 	jsr	C_SYMBOL_NAME(Getcookie)
 	addql	#8,%sp
+#endif
 
 	movel	%sp@+,%d1			| Cookie value
 
@@ -43,7 +49,7 @@ C_SYMBOL_NAME(_checkcpu):
 	bhss	.ok020			| CPU >= 68020
 
 .bad020:
-	pea	.err020			| Error message
+	pea	.err020(%pc)			| Error message
 	bra	.printexit
 
 .err020:
@@ -57,17 +63,23 @@ C_SYMBOL_NAME(_checkcpu):
 #ifdef __mcoldfire__
 	subql	#4,%sp			| Local variable for cookie value
 
+#ifdef __FASTCALL__
+	movl	%sp,%a0
+	movl	#0x5f43465f,%d0	| "_CF_"
+	jsr	C_SYMBOL_NAME(Getcookie)
+#else
 	pea	%sp@
 	movl	#0x5f43465f,%sp@-	| "_CF_"
 	jsr	C_SYMBOL_NAME(Getcookie)
 	addql	#8,%sp
+#endif
 
 	movel	%sp@+,%d1			| Cookie value
 
 	tstl	%d0
 	beqs	.okv4e			| _CF_ cookie found
 
-	pea	.errv4e			| Error message
+	pea	.errv4e(%pc)			| Error message
 	bra	.printexit
 
 .errv4e:
@@ -78,13 +90,19 @@ C_SYMBOL_NAME(_checkcpu):
 .okv4e:
 #endif
 
-#ifdef __M68881__
+#ifdef __HAVE_68881__
 	subql	#4,%sp			| Local variable for cookie value
 
+#ifdef __FASTCALL__
+	movl	%sp,%a0
+	movl	#0x5f465055,%d0	| "_FPU"
+	jsr	C_SYMBOL_NAME(Getcookie)
+#else
 	pea	%sp@
 	movl	#0x5f465055,%sp@-	| "_FPU"
 	jsr	C_SYMBOL_NAME(Getcookie)
 	addql	#8,%sp
+#endif
 
 	movel	%sp@+,%d1			| Cookie value
 
@@ -95,7 +113,7 @@ C_SYMBOL_NAME(_checkcpu):
 	bnes	.ok881			| FPU present
 
 .bad881:
-	pea	.err881			| Error message
+	pea	.err881(%pc)			| Error message
 	bra	.printexit
 
 .err881:
@@ -107,6 +125,7 @@ C_SYMBOL_NAME(_checkcpu):
 #endif
 	rts				| All requirements passed
 
+#if defined(__mc68020__) || defined(__mc68030__) || defined(__mc68040__) || defined(__mc68060__) || defined(__mcoldfire__) || defined(__HAVE_68881__)
 | Print a message then exit.
 | The message must have been pushed on the stack.
 .printexit:
@@ -117,3 +136,4 @@ C_SYMBOL_NAME(_checkcpu):
 	movew	#-1,%sp@-		| Failure
 	movew	#0x4c,%sp@-		| Pterm()
 	trap	#1
+#endif