Merge pull request #115 from SofiaCPP/feature/gctest

Add app to test GC implementations

5 files changed, 28 insertions, 12 deletions

diff --git a/spasm/solution/spasm.vcxproj b/spasm/solution/spasm.vcxproj
index c4d1cc3..e74771d 100644
--- a/spasm/solution/spasm.vcxproj
+++ b/spasm/solution/spasm.vcxproj
@@ -31,6 +31,7 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -38,6 +39,7 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -45,6 +47,7 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -52,6 +55,7 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/spasm/solution/spasm_lib.vcxproj b/spasm/solution/spasm_lib.vcxproj
index 72bd81e..bcb4ab9 100644
--- a/spasm/solution/spasm_lib.vcxproj
+++ b/spasm/solution/spasm_lib.vcxproj
@@ -31,6 +31,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -38,6 +39,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -45,6 +47,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -52,6 +55,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -223,18 +227,18 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\asm\bytecode.cpp">

-    </ClCompile>

-    <ClCompile Include="..\src\asm\symbol.cpp">

-    </ClCompile>

-    <ClCompile Include="..\src\asm\tokenizer.cpp">

-    </ClCompile>

     <ClCompile Include="..\src\asm\assembler.cpp">

     </ClCompile>

+    <ClCompile Include="..\src\asm\bytecode.cpp">

+    </ClCompile>

     <ClCompile Include="..\src\asm\lexer.cpp">

     </ClCompile>

+    <ClCompile Include="..\src\asm\symbol.cpp">

+    </ClCompile>

     <ClCompile Include="..\src\asm\token.cpp">

     </ClCompile>

+    <ClCompile Include="..\src\asm\tokenizer.cpp">

+    </ClCompile>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/spasm/solution/spasm_lib.vcxproj.filters b/spasm/solution/spasm_lib.vcxproj.filters
index c82311e..82b5f56 100644
--- a/spasm/solution/spasm_lib.vcxproj.filters
+++ b/spasm/solution/spasm_lib.vcxproj.filters
@@ -9,22 +9,22 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\asm\bytecode.cpp">

+    <ClCompile Include="..\src\asm\assembler.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\asm\symbol.cpp">

+    <ClCompile Include="..\src\asm\bytecode.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\asm\tokenizer.cpp">

+    <ClCompile Include="..\src\asm\lexer.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\asm\assembler.cpp">

+    <ClCompile Include="..\src\asm\symbol.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\asm\lexer.cpp">

+    <ClCompile Include="..\src\asm\token.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\asm\token.cpp">

+    <ClCompile Include="..\src\asm\tokenizer.cpp">

       <Filter>src\asm</Filter>

     </ClCompile>

   </ItemGroup>

diff --git a/spasm/solution/sprt.vcxproj b/spasm/solution/sprt.vcxproj
index acc26ef..6e7737f 100644
--- a/spasm/solution/sprt.vcxproj
+++ b/spasm/solution/sprt.vcxproj
@@ -31,6 +31,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -38,6 +39,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -45,6 +47,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -52,6 +55,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/spasm/solution/sprun.vcxproj b/spasm/solution/sprun.vcxproj
index a86c487..15ab7f9 100644
--- a/spasm/solution/sprun.vcxproj
+++ b/spasm/solution/sprun.vcxproj
@@ -31,6 +31,7 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -38,6 +39,7 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -45,6 +47,7 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -52,6 +55,7 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />