perf: improve copies in InFunction

Author: jodavies

sources/proces.c

@@ -2174,7 +2174,8 @@ int InFunction(PHEAD WORD *term, WORD *termout)
 		if ( AR.TePos ) {
 			if ( ( term + AR.TePos ) == t ) {
 				m = termout;
-				while ( from < t ) *m++ = *from++;
+				LONG copy = t - from;
+				NCOPY(m, from, copy);
 				*m++ = DENOMINATOR;
 				*m++ = t[1] + 4 + FUNHEAD + ARGHEAD;
 				*m++ = DIRTYFLAG;
@@ -2185,7 +2186,8 @@ int InFunction(PHEAD WORD *term, WORD *termout)
 				*m++ = t[1] + 4;
 				t[3] = -t[3];
 				v = t + t[1];
-				while ( t < v ) *m++ = *t++;
+				copy = v - t;
+				NCOPY(m, t, copy);
 				from[3] = -from[3];
 				*m++ = 1;
 				*m++ = 1;
@@ -2220,11 +2222,10 @@ int InFunction(PHEAD WORD *term, WORD *termout)
 					AR.DeferFlag = 0;
 					v = t + *t;
 					t += ARGHEAD;		/* First term */
-					w = 0;	/* to appease the compilers warning devices */
-					while ( from < t ) {
-						if ( from == u ) w = m;
-						*m++ = *from++;
-					}
+					LONG copy = t - from;
+					const LONG size = t - u;
+					NCOPY(m, from, copy);
+					w = m - size;
 					to = m;
 					NewSort(BHEAD0);
 					if ( *u == AR.PolyFun && AR.PolyFunType == 2 ) {
@@ -2314,11 +2315,10 @@ int InFunction(PHEAD WORD *term, WORD *termout)
 						&& ( *u != AR.PolyFun ) ) { AN.ncmod = 0; }
 					AR.DeferFlag = 0;
 					v = t + 2;
-					w = 0;	/* to appease the compilers warning devices */
-					while ( from < t ) {
-						if ( from == u ) w = m;
-						*m++ = *from++;
-					}
+					LONG copy = t - from;
+					const LONG size = t - u;
+					NCOPY(m, from, copy);
+					w = m - size;
 					to = m;
 					switch ( d->type ) {
 						case DOLINDEX:
@@ -2481,11 +2481,10 @@ int InFunction(PHEAD WORD *term, WORD *termout)
 					u points at the start of the function
 					t points at the start of the argument
 */
-					w = 0;
-					while ( from < t ) {
-						if ( from == u ) w = m;
-						*m++ = *from++;
-					}
+					LONG copy = t - from;
+					const LONG size = t - u;
+					NCOPY(m, from, copy);
+					w = m - size;
 					if ( ( numterms & MAXPOSITIVE ) == numterms ) {
 						*m++ = -SNUMBER; *m++ =  numterms & MAXPOSITIVE;
 						w[1] += 1;
@@ -2505,7 +2504,8 @@ int InFunction(PHEAD WORD *term, WORD *termout)
 					}
 					from++;  /* Skip our function */
 					r = term + *term;
-					while ( from < r ) *m++ = *from++;
+					copy = r - from;
+					NCOPY(m, from, copy);
 					if ( (m-termout) > (LONG)(AM.MaxTer/sizeof(WORD)) ) {
 						MLOCK(ErrorMessageLock);
 						MesPrint("Output term too large (%d words) (MaxTermSize: %d words)", m-termout, AM.MaxTer/sizeof(WORD));
@@ -2548,11 +2548,11 @@ int InFunction(PHEAD WORD *term, WORD *termout)
 					if ( ( AN.ncmod != 0 )
 						&& ( ( AC.modmode & ALSOFUNARGS ) == 0 )
 						&& ( *u != AR.PolyFun ) ) { AN.ncmod = 0; }
-					m = termout; w = 0;
-					while ( from < t ) {
-						if ( from == u ) w = m;
-						*m++ = *from++;
-					}
+					m = termout;
+					LONG copy = t - from;
+					const LONG size = t - u;
+					NCOPY(m, from, copy);
+					w = m - size;
 					to = m;
 					switch ( d->type ) {
 						case DOLINDEX:
@@ -2650,7 +2650,8 @@ wrongtype:;
 					w[1] = w[1] - 2 + (m-to);
 					from += 2;
 					term += *term;
-					while ( from < term ) *m++ = *from++;
+					copy = term - from;
+					NCOPY(m, from, copy);
 					if ( sign < 0 ) m[-1] = -m[-1];
 					if ( (m-termout) > (LONG)(AM.MaxTer/sizeof(WORD)) ) {
 						MLOCK(ErrorMessageLock);