Split spasm to lib and executable

- added solution folders

23 files changed, 573 insertions, 207 deletions

diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln
index 9915cf9..17799fc 100644
--- a/JSImpl/solution/JSImpl.sln
+++ b/JSImpl/solution/JSImpl.sln
@@ -1,15 +1,33 @@
 

 Microsoft Visual Studio Solution File, Format Version 12.00

 # Visual Studio 14

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Spasm", "Spasm", "{9892E17D-8434-0C54-6DEF-1FA8593093A4}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtest", "gtest", "{1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JSImpl", "JSImpl", "{C30B5025-2FEB-CEC0-3803-5A97A4613522}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "..\..\spasm\solution\sprun.vcxproj", "{FD605F10-6975-87C1-32F7-2A219ECA83F2}"

+	ProjectSection(ProjectDependencies) = postProject

+		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}

+	EndProjectSection

+EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "..\test\Test.vcxproj", "{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}"

 	ProjectSection(ProjectDependencies) = postProject

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}

 		{19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF}

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1} = {EC34880F-5849-B0C0-21CB-53208D9EACF1}

 		{B686840F-229B-ACC0-EB1C-502057F0A8F1} = {B686840F-229B-ACC0-EB1C-502057F0A8F1}

 		{30B03E7E-1C68-80CB-856F-592771461BBC} = {30B03E7E-1C68-80CB-856F-592771461BBC}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\test\gtest.vcxproj", "{EC34880F-5849-B0C0-21CB-53208D9EACF1}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\test\gmock.vcxproj", "{B686840F-229B-ACC0-EB1C-502057F0A8F1}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\test\gtest_main.vcxproj", "{30B03E7E-1C68-80CB-856F-592771461BBC}"

+EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSLib", "JSLib.vcxproj", "{19EA680D-85FE-90BE-4E80-341EBA538DEF}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSImpl", "JSImpl.vcxproj", "{549B84BA-403D-AF90-29F8-C2E4153936E1}"

@@ -17,19 +35,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSImpl", "JSImpl.vcxproj",
 		{19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\test\gtest.vcxproj", "{EC34880F-5849-B0C0-21CB-53208D9EACF1}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\test\gmock.vcxproj", "{B686840F-229B-ACC0-EB1C-502057F0A8F1}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\test\gtest_main.vcxproj", "{30B03E7E-1C68-80CB-856F-592771461BBC}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprt", "..\..\spasm\solution\sprt.vcxproj", "{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\solution\spasm.vcxproj", "{69185F10-D52C-87C1-9EAE-2A210A8283F2}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm_lib", "..\..\spasm\solution\spasm_lib.vcxproj", "{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "..\..\spasm\solution\sprun.vcxproj", "{FD605F10-6975-87C1-32F7-2A219ECA83F2}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\solution\spasm.vcxproj", "{69185F10-D52C-87C1-9EAE-2A210A8283F2}"

 	ProjectSection(ProjectDependencies) = postProject

-		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}

 	EndProjectSection

 EndProject

 Global

@@ -38,18 +50,14 @@ Global
 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|x64.ActiveCfg = Debug|x64

+		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|x64.Build.0 = Debug|x64

+		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|x64.ActiveCfg = Release|x64

+		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|x64.Build.0 = Release|x64

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|x64.ActiveCfg = Debug|x64

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Debug|x64.Build.0 = Debug|x64

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|x64.ActiveCfg = Release|x64

 		{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}.Release|x64.Build.0 = Release|x64

-		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.ActiveCfg = Debug|x64

-		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.Build.0 = Debug|x64

-		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.ActiveCfg = Release|x64

-		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.Build.0 = Release|x64

-		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.ActiveCfg = Debug|x64

-		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.Build.0 = Debug|x64

-		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.ActiveCfg = Release|x64

-		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.Build.0 = Release|x64

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|x64.ActiveCfg = Debug|x64

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Debug|x64.Build.0 = Debug|x64

 		{EC34880F-5849-B0C0-21CB-53208D9EACF1}.Release|x64.ActiveCfg = Release|x64

@@ -62,22 +70,39 @@ Global
 		{30B03E7E-1C68-80CB-856F-592771461BBC}.Debug|x64.Build.0 = Debug|x64

 		{30B03E7E-1C68-80CB-856F-592771461BBC}.Release|x64.ActiveCfg = Release|x64

 		{30B03E7E-1C68-80CB-856F-592771461BBC}.Release|x64.Build.0 = Release|x64

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.ActiveCfg = Debug|x64

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Debug|x64.Build.0 = Debug|x64

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.ActiveCfg = Release|x64

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF}.Release|x64.Build.0 = Release|x64

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.ActiveCfg = Debug|x64

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Debug|x64.Build.0 = Debug|x64

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.ActiveCfg = Release|x64

+		{549B84BA-403D-AF90-29F8-C2E4153936E1}.Release|x64.Build.0 = Release|x64

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|x64.ActiveCfg = Debug|x64

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Debug|x64.Build.0 = Debug|x64

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|x64.ActiveCfg = Release|x64

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}.Release|x64.Build.0 = Release|x64

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|x64.ActiveCfg = Debug|x64

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Debug|x64.Build.0 = Debug|x64

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|x64.ActiveCfg = Release|x64

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}.Release|x64.Build.0 = Release|x64

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|x64.ActiveCfg = Debug|x64

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Debug|x64.Build.0 = Debug|x64

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|x64.ActiveCfg = Release|x64

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|x64.Build.0 = Release|x64

-		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|x64.ActiveCfg = Debug|x64

-		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Debug|x64.Build.0 = Debug|x64

-		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|x64.ActiveCfg = Release|x64

-		{FD605F10-6975-87C1-32F7-2A219ECA83F2}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

 	EndGlobalSection

 	GlobalSection(NestedProjects) = preSolution

+		{FD605F10-6975-87C1-32F7-2A219ECA83F2} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

+		{EC34880F-5849-B0C0-21CB-53208D9EACF1} = {1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}

+		{B686840F-229B-ACC0-EB1C-502057F0A8F1} = {1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}

+		{30B03E7E-1C68-80CB-856F-592771461BBC} = {1BAF0A7D-0751-3553-F00B-49A7DC4CBCA3}

+		{19EA680D-85FE-90BE-4E80-341EBA538DEF} = {C30B5025-2FEB-CEC0-3803-5A97A4613522}

+		{549B84BA-403D-AF90-29F8-C2E4153936E1} = {C30B5025-2FEB-CEC0-3803-5A97A4613522}

+		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

+		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

+		{69185F10-D52C-87C1-9EAE-2A210A8283F2} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

 	EndGlobalSection

 EndGlobal

diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj
index 8b58a96..0aa8deb 100644
--- a/JSImpl/solution/JSImpl.vcxproj
+++ b/JSImpl/solution/JSImpl.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

diff --git a/JSImpl/solution/JSLib.vcxproj b/JSImpl/solution/JSLib.vcxproj
index bb5c860..1d0f63a 100644
--- a/JSImpl/solution/JSLib.vcxproj
+++ b/JSImpl/solution/JSLib.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

@@ -111,23 +113,23 @@
   </ItemDefinitionGroup>

   <ItemGroup>

     <ClInclude Include="..\src\ASTInterpreter.h" />

+    <ClInclude Include="..\src\ASTPrinter.h" />

+    <ClInclude Include="..\src\CommonTypes.h" />

     <ClInclude Include="..\src\Expression.h" />

+    <ClInclude Include="..\src\ExpressionDefinitions.h" />

     <ClInclude Include="..\src\ExpressionsFwd.h" />

-    <ClInclude Include="..\src\ASTPrinter.h" />

     <ClInclude Include="..\src\ExpressionVisitor.h" />

     <ClInclude Include="..\src\Lexer.h" />

-    <ClInclude Include="..\src\CommonTypes.h" />

-    <ClInclude Include="..\src\ExpressionDefinitions.h" />

     <ClInclude Include="..\src\Parser.h" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\Lexer.cpp">

-    </ClCompile>

     <ClCompile Include="..\src\ASTInterpreter.cpp">

     </ClCompile>

+    <ClCompile Include="..\src\ASTPrinter.cpp">

+    </ClCompile>

     <ClCompile Include="..\src\Expression.cpp">

     </ClCompile>

-    <ClCompile Include="..\src\ASTPrinter.cpp">

+    <ClCompile Include="..\src\Lexer.cpp">

     </ClCompile>

     <ClCompile Include="..\src\Parser.cpp">

     </ClCompile>

diff --git a/JSImpl/solution/JSLib.vcxproj.filters b/JSImpl/solution/JSLib.vcxproj.filters
index a5801c7..afcbbb9 100644
--- a/JSImpl/solution/JSLib.vcxproj.filters
+++ b/JSImpl/solution/JSLib.vcxproj.filters
@@ -9,25 +9,25 @@
     <ClInclude Include="..\src\ASTInterpreter.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\Expression.h">

+    <ClInclude Include="..\src\ASTPrinter.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ExpressionsFwd.h">

+    <ClInclude Include="..\src\CommonTypes.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ASTPrinter.h">

+    <ClInclude Include="..\src\Expression.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ExpressionVisitor.h">

+    <ClInclude Include="..\src\ExpressionDefinitions.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\Lexer.h">

+    <ClInclude Include="..\src\ExpressionsFwd.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\CommonTypes.h">

+    <ClInclude Include="..\src\ExpressionVisitor.h">

       <Filter>src</Filter>

     </ClInclude>

-    <ClInclude Include="..\src\ExpressionDefinitions.h">

+    <ClInclude Include="..\src\Lexer.h">

       <Filter>src</Filter>

     </ClInclude>

     <ClInclude Include="..\src\Parser.h">

@@ -35,16 +35,16 @@
     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\Lexer.cpp">

+    <ClCompile Include="..\src\ASTInterpreter.cpp">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ASTInterpreter.cpp">

+    <ClCompile Include="..\src\ASTPrinter.cpp">

       <Filter>src</Filter>

     </ClCompile>

     <ClCompile Include="..\src\Expression.cpp">

       <Filter>src</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ASTPrinter.cpp">

+    <ClCompile Include="..\src\Lexer.cpp">

       <Filter>src</Filter>

     </ClCompile>

     <ClCompile Include="..\src\Parser.cpp">

diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile
index b920fc7..00cafb3 100644
--- a/JSImpl/solution/Makefile
+++ b/JSImpl/solution/Makefile
@@ -6,21 +6,13 @@ ifndef config
 endif
 export config
 
-PROJECTS := JSImpl JSLib Test gmock gtest gtest_main spasm sprt sprun
+PROJECTS := JSImpl JSLib Test gmock gtest gtest_main spasm spasm_lib sprt sprun
 
 .PHONY: all clean help $(PROJECTS)
 
 all: $(PROJECTS)
 
-JSLib: 
-	@echo "==== Building JSLib ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f JSLib.make
-
-JSImpl: JSLib
-	@echo "==== Building JSImpl ($(config)) ===="
-	@${MAKE} --no-print-directory -C . -f JSImpl.make
-
-Test: sprt JSLib gtest gmock gtest_main
+Test: sprt spasm_lib JSLib gtest gmock gtest_main
 	@echo "==== Building Test ($(config)) ===="
 	@${MAKE} --no-print-directory -C ../test -f Test.make
 
@@ -36,11 +28,23 @@ gtest_main:
 	@echo "==== Building gtest_main ($(config)) ===="
 	@${MAKE} --no-print-directory -C ../test -f gtest_main.make
 
+JSLib: 
+	@echo "==== Building JSLib ($(config)) ===="
+	@${MAKE} --no-print-directory -C . -f JSLib.make
+
+JSImpl: JSLib
+	@echo "==== Building JSImpl ($(config)) ===="
+	@${MAKE} --no-print-directory -C . -f JSImpl.make
+
 sprt: 
 	@echo "==== Building sprt ($(config)) ===="
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprt.make
 
-spasm: 
+spasm_lib: 
+	@echo "==== Building spasm_lib ($(config)) ===="
+	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm_lib.make
+
+spasm: spasm_lib
 	@echo "==== Building spasm ($(config)) ===="
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make
 
@@ -49,13 +53,14 @@ sprun: sprt
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make
 
 clean:
-	@${MAKE} --no-print-directory -C . -f JSLib.make clean
-	@${MAKE} --no-print-directory -C . -f JSImpl.make clean
 	@${MAKE} --no-print-directory -C ../test -f Test.make clean
 	@${MAKE} --no-print-directory -C ../test -f gtest.make clean
 	@${MAKE} --no-print-directory -C ../test -f gmock.make clean
 	@${MAKE} --no-print-directory -C ../test -f gtest_main.make clean
+	@${MAKE} --no-print-directory -C . -f JSLib.make clean
+	@${MAKE} --no-print-directory -C . -f JSImpl.make clean
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprt.make clean
+	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm_lib.make clean
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make clean
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make clean
 
@@ -69,13 +74,14 @@ help:
 	@echo "TARGETS:"
 	@echo "   all (default)"
 	@echo "   clean"
-	@echo "   JSLib"
-	@echo "   JSImpl"
 	@echo "   Test"
 	@echo "   gtest"
 	@echo "   gmock"
 	@echo "   gtest_main"
+	@echo "   JSLib"
+	@echo "   JSImpl"
 	@echo "   sprt"
+	@echo "   spasm_lib"
 	@echo "   spasm"
 	@echo "   sprun"
 	@echo ""
diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua
index 28a8515..aa5889d 100644
--- a/JSImpl/solution/genie.lua
+++ b/JSImpl/solution/genie.lua
@@ -24,21 +24,24 @@ solution 'JSImpl'
         objdir(root .. 'obj/Release')
     configuration '*'
 
-    project 'JSLib'
-        kind 'StaticLib'
-        language 'C++'
-        uuid(os.uuid('JSLib'))
-        files '../src/*.cpp'
-        removefiles '../src/main.cpp'
-        files '../src/*.h'
-
-    project 'JSImpl'
-        kind 'ConsoleApp'
-        language 'C++'
-        uuid(os.uuid('JSImpl'))
-        files '../src/main.cpp'
-        links 'JSLib'
-
     include '../test'
-    include '../../spasm/solution/'
     startproject 'Test'
+
+    group 'JSImpl'
+        project 'JSLib'
+            kind 'StaticLib'
+            language 'C++'
+            uuid(os.uuid('JSLib'))
+            files '../src/*.cpp'
+            removefiles '../src/main.cpp'
+            files '../src/*.h'
+
+        project 'JSImpl'
+            kind 'ConsoleApp'
+            language 'C++'
+            uuid(os.uuid('JSImpl'))
+            files '../src/main.cpp'
+            links 'JSLib'
+
+    group 'Spasm'
+        include '../../spasm/solution/'
diff --git a/JSImpl/test/Test.make b/JSImpl/test/Test.make
index 4540d2d..e1a6ad4 100644
--- a/JSImpl/test/Test.make
+++ b/JSImpl/test/Test.make
@@ -47,7 +47,7 @@ ifeq ($(config),debug64)
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/Test
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src"
+  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
@@ -56,7 +56,7 @@ ifeq ($(config),debug64)
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -L"." -m64
-  LDDEPS             += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a
+  LDDEPS             += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a
   LIBS               += $(LDDEPS) -lpthread
   EXTERNAL_LIBS      +=
   LINKOBJS            = $(OBJECTS)
@@ -80,7 +80,7 @@ ifeq ($(config),release64)
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/Test
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src"
+  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
@@ -89,7 +89,7 @@ ifeq ($(config),release64)
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -L"." -m64
-  LDDEPS             += ../build/bin/Release/libsprt.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a
+  LDDEPS             += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a
   LIBS               += $(LDDEPS) -lpthread
   EXTERNAL_LIBS      +=
   LINKOBJS            = $(OBJECTS)
diff --git a/JSImpl/test/Test.vcxproj b/JSImpl/test/Test.vcxproj
index 3a7058a..c099f1c 100644
--- a/JSImpl/test/Test.vcxproj
+++ b/JSImpl/test/Test.vcxproj
@@ -57,7 +57,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -72,7 +72,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <SubSystem>Console</SubSystem>

@@ -87,7 +87,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

@@ -102,7 +102,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <SubSystem>Console</SubSystem>

@@ -129,6 +129,9 @@
     <ProjectReference Include="..\..\spasm\solution\sprt.vcxproj">

       <Project>{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}</Project>

     </ProjectReference>

+    <ProjectReference Include="..\..\spasm\solution\spasm_lib.vcxproj">

+      <Project>{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}</Project>

+    </ProjectReference>

     <ProjectReference Include="..\solution\JSLib.vcxproj">

       <Project>{19EA680D-85FE-90BE-4E80-341EBA538DEF}</Project>

     </ProjectReference>

diff --git a/JSImpl/test/genie.lua b/JSImpl/test/genie.lua
index ba0f0c2..c3cd1d6 100644
--- a/JSImpl/test/genie.lua
+++ b/JSImpl/test/genie.lua
@@ -10,9 +10,11 @@ project 'Test'
         'googletest/googlemock/include',
         '..',
         '../../spasm/src',
+        '../../spasm/src/asm',
     }
     links {
         'sprt',
+        'spasm_lib',
         'JSLib',
         'gtest',
         'gmock',
@@ -22,35 +24,36 @@ project 'Test'
         links 'pthread'
     configuration '*'
 
-project 'gtest'
-    kind 'StaticLib'
-    language 'C++'
-    uuid(os.uuid('gtest'))
-    files 'googletest/googletest/src/gtest-all.cc'
-    files 'googletest/googletest/include/gtest/*.h'
-    includedirs {
-        'googletest/googletest',
-        'googletest/googletest/include',
-    }
+group 'gtest'
+    project 'gtest'
+        kind 'StaticLib'
+        language 'C++'
+        uuid(os.uuid('gtest'))
+        files 'googletest/googletest/src/gtest-all.cc'
+        files 'googletest/googletest/include/gtest/*.h'
+        includedirs {
+            'googletest/googletest',
+            'googletest/googletest/include',
+        }
 
-project 'gmock'
-    kind 'StaticLib'
-    language 'C++'
-    uuid(os.uuid('gmock'))
-    files 'googletest/googlemock/src/gmock-all.cc'
-    files 'googletest/googlemock/include/gmock/*.h'
-    includedirs {
-        'googletest/googlemock',
-        'googletest/googlemock/include',
-        'googletest/googletest/include',
-    }
+    project 'gmock'
+        kind 'StaticLib'
+        language 'C++'
+        uuid(os.uuid('gmock'))
+        files 'googletest/googlemock/src/gmock-all.cc'
+        files 'googletest/googlemock/include/gmock/*.h'
+        includedirs {
+            'googletest/googlemock',
+            'googletest/googlemock/include',
+            'googletest/googletest/include',
+        }
 
-project 'gtest_main'
-    kind 'StaticLib'
-    language 'C++'
-    uuid(os.uuid('gtest_main'))
-    files 'googletest/googletest/src/gtest_main.cc'
-    includedirs {
-        'googletest/googletest',
-        'googletest/googletest/include',
-    }
+    project 'gtest_main'
+        kind 'StaticLib'
+        language 'C++'
+        uuid(os.uuid('gtest_main'))
+        files 'googletest/googletest/src/gtest_main.cc'
+        includedirs {
+            'googletest/googletest',
+            'googletest/googletest/include',
+        }
diff --git a/JSImpl/test/gmock.vcxproj b/JSImpl/test/gmock.vcxproj
index 8fbaa69..f4e2bec 100644
--- a/JSImpl/test/gmock.vcxproj
+++ b/JSImpl/test/gmock.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

@@ -114,17 +116,17 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h" />

     <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h" />

     <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h" />

     <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h" />

     <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h" />

     <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h" />

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h" />

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="googletest\googlemock\src\gmock-all.cc">

diff --git a/JSImpl/test/gmock.vcxproj.filters b/JSImpl/test/gmock.vcxproj.filters
index 01914f2..7ecdd12 100644
--- a/JSImpl/test/gmock.vcxproj.filters
+++ b/JSImpl/test/gmock.vcxproj.filters
@@ -18,37 +18,37 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h">

+    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h">

       <Filter>googletest\googlemock\include\gmock</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/JSImpl/test/gtest.vcxproj b/JSImpl/test/gtest.vcxproj
index 623e8f5..7adfade 100644
--- a/JSImpl/test/gtest.vcxproj
+++ b/JSImpl/test/gtest.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

@@ -114,16 +116,16 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h" />

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h" />

     <ClInclude Include="googletest\googletest\include\gtest\gtest-message.h" />

     <ClInclude Include="googletest\googletest\include\gtest\gtest-param-test.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h" />

     <ClInclude Include="googletest\googletest\include\gtest\gtest-printers.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h" />

     <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h" />

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h" />

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h" />

     <ClInclude Include="googletest\googletest\include\gtest\gtest.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h" />

+    <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h" />

+    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h" />

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="googletest\googletest\src\gtest-all.cc">

diff --git a/JSImpl/test/gtest.vcxproj.filters b/JSImpl/test/gtest.vcxproj.filters
index 780060b..3a35c75 100644
--- a/JSImpl/test/gtest.vcxproj.filters
+++ b/JSImpl/test/gtest.vcxproj.filters
@@ -18,7 +18,7 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h">

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

     <ClInclude Include="googletest\googletest\include\gtest\gtest-message.h">

@@ -27,25 +27,25 @@
     <ClInclude Include="googletest\googletest\include\gtest\gtest-param-test.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

     <ClInclude Include="googletest\googletest\include\gtest\gtest-printers.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h">

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h">

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h">

+    <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

     <ClInclude Include="googletest\googletest\include\gtest\gtest.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h">

+    <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h">

+      <Filter>googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h">

       <Filter>googletest\googletest\include\gtest</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/JSImpl/test/gtest_main.vcxproj b/JSImpl/test/gtest_main.vcxproj
index 997d941..2ce7ce4 100644
--- a/JSImpl/test/gtest_main.vcxproj
+++ b/JSImpl/test/gtest_main.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

diff --git a/spasm/solution/genie.lua b/spasm/solution/genie.lua
index b310ad0..d1fb495 100644
--- a/spasm/solution/genie.lua
+++ b/spasm/solution/genie.lua
@@ -34,11 +34,24 @@ end
         removefiles '../src/main.cpp'
         files '../src/*.h'
 
+    project 'spasm_lib'
+        kind 'StaticLib'
+        language 'C++'
+        uuid(os.uuid('spasm_lib'))
+        files '../src/asm/*.cpp'
+        removefiles {
+            '../src/asm/main.cpp',
+            '../src/asm/lexdump.cpp',
+            '../src/asm/lexdump3.cpp',
+        }
+        files '../src/asm/*.h'
+
     project 'spasm'
         kind 'ConsoleApp'
         language 'C++'
         uuid(os.uuid('spasm'))
-        files '../src/asm/*.cpp'
+		links 'spasm_lib'
+        files '../src/asm/main.cpp'
         removefiles {
             '../src/asm/lexdump.cpp',
             '../src/asm/lexdump3.cpp',
diff --git a/spasm/solution/spasm.make b/spasm/solution/spasm.make
index f2aa890..6c081cc 100644
--- a/spasm/solution/spasm.make
+++ b/spasm/solution/spasm.make
@@ -54,20 +54,14 @@ ifeq ($(config),debug64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -m64
-  LDDEPS             +=
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64
+  LDDEPS             += ../../JSImpl/build/bin/Debug/libspasm_lib.a
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
   LINKOBJS            = $(OBJECTS)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJECTS := \
-	$(OBJDIR)/src/asm/assembler.o \
-	$(OBJDIR)/src/asm/bytecode.o \
-	$(OBJDIR)/src/asm/lexer.o \
 	$(OBJDIR)/src/asm/main.o \
-	$(OBJDIR)/src/asm/symbol.o \
-	$(OBJDIR)/src/asm/token.o \
-	$(OBJDIR)/src/asm/tokenizer.o \
 
   define PREBUILDCMDS
   endef
@@ -89,20 +83,14 @@ ifeq ($(config),release64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -m64
-  LDDEPS             +=
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64
+  LDDEPS             += ../../JSImpl/build/bin/Release/libspasm_lib.a
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
   LINKOBJS            = $(OBJECTS)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJECTS := \
-	$(OBJDIR)/src/asm/assembler.o \
-	$(OBJDIR)/src/asm/bytecode.o \
-	$(OBJDIR)/src/asm/lexer.o \
 	$(OBJDIR)/src/asm/main.o \
-	$(OBJDIR)/src/asm/symbol.o \
-	$(OBJDIR)/src/asm/token.o \
-	$(OBJDIR)/src/asm/tokenizer.o \
 
   define PREBUILDCMDS
   endef
@@ -162,34 +150,10 @@ $(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR)
 	$(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
 endif
 
-$(OBJDIR)/src/asm/assembler.o: ../src/asm/assembler.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
-
-$(OBJDIR)/src/asm/bytecode.o: ../src/asm/bytecode.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
-
-$(OBJDIR)/src/asm/lexer.o: ../src/asm/lexer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
-
 $(OBJDIR)/src/asm/main.o: ../src/asm/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/src/asm/symbol.o: ../src/asm/symbol.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
-
-$(OBJDIR)/src/asm/token.o: ../src/asm/token.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
-
-$(OBJDIR)/src/asm/tokenizer.o: ../src/asm/tokenizer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
-	@echo $(notdir $<)
-	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
-
 -include $(OBJECTS:%.o=%.d)
 ifneq (,$(PCH))
   -include $(OBJDIR)/$(notdir $(PCH)).d
diff --git a/spasm/solution/spasm.vcxproj b/spasm/solution/spasm.vcxproj
index e39730e..b0b5718 100644
--- a/spasm/solution/spasm.vcxproj
+++ b/spasm/solution/spasm.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

@@ -110,20 +112,13 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

-    </ClCompile>

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

-    </ClCompile>

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

-    </ClCompile>

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

-    </ClCompile>

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

-    </ClCompile>

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

     </ClCompile>

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

-    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="spasm_lib.vcxproj">

+      <Project>{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}</Project>

+    </ProjectReference>

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/spasm/solution/spasm.vcxproj.filters b/spasm/solution/spasm.vcxproj.filters
index 30cc8cb..a9d3fb8 100644
--- a/spasm/solution/spasm.vcxproj.filters
+++ b/spasm/solution/spasm.vcxproj.filters
@@ -9,26 +9,8 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>src\asm</Filter>

-    </ClCompile>

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

-      <Filter>src\asm</Filter>

-    </ClCompile>

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

-      <Filter>src\asm</Filter>

-    </ClCompile>

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

-      <Filter>src\asm</Filter>

-    </ClCompile>

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

-      <Filter>src\asm</Filter>

-    </ClCompile>

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

       <Filter>src\asm</Filter>

     </ClCompile>

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

-      <Filter>src\asm</Filter>

-    </ClCompile>

   </ItemGroup>

 </Project>

diff --git a/spasm/solution/spasm_lib.make b/spasm/solution/spasm_lib.make
new file mode 100644
index 0000000..94b4322
--- /dev/null
+++ b/spasm/solution/spasm_lib.make
@@ -0,0 +1,196 @@
+# GNU Make project makefile autogenerated by GENie
+ifndef config
+  config=debug64
+endif
+
+ifndef verbose
+  SILENT = @
+endif
+
+SHELLTYPE := msdos
+ifeq (,$(ComSpec)$(COMSPEC))
+  SHELLTYPE := posix
+endif
+ifeq (/bin,$(findstring /bin,$(SHELL)))
+  SHELLTYPE := posix
+endif
+ifeq (/bin,$(findstring /bin,$(MAKESHELL)))
+  SHELLTYPE := posix
+endif
+
+ifeq (posix,$(SHELLTYPE))
+  MKDIR = $(SILENT) mkdir -p "$(1)"
+  COPY  = $(SILENT) cp -fR "$(1)" "$(2)"
+  RM    = $(SILENT) rm -f "$(1)"
+else
+  MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0
+  COPY  = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))"
+  RM    = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
+endif
+
+CC  = gcc
+CXX = g++
+AR  = ar
+
+ifndef RESCOMP
+  ifdef WINDRES
+    RESCOMP = $(WINDRES)
+  else
+    RESCOMP = windres
+  endif
+endif
+
+MAKEFILE = spasm_lib.make
+
+ifeq ($(config),debug64)
+  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/spasm_lib
+  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  TARGET              = $(TARGETDIR)/libspasm_lib.a
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -m64
+  LDDEPS             +=
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(AR)  -rcs $(TARGET)
+  OBJECTS := \
+	$(OBJDIR)/src/asm/assembler.o \
+	$(OBJDIR)/src/asm/bytecode.o \
+	$(OBJDIR)/src/asm/lexer.o \
+	$(OBJDIR)/src/asm/symbol.o \
+	$(OBJDIR)/src/asm/token.o \
+	$(OBJDIR)/src/asm/tokenizer.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),release64)
+  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/spasm_lib
+  TARGETDIR           = ../../JSImpl/build/bin/Release
+  TARGET              = $(TARGETDIR)/libspasm_lib.a
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -m64
+  LDDEPS             +=
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(AR)  -rcs $(TARGET)
+  OBJECTS := \
+	$(OBJDIR)/src/asm/assembler.o \
+	$(OBJDIR)/src/asm/bytecode.o \
+	$(OBJDIR)/src/asm/lexer.o \
+	$(OBJDIR)/src/asm/symbol.o \
+	$(OBJDIR)/src/asm/token.o \
+	$(OBJDIR)/src/asm/tokenizer.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+OBJDIRS := \
+	$(OBJDIR) \
+	$(OBJDIR)/src/asm \
+
+RESOURCES := \
+
+.PHONY: clean prebuild prelink
+
+all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET)
+	@:
+
+$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(EXTERNAL_LIBS) $(RESOURCES) | $(TARGETDIR) $(OBJDIRS)
+	@echo Archiving spasm_lib
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) rm -f  $(TARGET)
+else
+	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
+endif
+	$(SILENT) $(LINKCMD) $(LINKOBJS)
+	$(POSTBUILDCMDS)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
+	-$(call MKDIR,$(TARGETDIR))
+
+$(OBJDIRS):
+	@echo Creating $(@)
+	-$(call MKDIR,$@)
+
+clean:
+	@echo Cleaning spasm_lib
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) rm -f  $(TARGET)
+	$(SILENT) rm -rf $(OBJDIR)
+else
+	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
+	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
+endif
+
+prebuild:
+	$(PREBUILDCMDS)
+
+prelink:
+	$(PRELINKCMDS)
+
+ifneq (,$(PCH))
+$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR)
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
+
+$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR)
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
+endif
+
+$(OBJDIR)/src/asm/assembler.o: ../src/asm/assembler.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
+$(OBJDIR)/src/asm/bytecode.o: ../src/asm/bytecode.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
+$(OBJDIR)/src/asm/lexer.o: ../src/asm/lexer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
+$(OBJDIR)/src/asm/symbol.o: ../src/asm/symbol.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
+$(OBJDIR)/src/asm/token.o: ../src/asm/token.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
+$(OBJDIR)/src/asm/tokenizer.o: ../src/asm/tokenizer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
+-include $(OBJECTS:%.o=%.d)
+ifneq (,$(PCH))
+  -include $(OBJDIR)/$(notdir $(PCH)).d
+  -include $(OBJDIR)/$(notdir $(PCH))_objc.d
+endif
diff --git a/spasm/solution/spasm_lib.vcxproj b/spasm/solution/spasm_lib.vcxproj
new file mode 100644
index 0000000..bf3908e
--- /dev/null
+++ b/spasm/solution/spasm_lib.vcxproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}</ProjectGuid>

+    <RootNamespace>spasm_lib</RootNamespace>

+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

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

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

+  </PropertyGroup>

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

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

+    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

+    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\spasm_lib\</IntDir>

+    <TargetName>spasm_lib</TargetName>

+    <TargetExt>.lib</TargetExt>

+  </PropertyGroup>

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

+    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

+    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\spasm_lib\</IntDir>

+    <TargetName>spasm_lib</TargetName>

+    <TargetExt>.lib</TargetExt>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)spasm_lib.pdb</ProgramDataBaseFileName>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+  <Lib>

+    <OutputFile>$(OutDir)spasm_lib.lib</OutputFile>

+    <TargetMachine>MachineX64</TargetMachine>

+  </Lib>

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)spasm_lib.pdb</ProgramDatabaseFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>MaxSpeed</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)spasm_lib.pdb</ProgramDataBaseFileName>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+  <Lib>

+    <OutputFile>$(OutDir)spasm_lib.lib</OutputFile>

+    <TargetMachine>MachineX64</TargetMachine>

+  </Lib>

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)spasm_lib.pdb</ProgramDatabaseFile>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <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">

+  </ImportGroup>

+</Project>

diff --git a/spasm/solution/spasm_lib.vcxproj.filters b/spasm/solution/spasm_lib.vcxproj.filters
new file mode 100644
index 0000000..6415708
--- /dev/null
+++ b/spasm/solution/spasm_lib.vcxproj.filters
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="src">

+      <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="src\asm">

+      <UniqueIdentifier>{6A9848A9-D677-C744-DF8F-521B4BEE2DA6}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>src\asm</Filter>

+    </ClCompile>

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

+      <Filter>src\asm</Filter>

+    </ClCompile>

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

+      <Filter>src\asm</Filter>

+    </ClCompile>

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

+      <Filter>src\asm</Filter>

+    </ClCompile>

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

+      <Filter>src\asm</Filter>

+    </ClCompile>

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

+      <Filter>src\asm</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/spasm/solution/sprt.vcxproj b/spasm/solution/sprt.vcxproj
index 2698c10..bd7f6c0 100644
--- a/spasm/solution/sprt.vcxproj
+++ b/spasm/solution/sprt.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

diff --git a/spasm/solution/sprun.vcxproj b/spasm/solution/sprun.vcxproj
index ea923b4..ee6678e 100644
--- a/spasm/solution/sprun.vcxproj
+++ b/spasm/solution/sprun.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v140</PlatformToolset>

+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">