Update the emscripten version to 2.0.23

.github/workflows/build.yml

@@ -55,10 +55,10 @@ jobs:
     - run: |
         git clone https://github.com/juj/emsdk.git
         cd emsdk
-        git checkout 369013943283939412fb2807bb0d2ded8ebd5a9e
+        git checkout f44b84154703d29a946d51ddee08f4e5725a61db
     - run: |
-        emsdk/emsdk install 1.39.5-fastcomp
-        emsdk/emsdk activate 1.39.5-fastcomp
+        emsdk/emsdk install 2.0.23
+        emsdk/emsdk activate 2.0.23
     - run: . emsdk/emsdk_env.sh && emcc -v
 
     # Build web
@@ -118,10 +118,10 @@ jobs:
     - run: |
         git clone https://github.com/juj/emsdk.git
         cd emsdk
-        git checkout 369013943283939412fb2807bb0d2ded8ebd5a9e
+        git checkout f44b84154703d29a946d51ddee08f4e5725a61db
     - run: |
-        emsdk\emsdk install 1.39.5-fastcomp
-        emsdk\emsdk activate 1.39.5-fastcomp
+        emsdk\emsdk install 2.0.23
+        emsdk\emsdk activate 2.0.23
     - run: emsdk\emsdk_env.ps1 && emcc -v
 
     # Build web-windows
@@ -263,4 +263,4 @@ jobs:
         upload_url: ${{ needs.setup.outputs.upload_url }}
         asset_name: ${{ env.ESH_64_RELEASE }}
         asset_path: ${{ env.ESH_64_RELEASE }}
-        asset_content_type: application/zip
+        asset_content_type: application/zip

.gitignore

@@ -44,6 +44,7 @@ Vireo_VS/VireoCommandLine.sln.DotSettings.user
 **.opendb
 **.suo
 .vscode/
+.vs/*
 
 # Other
 c_cpp_properties.json

docs/Build.md

@@ -47,8 +47,8 @@ The emsdk toolchain is used to cross-compile Vireo to Vireo.js to run in Node.js
 3. From the cloned emsdk repository run the following commands:
 
    ```console
-   emsdk install 1.39.5-fastcomp
-   emsdk activate 1.39.5-fastcomp
+   emsdk install 2.0.23
+   emsdk activate 2.0.23
    emcc -v # should match the sdk version
    ```
 

make-it/EmMakefile

@@ -72,7 +72,7 @@ EMCC= emcc
 EM_OPTFLAG = -O3
 
 ifeq ($(BUILD), debug)
-   EM_OPTFLAG = -g4 -s ASSERTIONS=2 -s SAFE_HEAP=1
+   EM_OPTFLAG = -g -s ASSERTIONS=2 -s SAFE_HEAP=1
 endif
 
 ifeq ($(BUILD), profile)
@@ -92,11 +92,11 @@ ifeq ($(TARGET), asmjs-unknown-emscripten)
 endif
 
 ifeq ($(TARGET), wasm32-unknown-emscripten)
-   TARGET_FLAG = -s WASM=1 -s BINARYEN_TRAP_MODE=js -s ALLOW_MEMORY_GROWTH=1
+   TARGET_FLAG = -s WASM=1 -s ALLOW_MEMORY_GROWTH=1
 endif
 
 # NO_DYNAMIC_EXECUTION=1 Allows Vireo to be used in CSP environments where eval() is forbidden: https://github.com/kripken/emscripten/blob/master/src/settings.js#L563
-EM_OPT = $(EM_OPTFLAGS) $(TARGET_FLAG) -s NO_EXIT_RUNTIME=1 -std=c++14 -fno-exceptions -Werror --memory-init-file 0 -s NO_DYNAMIC_EXECUTION=1 -s MODULARIZE=1 -s EXPORT_NAME=VireoCreateCoreModule -s EXPORT_ES6=1 -s USE_ES6_IMPORT_META=0 --minify 0 -s NO_FILESYSTEM=1 -s ABORTING_MALLOC=0
+EM_OPT = $(EM_OPTFLAGS) $(TARGET_FLAG) -std=c++14 -fno-exceptions -Werror --memory-init-file 0 -s NO_DYNAMIC_EXECUTION=1 -s MODULARIZE=1 -s EXPORT_NAME=VireoCreateCoreModule -s EXPORT_ES6=1 -s USE_ES6_IMPORT_META=0 --minify 0 -s NO_FILESYSTEM=1 -s ABORTING_MALLOC=0
 EMFLAGS = -I$(INCDIR) -DkVireoOS_emscripten $(EM_OPT)
 EMLIBRARY = --js-library $(CORESOURCEDIR)/library_coreHelpers.js \
             --js-library $(CORESOURCEDIR)/library_eventHelpers.js \
@@ -111,7 +111,7 @@ EM_EXPORTS = -s EXPORTED_FUNCTIONS="[\
     '_free' \
     ]"
 
-EM_RUNTIME_EXPORTS = -s EXTRA_EXPORTED_RUNTIME_METHODS="[\
+EM_RUNTIME_EXPORTS = -s EXPORTED_RUNTIME_METHODS="[\
 	'lengthBytesUTF8', \
 	'stackAlloc', \
 	'stackSave', \

make-it/EmMakefile-AAL

@@ -35,7 +35,7 @@ ifeq (,$(wildcard $(ANALYSIS_WRAPPERS_SOURCE_DIRECTORY)/AnalysisWrapper*.cpp))
 ANALYSIS_LIBRARY = $(OBJS)/NoAnalysisLibrary.bc
 $(OBJS)/NoAnalysisLibrary.bc: | no-analysis
 	touch $(OBJS)/NoAnalysis.cpp
-	$(EMCC) $(EM_ANALYSIS_FLAGS) -o $@ $(OBJS)/NoAnalysis.cpp
+	$(EMCC) $(EM_ANALYSIS_FLAGS) -o $@ $(OBJS)/NoAnalysis.cpp -c
 	rm $(OBJS)/NoAnalysis.cpp
 
 no-analysis::
@@ -94,7 +94,7 @@ help:
 
 EMCC= emcc
 EM_OPTFLAG = -Os
-EM_OPT= $(EM_OPT_FLAG) -s NO_EXIT_RUNTIME=1 -fno-exceptions --memory-init-file 0
+EM_OPT= $(EM_OPT_FLAG) -s -fno-exceptions --memory-init-file 0
 EMFLAGS= -I$(INCDIR) -DkVireoOS_emscripten -DVIREO_LEAN $(EM_OPT)
 EMLIBRARY= --js-library $(IOSOURCEDIR)/library_canvas2d.js --js-library $(IOSOURCEDIR)/library_httpClient.js
 EM_WRAP= --pre-js $(CORESOURCEDIR)/vireo.preamble.js --post-js $(CORESOURCEDIR)/vireo.postamble.js

source/core/Array.cpp

@@ -189,11 +189,11 @@ VIREO_FUNCTION_SIGNATUREV(ArrayFillNDV, ArrayFillNDVParamBlock)
             tempDimensionLengths[i] = 0;
     }
 
-    _Param(ArrayOut)->ResizeDimensions(numDimensionInputs, tempDimensionLengths, false);
-
-    IntIndex totalLength = _Param(ArrayOut)->Length();
-    TypeRef eltType = array->ElementType();
-    eltType->MultiCopyData(_ParamPointer(InitialValue), array->RawBegin(), totalLength);
+    if (_Param(ArrayOut)->ResizeDimensions(numDimensionInputs, tempDimensionLengths, false)) {
+        IntIndex totalLength = _Param(ArrayOut)->Length();
+        TypeRef eltType = array->ElementType();
+        eltType->MultiCopyData(_ParamPointer(InitialValue), array->RawBegin(), totalLength);
+    }
 
     return _NextInstruction();
 }

source/core/TypeAndDataManager.cpp

@@ -2453,8 +2453,7 @@ Boolean TypedArrayCore::ResizeDimensions(Int32 rank, IntIndex *dimensionLengths,
     }
 
     // 3. If more actual elements are needed, initialize the new ones (or all of them if requested)
-    // TODO(PaulAustin): honor bOK status.
-    if (!preserveElements) {
+    if (!preserveElements && bOK) {
         ElementType()->InitData(BeginAt(0), newLength);
     } else if ((newLength > originalLength) && !noInit && bOK) {
         ElementType()->InitData(BeginAt(originalLength), (newLength - originalLength));
@@ -2637,7 +2636,8 @@ IntMax ReadIntFromMemory(TypeRef type, void* pData)
                 case 0: value = 0;                              break;
                 case 4: {
                     Single singleVal = RoundToEven(*(Single*)pData);
-                    if (singleVal >= std::numeric_limits<IntMax>::max())
+                    Single intMax = (Single)(std::numeric_limits<IntMax>::max());
+                    if (singleVal >= intMax)
                         // >= is actually correct here because Int64 max isn't representable as a single and rounds up.
                         value = std::numeric_limits<IntMax>::max();
                     else if (singleVal <= std::numeric_limits<IntMax>::min())
@@ -2648,7 +2648,8 @@ IntMax ReadIntFromMemory(TypeRef type, void* pData)
                 }
                 case 8: {
                     Double doubleVal = RoundToEven(*(Double*)pData);
-                    if (doubleVal >= std::numeric_limits<IntMax>::max())
+                    Double intMax = (Double)(std::numeric_limits<IntMax>::max());
+                    if (doubleVal >= intMax)
                         // >= is actually correct here because Int64 max isn't representable as a double and rounds up.
                         value = std::numeric_limits<IntMax>::max();
                     else if (doubleVal <= std::numeric_limits<IntMax>::min())
@@ -2845,9 +2846,9 @@ NIError WriteDoubleToMemory(TypeRef type, void* pData, const Double value)
         case kEncoding_S2CInt:
         case kEncoding_DimInt:
             switch (aqSize) {
-                case 1:  *(Int8*)pData = (Int8)value;      break;
-                case 2:  *(Int16*)pData = (Int16)value;     break;
-                case 4:  *(Int32*)pData = (Int32)value;     break;
+                case 1:  *(Int8*)pData = ConvertDoubleToInt<Int8>(value);     break;
+                case 2:  *(Int16*)pData = ConvertDoubleToInt<Int16>(value);   break;
+                case 4:  *(Int32*)pData = ConvertDoubleToInt<Int32>(value);   break;
                 case 8:  *(Int64*)pData = (Int64)value;     break;
                 default: err = kNIError_kCantEncode;        break;
             }
@@ -2861,9 +2862,9 @@ NIError WriteDoubleToMemory(TypeRef type, void* pData, const Double value)
         case kEncoding_UInt:
         case kEncoding_Enum:
             switch (aqSize) {
-                case 1:  *(UInt8*)pData = (Int8)value;     break;
-                case 2:  *(UInt16*)pData = (UInt16)value;   break;
-                case 4:  *(UInt32*)pData = (UInt32)value;   break;
+                case 1:  *(UInt8*)pData = ConvertDoubleToInt<UInt8>(value);     break;
+                case 2:  *(UInt16*)pData = ConvertDoubleToInt<UInt16>(value);   break;
+                case 4:  *(UInt32*)pData = ConvertDoubleToInt<UInt32>(value);   break;
                 case 8:  *(UInt64*)pData = (UInt64)value;   break;
                 default: err = kNIError_kCantEncode;        break;
             }

source/include/TypeAndDataManager.h

@@ -366,20 +366,39 @@ template <typename TSource, typename TDest>
 TDest ConvertFloatToInt(TSource src)
 {
     TDest dest;
+    TSource maxDestValue = static_cast<TSource>(std::numeric_limits<TDest>::max());
     if (std::isnan(src)) {
         dest = std::numeric_limits<TDest>::max();
     } else if (std::isinf(src)) {
         dest = src < 0 ? std::numeric_limits<TDest>::min() : std::numeric_limits<TDest>::max();
     } else if (src < std::numeric_limits<TDest>::min()) {
         dest = std::numeric_limits<TDest>::min();
-    } else if (src > std::numeric_limits<TDest>::max()) {
+    } else if (src > maxDestValue) {
         dest = std::numeric_limits<TDest>::max();
     } else {
         dest = static_cast<TDest>(RoundToEven(src));
     }
     return dest;
 }
 
+template <typename TDest>
+TDest ConvertDoubleToInt(Double src)
+{
+    TDest dest;
+    Double maxDestValue = static_cast<Double>(std::numeric_limits<TDest>::max());
+    if (std::isnan(src) || std::isinf(src)) {
+        dest = 0;
+    } else if (src < std::numeric_limits<TDest>::min() || src > maxDestValue) {
+        IntMax range = IntMax(std::numeric_limits<TDest>::max()) + 1;
+        IntMax modValue = static_cast<IntMax>(fmod(src, range));
+        IntMax noOfRange = static_cast<IntMax>(src/range);
+        dest = static_cast<TDest>((noOfRange & 1) ? std::numeric_limits<TDest>::min() + modValue: modValue);
+    } else {
+        dest = (TDest)src;
+    }
+    return dest;
+}
+
 //------------------------------------------------------------
 //! Stack based class to manage a threads active TypeManager.
 class TypeManagerScope