v0.1.0 commit

Author: Erik McClure

.gitignore

@@ -29,8 +29,9 @@
 /innative-test/Win32/
 /innative-loader/Win32/
 /innative-stub/Win32/
-/innative-setup/obj/
-/innative-setup/IncludeFileList.wxs
-/innative-setup/ScriptFileList.wxs
-/innative-setup/CoreFileList.wxs
+/innative-runtime-setup/obj/
+/innative-sdk-setup/obj/
+/innative-sdk-setup/IncludeFileList.wxs
+/innative-sdk-setup/ScriptFileList.wxs
+/innative-sdk-setup/CoreFileList.wxs
 /.vs/

Makefile

@@ -27,10 +27,10 @@ else
 CPPFLAGS += -DNDEBUG -march=native -O3
 endif
 
-debug: innative-env innative innative-cmd innative-test
-all: innative-env innative innative-cmd innative-test
+debug: innative-env innative innative-cmd innative-test innative-stub
+all: innative-env innative innative-cmd innative-test innative-stub
 
-clean: innative-env-clean innative-clean innative-cmd-clean innative-test-clean
+clean: innative-env-clean innative-clean innative-cmd-clean innative-test-clean innative-stub-clean
 	#$(RM) -r $(LIBDIR)
 	#$(RM) -r $(BINDIR)
 	$(RM) -r $(OBJDIR)
@@ -56,10 +56,11 @@ dist: all
 	mv innative-posix-runtime-x64/* innative-posix-sdk-x64/bin/
 	rm -r innative-posix-runtime-x64/
 	cp bin/innative-test innative-posix-sdk-x64/bin/
+	cp bin/innative-stub.a innative-posix-sdk-x64/bin/
 	cp include/innative/*.h innative-posix-sdk-x64/include/innative/
 	cp scripts/*.wat innative-posix-sdk-x64/scripts/
 	cp scripts/*.wasm innative-posix-sdk-x64/scripts/
-	cp spec/test/core/* innative-posix-sdk-x64/spec/test/core/
+	cp spec/test/core/*.wast innative-posix-sdk-x64/spec/test/core/
 	tar -czf innative-posix-sdk-x64.tar.gz innative-posix-sdk-x64/
 	rm -r innative-posix-sdk-x64/
 
@@ -78,3 +79,4 @@ include innative-env/Makefile
 include innative/Makefile
 include innative-cmd/Makefile
 include innative-test/Makefile
+include innative-stub/Makefile

README.md

@@ -15,7 +15,7 @@ Precompiled binaries for common platforms are provided in [releases](https://git
 ### Command Line Utility
 The inNative SDK comes with a command line utility with many useful features for webassembly developers.
 
-    Usage: innative-cmd [-r] [-c] [-i] [-u] [-v] [-f FLAG...] [-l FILE] [-L FILE] [-o FILE] [-a FILE] [-d PATH] [-s [FILE]] [-w [MODULE:]FUNCTION] FILE...
+    Usage: innative-cmd [-r] [-c] [-i [lite]] [-u] [-v] [-f FLAG...] [-l FILE] [-L FILE] [-o FILE] [-a FILE] [-d PATH] [-j PATH] [-s [FILE]] [-w [MODULE:]FUNCTION] FILE...
       -r : Run the compiled result immediately and display output. Requires a start function.
       -f <FLAG>: Set a supported flag to true. Flags:
              sandbox, homogenize, llvm, strict, whitelist, multithreaded, library, noinit, debug, check_stack_overflow, check_float_trunc, check_memory_access, check_indirect_call, check_int_division, disable_tail_call
@@ -25,11 +25,12 @@ The inNative SDK comes with a command line utility with many useful features for
       -o <FILE> : Sets the output path for the resulting executable or library.
       -a <FILE> : Specifies an alternative linker to use instead of LLD.
       -d <PATH> : Sets the directory that contains the SDK library and data files.
+      -j <PATH> : Sets the directory for temporary object files and intermediate compilation results.
       -e <MODULE> : Sets the environment/system module name. Any functions with the module name will have the module name stripped when linking with C functions.
       -s [<FILE>] : Serializes all modules to .wat files. <FILE> can specify the output if only one module is present.
       -w <[MODULE:]FUNCTION> : whitelists a given C import, does name-mangling if the module is specified.
-      -c : Assumes the input files are actually LLVM IR files and compiles them into a single webassembly module.
-      -i : Installs this innative SDK to the host operating system.
+      -g : Instead of compiling immediately, creates a loader embedded with all the modules, environments, and settings, which compiles the modules on-demand when run.  -c : Assumes the input files are actually LLVM IR files and compiles them into a single webassembly module.
+      -i [lite]: Installs this SDK to the host operating system. On Windows, also updates file associations unless 'lite' is specified.
       -u : Uninstalls and deregisters this SDK from the host operating system.
       -v : Turns on verbose logging.
 
@@ -43,7 +44,7 @@ LLVM uses CMake to build, but CMake currently has issues with the nested LLD pro
 All build steps start with `git submodule update --init --recursive`. This is **mandatory** because of nested git submodules that the project relies on. If you get errors, be sure to double check that you have acquired `llvm`, `llvm/tools/lld`, `spec`, and `spec/document/core/util/katex`.
 
 ### Windows
-Regardless of whether you are using Visual Studio 2017 or 2019, **make sure you have the v141_xp toolkit installed**, first. Run `build-llvm.ps1` if you have Visual Studio 2019, or run `build-llvm.ps1 2017` if you have Visual Studio 2017, and wait for it to complete. If the script was successful, open `innative.sln` in Visual Studio and build the project, or run `msbuild innative.sln`. **Visual Studio 2019 broke MSBuild outside the developer prompt, so you'll have to open the .sln file and manually compile Debug and MinSizeRel yourself, or run `build-llvm.ps1` inside a developer prompt.**
+Regardless of whether you are using Visual Studio 2017 or 2019, **make sure you have the v141_xp toolkit installed**, first. Run `build-llvm.ps1` if you have Visual Studio 2019, or run `build-llvm.ps1 2017` if you have Visual Studio 2017, and wait for it to complete. If the script was successful, open `innative.sln` in Visual Studio and build the project, or run `msbuild innative.sln`. **Visual Studio 2019 broke MSBuild outside the developer prompt, so you'll have to open the .sln file and manually compile Debug and MinSizeRel yourself.**
 
 The script downloads a portable cmake and python3 into the `bin` directory. If you would rather run the commands yourself, have existing installations of cmake/python, or want to modify the LLVM compilation flags, you can run the commands for your version of Visual Studio yourself:
 
@@ -88,9 +89,9 @@ A prebuilt version of this image is [available here](https://cloud.docker.com/u/
 
 ## Targeting inNative
 
-No compiler fully supports inNative, because current WebAssembly compilers target *web embeddings* and make assumptions about which functions are available. For now, try building webassembly modules that have no dependencies, as these can always be run on any webassembly implementation. True C interop is provided via two special compiler functions, `_innative_to_c` and `_innative_from_c`. These can be used to acquire C pointers to WebAssembly memory to pass to other functions, and to convert C pointers into a form that can be manipulated by WebAssembly. **However**, it is not possible to safely manipulate outside memory pointers, so `_innative_` pointers can only be accessed when not in strict mode.
+No compiler fully supports inNative, because current WebAssembly compilers target *web embeddings* and make assumptions about which functions are available. For now, try building webassembly modules that have no dependencies, as these can always be run on any webassembly implementation. True C interop is provided via two special compiler functions, `_innative_to_c` and `_innative_from_c`. These can be used to acquire C pointers to WebAssembly memory to pass to other functions, and to convert C pointers into a form that can be manipulated by WebAssembly. **However**, it is not possible to safely manipulate outside memory pointers, so `_innative_` pointers can only be accessed when not in strict mode. inNative also provides a [custom `cref` extension](https://github.com/innative-sdk/innative/wiki/inNative-cref-Extension) that automatically converts WebAssembly indexes into C pointers for external C functions.
 
-The host-object proposal will make it easier to target native C environments, and hopefully compilers will make it easier to target non-web embeddings of WebAssembly.
+The [WebIDL bindings proposal](https://github.com/WebAssembly/webidl-bindings) will make it easier to target native C environments, and hopefully compilers will make it easier to target non-web embeddings of WebAssembly.
 
 ## Embedding inNative
 
@@ -99,24 +100,29 @@ inNative is compiled as either a dynamic or static library, and can be integrate
     // Create the environment, setting the dynamic library flag
     IRExports exports;
     innative_runtime(&exports);
-    Environment* env = (*exports.CreateEnvironment)(1, 0, argv[0]);
-    env->flags |= ENV_DLL; // Add ENV_NO_INIT if you want to manually initialize and cleanup the DLL.
+    Environment* env = (*exports.CreateEnvironment)(1, 0, (!argc ? 0 : argv[0]));
+    env->flags |= ENV_LIBRARY; // Add ENV_NO_INIT if you want to manually initialize and cleanup the DLL.
 
     // Add the script you want to compile
     int err;
     (*exports.AddModule)(env, "your_script.wasm", 0, "your_script", &err);
 
     // Add the default static library and any additional libraries you want to expose to the script
-    int err = (*exports.AddEmbedding)(env, 0, (void*)INNATIVE_DEFAULT_ENVIRONMENT, 0);
- 
+    err = (*exports.AddEmbedding)(env, 0, (void*)INNATIVE_DEFAULT_ENVIRONMENT, 0);
+
+    err = (*exports.FinalizeEnvironment)(env);
+    
     // Compile and dynamically load the result
     err = (*exports.Compile)(env, "your_script.out");
-    void* assembly = (*exports.LoadAssembly)(flags, "your_script.out");
+    void* assembly = (*exports.LoadAssembly)("your_script.out");
 
-    // Destroy environment
+    // Destroy environment (no longer needed after compilation is completed)
     (*exports.DestroyEnvironment)(env);
 
     // Load functions and execute
     void (*update_entity)(int) = (void (*)(int))(*exports.LoadFunction)(assembly, "your_module", "update_entity");
 
-    (*update_entity)(0); 
+    (*update_entity)(0);
+    
+    // Free assembly once finished
+    (*exports.FreeAssembly)(assembly);

include/innative/path.h

@@ -35,7 +35,7 @@ namespace innative {
       const char* start = _path.c_str();
       const char* pos = strchr(start, SEPERATOR);
 #ifdef IN_PLATFORM_WIN32
-      return pos != nullptr && pos == start + 2 && pos[-1] == ':';
+      return (start[0] == SEPERATOR && start[1] == SEPERATOR) || (pos != nullptr && pos == start + 2 && pos[-1] == ':');
 #elif defined(IN_PLATFORM_POSIX)
       return pos != nullptr && pos == start;
 #endif

innative-loader/loader.c

@@ -126,7 +126,7 @@ int main(int argc, char** argv)
 #endif
 
     // Then create the runtime environment with the module count.
-    Environment* env = (*exports.CreateEnvironment)(modules, maxthreads, argv[0]);
+    Environment* env = (*exports.CreateEnvironment)(modules, maxthreads, (!argc ? 0 : argv[0]));
     if(!env)
     {
       fprintf(stderr, "Unknown error creating environment.\n");

innative-runtime-setup/Product.wxs

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?if $(var.Platform)="x86" ?>
+  <?define ProgramFilesFolder="ProgramFilesFolder" ?>
+  <?define Win64="no" ?>
+  <?elseif $(var.Platform)="x64" ?>
+  <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
+  <?define Win64="yes" ?>
+  <?else ?>
+  <?error Unknown value for Platform variable ?>
+  <?endif ?>
+
+  <?define Version="0.1.0" ?>
+  <Product 
+    Id="6A27F179-BADF-4580-821D-2892F229F335"
+    Name="inNative Runtime v$(var.Version)" 
+    Language="1033" 
+    Version="$(var.Version).0"
+    Manufacturer="Black Sphere Studios" 
+    UpgradeCode="aac979e9-ba48-44c0-aea8-40fef1176d57">
+    
+    <Package 
+      Description='inNative Runtime Installer $(var.Platform)'
+      Comments="Performs a full installation of the inNative Runtime"
+      Manufacturer="Black Sphere Studios" 
+      InstallerVersion="300"
+      Compressed="yes"
+      InstallScope="perMachine"
+      InstallPrivileges="elevated"
+      Platform="$(var.Platform)"/>
+    
+    <MediaTemplate EmbedCab="yes" CompressionLevel="high"/>
+    <WixVariable Id="WixUILicenseRtf" Value="../innative-sdk-setup/LICENSE.rtf" />
+    <WixVariable Id="WixUIBannerBmp" Value="../innative-sdk-setup/innative-banner.png" />
+    <WixVariable Id="WixUIDialogBmp" Value="../innative-sdk-setup/innative-panel.png" />
+    
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="$(var.ProgramFilesFolder)">
+        <Directory Id="INNATIVEFOLDER" Name="inNative">
+          <Directory Id="INSTALLFOLDER" Name="Runtime v$(var.Version)"/>
+        </Directory>
+      </Directory>
+    </Directory>
+    
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+    <UIRef Id="WixUI_InstallDir" />
+
+    <ComponentGroup Id="inNativeBinGroup" Directory="INSTALLFOLDER">
+      <Component Id="inNativeBin" Guid="48f2f751-ecf6-4f3e-8cb3-848df261404e">
+        <File Id="innative.cmd.exe" Name="innative-cmd.exe" Source="$(var.innative.TargetDir)innative-cmd.exe" KeyPath="yes" Checksum="yes"/>
+        <File Id="innative.cmd.d.exe" Name="innative-cmd-d.exe" Source="$(var.innative.TargetDir)innative-cmd-d.exe" Checksum="yes"/>
+        <File Id="innative.d.dll" Name="innative-d.dll" Source="$(var.innative.TargetDir)innative-d.dll"/>
+        <File Id="innative.env.d.lib" Name="innative-env-d.lib" Source="$(var.innative.TargetDir)innative-env-d.lib"/>
+        <File Id="innative.env.lib" Name="innative-env.lib" Source="$(var.innative.TargetDir)innative-env.lib"/>
+        <File Id="innative.s.d.lib" Name="innative-s-d.lib" Source="$(var.innative.TargetDir)innative-s-d.lib"/>
+        <File Id="innative.s.lib" Name="innative-s.lib" Source="$(var.innative.TargetDir)innative-s.lib"/>
+        <File Id="innative.dll" Name="innative.dll" Source="$(var.innative.TargetDir)innative.dll"/>
+      </Component>
+    </ComponentGroup>
+
+    <Feature Id="inNativeRuntime" Title="inNative Runtime" Level="1">
+      <ComponentGroupRef Id="inNativeBinGroup" />
+    </Feature>
+    
+    <CustomAction Id="Installer" Execute="deferred" Impersonate="yes" Return="check" FileKey="innative.cmd.exe" ExeCommand="-i" SuppressModularization="yes" />
+    <CustomAction Id="Uninstaller" Execute="deferred" Impersonate="yes" Return="check" FileKey="innative.cmd.exe" ExeCommand="-u" SuppressModularization="yes" />
+
+    <InstallExecuteSequence>
+      <Custom Action="Installer" After="InstallFiles" Overridable="yes">NOT REMOVE~="ALL"</Custom>
+      <Custom Action="Uninstaller" Before="RemoveFiles" Overridable="yes">REMOVE~="ALL"</Custom>
+    </InstallExecuteSequence>
+  </Product>
+
+  <!-- For unknown reasons, these custom actions must be in this exact order, in their own fragment, or they won't be sequenced properly -->
+</Wix>

innative-runtime-setup/en-us.wxl

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="WelcomeDlgDescription" Overridable="yes">Welcome to the inNative Runtime installer. This will install the inNative Runtime and run WebAssembly files with the inNative command line tool.</String>
+</WixLocalization>

innative-runtime-setup/innative-runtime-setup.wixproj

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>1d10e371-391d-4147-8dec-28250adb318a</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>innative-windows-runtime</OutputName>
+    <OutputType>Package</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputName>innative-windows-runtime-x86-d</OutputName>
+    <OutputPath>$(SolutionDir)bin32\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputName>innative-windows-runtime-x86</OutputName>
+    <OutputPath>$(SolutionDir)bin32\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <OutputName>innative-windows-runtime-x64-d</OutputName>
+    <OutputPath>$(SolutionDir)bin\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputName>innative-windows-runtime-x64</OutputName>
+    <OutputPath>$(SolutionDir)bin\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\innative\innative.vcxproj">
+      <Name>innative</Name>
+      <Project>{8b15928a-757d-4280-b90f-4d4e90d37f60}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="en-us.wxl" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+</Project>

innative-setup/LICENSE.rtf innative-sdk-setup/LICENSE.rtfinnative-setup/LICENSE.rtf renamed to innative-sdk-setup/LICENSE.rtf

@@ -37,7 +37,7 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="$(var.ProgramFilesFolder)">
         <Directory Id="INNATIVEFOLDER" Name="inNative">
-          <Directory Id="INSTALLFOLDER" Name="SDK">
+          <Directory Id="INSTALLFOLDER" Name="SDK v$(var.Version)">
             <Directory Id="BINFOLDER" Name="bin" />
             <Directory Id="PARENTINCLUDEFOLDER" Name="include">
               <Directory Id="INCLUDEFOLDER" Name="innative" />
@@ -75,6 +75,10 @@
         <File Id="innative.s.d.pdb" Name="innative-s-d.pdb" Source="$(var.innative.TargetDir)innative-s-d.pdb"/>
         <File Id="innative.s.lib" Name="innative-s.lib" Source="$(var.innative.TargetDir)innative-s.lib"/>
         <File Id="innative.s.pdb" Name="innative-s.pdb" Source="$(var.innative.TargetDir)innative-s.pdb"/>
+        <File Id="innative.stub.d.lib" Name="innative-stub-d.lib" Source="$(var.innative.TargetDir)innative-stub-d.lib"/>
+        <File Id="innative.stub.d.pdb" Name="innative-stub-d.pdb" Source="$(var.innative.TargetDir)innative-stub-d.pdb"/>
+        <File Id="innative.stub.lib" Name="innative-stub.lib" Source="$(var.innative.TargetDir)innative-stub.lib"/>
+        <File Id="innative.stub.pdb" Name="innative-stub.pdb" Source="$(var.innative.TargetDir)innative-stub.pdb"/>
         <File Id="innative.dll" Name="innative.dll" Source="$(var.innative.TargetDir)innative.dll"/>
         <File Id="innative.exp" Name="innative.exp" Source="$(var.innative.TargetDir)innative.exp"/>
         <File Id="innative.lib" Name="innative.lib" Source="$(var.innative.TargetDir)innative.lib"/>