Remove CRT dependency from Math plugin

Author: dbeinder

Contrib/Math/Math.txt

@@ -194,4 +194,28 @@ to perform flow controlled declaration.
 SUCH IS NOT POSSIBLE: "#[a<0, #func()(1), #func()(2)]"
 IT WILL SIMPLY DEFINE #func as (2), as the latest variant.
 
-(c) Nik Medved (brainsucker)
+(c) Nik Medved (brainsucker)
+
+
+
+XPRINTF LIBRARY
+Copyright (C) 2021, ChaN, all right reserved.
+
+xprintf module is an open source software. Redistribution and use of
+xprintf module in source and binary forms, with or without modification,
+are permitted provided that the following condition is met:
+1. Redistributions of source code must retain the above copyright notice,
+   this condition and the following disclaimer.
+This software is provided by the copyright holder and contributors "AS IS"
+and any warranties related to this software are DISCLAIMED.
+The copyright owner or contributors be NOT LIABLE for any damages caused
+by use of this software.
+
+
+
+MATH LIBRARY:
+Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+
+Developed at SunSoft, a Sun Microsystems, Inc. business.
+Permission to use, copy, modify, and distribute this
+software is freely granted, provided that this notice is preserved.

Contrib/Math/SConscript

@@ -4,6 +4,44 @@ files = Split("""
 	Source/Math.c
 	Source/MyMath.c
 	Source/plugin.c
+	Source/xprintf.c
+""")
+
+libm_files = Split("""
+	Source/mathlib/e_acos.c
+	Source/mathlib/e_atan2.c
+	Source/mathlib/e_asin.c
+	Source/mathlib/e_cosh.c
+	Source/mathlib/e_exp.c
+	Source/mathlib/e_fmod.c
+	Source/mathlib/e_log.c
+	Source/mathlib/e_log10.c
+	Source/mathlib/e_pow.c
+	Source/mathlib/e_rem_pio2.c
+	Source/mathlib/e_scalb.c
+	Source/mathlib/e_sinh.c
+	Source/mathlib/e_sqrt.c
+	Source/mathlib/isinf.c
+	Source/mathlib/k_cos.c
+	Source/mathlib/k_rem_pio2.c
+	Source/mathlib/k_sin.c
+	Source/mathlib/k_tan.c
+	Source/mathlib/s_atan.c
+	Source/mathlib/s_ceil.c
+	Source/mathlib/s_copysign.c
+	Source/mathlib/s_cos.c
+	Source/mathlib/s_expm1.c
+	Source/mathlib/s_fabs.c
+	Source/mathlib/s_finite.c
+	Source/mathlib/s_floor.c
+	Source/mathlib/s_frexp.c
+	Source/mathlib/s_isnan.c
+	Source/mathlib/s_modf.c
+	Source/mathlib/s_rint.c
+	Source/mathlib/s_scalbn.c
+	Source/mathlib/s_sin.c
+	Source/mathlib/s_tan.c
+	Source/mathlib/s_tanh.c
 """)
 
 libs = Split("""
@@ -22,6 +60,10 @@ docs = Split("""
 	Math.txt
 """)
 
+defines = ['__BIG_ENDIAN=4321', '__LITTLE_ENDIAN=1234', '__BYTE_ORDER=1234', 'lint=1']
+
 Import('BuildPlugin env')
 
-BuildPlugin(target, files, libs, examples, docs, nodeflib = False, flags = ['$CPP_FLAG'], entry = None)
+files += libm_files
+
+BuildPlugin(target, files, libs, examples, docs, nodeflib = False, flags = ['$CPP_FLAG'], defines = defines)

Contrib/Math/Source/Math.c

@@ -4,6 +4,7 @@
 #include <nsis/pluginapi.h> // nsis plugin
 #include "MyMath.h"
 #include "Math.h"
+#include "mathlib/math.h"
 
 extern "C" int _fltused;
 
@@ -1525,7 +1526,20 @@ void __declspec(dllexport) Script(HWND hwndParent, int string_size,
 }
 
 double _infinity;
-extern "C" void _fpreset();
+
+void FpuReset()
+{
+#if defined(_M_ARM ) || defined(__arm__)
+//TODO
+#else
+    #if defined(_MSC_VER)
+        __asm { finit }
+    #else
+        asm("finit");
+    #endif
+#endif
+}
+
 
 void CleanAll(int init)
 {
@@ -1534,7 +1548,7 @@ void CleanAll(int init)
     unsigned char _infinity_base[8] = {0, 0, 0, 0, 0, 0, 0xf0, 0x7f};
     _fltused = 0;
     _infinity = *((double*)(_infinity_base));
-    _fpreset();
+    FpuReset();
 
     stack = NULL;
     UserVarsCount = 0;
@@ -1564,3 +1578,22 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID
     return TRUE;
 }
 
+//TODO: use NSISdl/util.cpp?
+void *memset(void *mem, int c, size_t len)
+{
+  /*
+  ** Prevent MSVC 14.00.40310.41-AMD64 from generating a recursive call to memset
+  **
+  ** #pragma optimize("", off) + #pragma optimize("ty", on) can also
+  ** be used but it generates a lot more code.
+  */
+#if defined(_MSC_VER) && _MSC_VER > 1200 && _MSC_FULL_VER <= 140040310
+  volatile 
+#endif
+  char *p=(char*)mem;
+  while (len-- > 0)
+  {
+    *p++=c;
+  }
+  return mem;
+}

Contrib/Math/Source/MyMath.c

@@ -1,9 +1,9 @@
 // Unicode support by Jim Park -- 08/22/2007
 
 #include <windows.h>
-#include <stdio.h>
 #include "MyMath.h"
 #include "Math.h"
+#include "xprintf.h"
 
 // Converts String to Int (Dec, Hex) or Float value
 void StringToItem(TCHAR *&s, ExpressionItem *item, int options)
@@ -203,7 +203,7 @@ void itoa64(__int64 i, TCHAR *buffer)
 
 void FloatFormat(TCHAR *s, double value, int options)
 {
-    TCHAR format[128];
+    char format[32];
     int prec = options & 0xF;
 
     *s = 0;
@@ -219,22 +219,30 @@ void FloatFormat(TCHAR *s, double value, int options)
 
     if (options & FF_NOEXP)
     {
-        _stprintf(format, _T("%%.%df"), prec);
+        xsprintf(format, "%%.%df", prec);
     }
     else if (options & FF_EXP)
     {
-        _stprintf(format, _T("%%.%de"), prec);
+        xsprintf(format, "%%.%de", prec);
     }
     else if (options & FF_LEXP)
     {
-        _stprintf(format, _T("%%.%dE"), prec);
+        xsprintf(format, "%%.%dE", prec);
     }
     else
     {
-        _stprintf(format, _T("%%.%dg"), prec);
+        xsprintf(format, "%%.%dg", prec);
     }
 
-    _stprintf(s, format, value);
+#ifdef UNICODE
+    char buffer[128];
+    xsprintf(buffer, format, value);
+    int cnt = strlen(buffer);
+    for (int n = 0; n < cnt; n++) s[n] = buffer[n];
+    s[cnt] = 0;
+#else
+    xsprintf(s, format, value);
+#endif
 }
 
 int lstrcmpn(TCHAR *s1, const TCHAR *s2, int chars)

Contrib/Math/Source/MyMath.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <math.h>
+#include "mathlib/math.h"
 #include <float.h>
 #include <nsis/nsis_tchar.h>
 

SCons/Config/ms

@@ -42,6 +42,9 @@ if defenv['MSTOOLKIT'] and msvs_version < 8.0:
 if msvs_version >= 11.0:
 	defenv['SUBSYS_CON'] = '/subsystem:console,5.01' # support windows xp
 	defenv['SUBSYS_WIN'] = '/subsystem:windows,5.01' # support windows xp
+	defenv.Append(CCFLAGS = ['/Gy'])
+	defenv.Append(LINKFLAGS = ['/OPT:REF'])
+
 
 ### defines