GWnum 30.7

Author: patnashev

src/Llr.h

@@ -3,8 +3,8 @@
 
 /* Constants */
 
-#define LLR_VERSION		"1.1.1"
-#define LLR_VERSIONC	1,1,1
+#define LLR_VERSION		"1.2.0"
+#define LLR_VERSIONC	1,2,0
 
 /* Global variables */
 

src/gwnum/gwnum.h

@@ -2,7 +2,7 @@
 | This file contains various utility routines that may be used by gwnum
 | setup.
 |
-|  Copyright 2011-2020 Mersenne Research, Inc.  All rights reserved.
+|  Copyright 2011-2021 Mersenne Research, Inc.  All rights reserved.
 +---------------------------------------------------------------------*/
 
 #ifndef _GWTABLES_H
@@ -124,7 +124,7 @@ struct gwasm_data {
 	void	*sincos5;
 	gwthread hyperthread_id;	/* Thread ID of prefetching hyperthread */
 	gwevent hyperthread_work_to_do;	/* Event to signal hyperthread to begin prefetching */
-	void	*UNUSED_PTRS[1];
+	void	*SRC3ARG;		/* Function argument */
 	uint32_t *ASM_TIMERS;		/* Timers used for optimizing code */
 
 	uint32_t COPYZERO[8];		/* Offsets to help in gwcopyzero */

src/gwnum/gwtables.h

@@ -2,7 +2,7 @@
 | This file contains various utility routines that may be used by gwnum
 | routines, prime95, or other consumers of gwnum.
 | 
-|  Copyright 2004-2020 Mersenne Research, Inc.  All rights reserved.
+|  Copyright 2004-2021 Mersenne Research, Inc.  All rights reserved.
 +---------------------------------------------------------------------*/
 
 #ifndef _GWUTIL_H
@@ -17,12 +17,12 @@ extern "C" {
 
 /* Handy macros to improve readability */
 
-#define CONST_LOG2			0.69314718055994530941723212145818
-#define CONST_ONE_OVER_LOG2		1.4426950408889634073599246810019
-#define log2(n)				(log((double)(n)) * CONST_ONE_OVER_LOG2)
-#define log2f(n)			(logf((float)(n)) * (float) CONST_ONE_OVER_LOG2)
-#define logb(n)				(log((double)(n)) / log ((double)(b)))
-#define divide_rounding_up(a,b)		((a + (b) - 1) / (b))
+//These are now included in math.h
+//#define CONST_LOG2			0.69314718055994530941723212145818
+//#define CONST_ONE_OVER_LOG2		1.4426950408889634073599246810019
+//#define log2(n)			(log((double)(n)) * CONST_ONE_OVER_LOG2)
+//#define log2f(n)			(logf((float)(n)) * (float) CONST_ONE_OVER_LOG2)
+#define divide_rounding_up(a,b)		(((a) + (b) - 1) / (b))
 #define divide_rounding_down(a,b)	((a) / (b))
 #define round_up_to_multiple_of(a,b)	(divide_rounding_up (a, b) * (b))
 #define round_down_to_multiple_of(a,b)	(divide_rounding_down (a, b) * (b))
@@ -39,11 +39,7 @@ extern "C" {
 
 /* Align a pointer to the given boundary (boundary must be a power of 2) */
 
-#ifdef _WIN64
-#define align_ptr(p,n)	(void *) (((uint64_t)(p) + (n)-1) & ~((n)-1))
-#else
-#define align_ptr(p,n)	(void *) (((long)(p) + (n)-1) & ~((n)-1))
-#endif
+#define align_ptr(p,n)	(void *) (((intptr_t)(p) + (n)-1) & ~((n)-1))
 
 /* Aligned malloc routines.  MSVC 8 supports these in the C runtime library. */
 /* Emulate these routines for other ports. */
@@ -57,6 +53,9 @@ void  aligned_free (void *ptr);
 int large_pages_supported ();
 void * large_pages_malloc (size_t size);
 void large_pages_free (void *ptr);
+void * aligned_offset_large_pages_malloc (size_t size, size_t alignment, size_t mod);
+void * aligned_large_pages_malloc (size_t size, size_t alignment);
+void aligned_large_pages_free (void *ptr);
 
 /* Utility string routines */
 

src/gwnum/gwutil.h

@@ -214,6 +214,13 @@ int main (
 	(void)signal(SIGTERM, sigterm_handler);
 	(void)signal(SIGINT, sigterm_handler);
 
+/* suppress assert() window */
+
+#if defined(_MSC_VER) && !defined(_DEBUG)
+    _set_error_mode(_OUT_TO_STDERR);
+    _set_abort_behavior(0, _CALL_REPORTFAULT);
+#endif
+
 /* Process command line switches */
 
 	for (i = 1; i < argc; i++) {

src/gwnum/linux64/gwnum.a

@@ -2406,6 +2406,7 @@ struct KBNTest TestGFN13[] = {
 { 1, 995766, 8192, 0xE6BE4C71A27EB26AULL, 0x4A68173579E55EB1ULL },
 { 1, 1013856, 8192, 0x4980E196738F7945ULL, 0x2C2BF81690537DA9ULL },
 { 1, 1031814, 8192, 0xF69D385EFD328C4BULL, 0x528129EE0CADFEF1ULL },
+{ 1, 1034546, 8192, 0x0AFF1BE76F82FB30ULL, 0x3EB5267EEDC5D167ULL },
 { 1, 1049514, 8192, 0xCA058B0C619A1903ULL, 0xA457E756C169D0BEULL },
 { 1, 1067244, 8192, 0x1907760B4930738AULL, 0x94E879324024C36CULL },
 { 1, 1085262, 8192, 0x9D6C61101B0DF559ULL, 0xFB3DB4FD3B6F3C1BULL },
@@ -3559,7 +3560,6 @@ struct KBNTest TestGFN13More[] = {
 { 1, 1030888, 8192, 0x10F896E076EA19C3ULL, 0xC1D5F4F0CE82E575ULL },
 { 1, 1032782, 8192, 0x6C09FBEDE87BC8FEULL, 0xDEF2DB895859ED27ULL },
 { 1, 1033652, 8192, 0xD185D5D616F05681ULL, 0xA0554D9C70856CA1ULL },
-{ 1, 1034546, 8192, 0x0AFF1BE76F82FB30ULL, 0x3EB5267EEDC5D167ULL },
 { 1, 1035382, 8192, 0x6D0FB0E098E51713ULL, 0x478D96FAD297D6FEULL },
 { 1, 1036270, 8192, 0xE4E686B0636BE6DCULL, 0xA34D6218650966E4ULL },
 { 1, 1037160, 8192, 0x516F1BA93D5484ACULL, 0xFEDA55A08C79CBD3ULL },