Regenerate project files

14 files changed, 248 insertions, 93 deletions

diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln
index bb2638e..89a91b3 100644
--- a/JSImpl/solution/JSImpl.sln
+++ b/JSImpl/solution/JSImpl.sln
@@ -7,6 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtest", "gtest", "{1BAF0A7D
 EndProject

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

 EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gctest", "gctest", "{5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}"

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

@@ -44,6 +46,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\soluti
 		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bench", "..\..\gctest\solution\test_bench.vcxproj", "{A41847E7-90D0-8834-F9D7-6190E5AE2325}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "leak_gc", "..\..\gctest\solution\leak_gc.vcxproj", "{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}"

+	ProjectSection(ProjectDependencies) = postProject

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_gc", "..\..\gctest\solution\dummy_gc.vcxproj", "{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}"

+	ProjectSection(ProjectDependencies) = postProject

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325}

+	EndProjectSection

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -132,6 +146,30 @@ Global
 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|Win32.Build.0 = Release|Win32

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

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

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|Win32.ActiveCfg = Debug|Win32

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|Win32.Build.0 = Debug|Win32

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|x64.ActiveCfg = Debug|x64

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|x64.Build.0 = Debug|x64

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|Win32.ActiveCfg = Release|Win32

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|Win32.Build.0 = Release|Win32

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|x64.ActiveCfg = Release|x64

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|x64.Build.0 = Release|x64

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|Win32.ActiveCfg = Debug|Win32

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|Win32.Build.0 = Debug|Win32

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|x64.ActiveCfg = Debug|x64

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|x64.Build.0 = Debug|x64

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|Win32.ActiveCfg = Release|Win32

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|Win32.Build.0 = Release|Win32

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|x64.ActiveCfg = Release|x64

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|x64.Build.0 = Release|x64

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|Win32.ActiveCfg = Debug|Win32

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|Win32.Build.0 = Debug|Win32

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|x64.ActiveCfg = Debug|x64

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|x64.Build.0 = Debug|x64

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|Win32.ActiveCfg = Release|Win32

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|Win32.Build.0 = Release|Win32

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|x64.ActiveCfg = Release|x64

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -146,5 +184,8 @@ Global
 		{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}

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325} = {5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C} = {5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293} = {5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}

 	EndGlobalSection

 EndGlobal

diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile
index 45157d1..78a826a 100644
--- a/JSImpl/solution/Makefile
+++ b/JSImpl/solution/Makefile
@@ -6,7 +6,7 @@ ifndef config
 endif
 export config
 
-PROJECTS := JSImpl JSLib Test gmock gtest gtest_main spasm spasm_lib sprt sprun
+PROJECTS := JSImpl JSLib Test dummy_gc gmock gtest gtest_main leak_gc spasm spasm_lib sprt sprun test_bench
 
 .PHONY: all clean help $(PROJECTS)
 
@@ -52,6 +52,18 @@ sprun: sprt
 	@echo "==== Building sprun ($(config)) ===="
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make
 
+test_bench: 
+	@echo "==== Building test_bench ($(config)) ===="
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f test_bench.make
+
+leak_gc: test_bench
+	@echo "==== Building leak_gc ($(config)) ===="
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f leak_gc.make
+
+dummy_gc: test_bench
+	@echo "==== Building dummy_gc ($(config)) ===="
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f dummy_gc.make
+
 clean:
 	@${MAKE} --no-print-directory -C ../test -f Test.make clean
 	@${MAKE} --no-print-directory -C ../test -f gtest.make clean
@@ -63,6 +75,9 @@ 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
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f test_bench.make clean
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f leak_gc.make clean
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f dummy_gc.make clean
 
 help:
 	@echo "Usage: make [config=name] [target]"
@@ -86,5 +101,8 @@ help:
 	@echo "   spasm_lib"
 	@echo "   spasm"
 	@echo "   sprun"
+	@echo "   test_bench"
+	@echo "   leak_gc"
+	@echo "   dummy_gc"
 	@echo ""
 	@echo "For more information, see https://github.com/bkaradzic/genie"
diff --git a/compile_commands.json b/compile_commands.json
new file mode 100644
index 0000000..763a143
--- /dev/null
+++ b/compile_commands.json
@@ -0,0 +1,80 @@
+[
+  { "directory": "d:/repo/IPL/JSImpl/test",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/ASTInterpreterTests.o -c ASTInterpreterTests.cpp",
+    "file": "ASTInterpreterTests.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/test",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/CodeGenerationTests.o -c CodeGenerationTests.cpp",
+    "file": "CodeGenerationTests.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/test",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/LexerTests.o -c LexerTests.cpp",
+    "file": "LexerTests.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/test",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/ParserTests.o -c ParserTests.cpp",
+    "file": "ParserTests.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/test",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/empty.o -c empty.cpp",
+    "file": "empty.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/test",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest/include\" -I\"googletest/googlemock/include\" -I\"..\" -I\"../../spasm/src\" -I\"../../spasm/src/asm\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/Test/sprtTests.o -c sprtTests.cpp",
+    "file": "sprtTests.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/test",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest\" -I\"googletest/googletest/include\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/gtest/googletest/googletest/src/gtest-all.o -c googletest/googletest/src/gtest-all.cc",
+    "file": "googletest/googletest/src/gtest-all.cc" },
+  { "directory": "d:/repo/IPL/JSImpl/test",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googlemock\" -I\"googletest/googlemock/include\" -I\"googletest/googletest/include\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/gmock/googletest/googlemock/src/gmock-all.o -c googletest/googlemock/src/gmock-all.cc",
+    "file": "googletest/googlemock/src/gmock-all.cc" },
+  { "directory": "d:/repo/IPL/JSImpl/test",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -I\"googletest/googletest\" -I\"googletest/googletest/include\" -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/gtest_main/googletest/googletest/src/gtest_main.o -c googletest/googletest/src/gtest_main.cc",
+    "file": "googletest/googletest/src/gtest_main.cc" },
+  { "directory": "d:/repo/IPL/JSImpl/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/ASTInterpreter.o -c ../src/ASTInterpreter.cpp",
+    "file": "../src/ASTInterpreter.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/ASTPrinter.o -c ../src/ASTPrinter.cpp",
+    "file": "../src/ASTPrinter.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/ByteCodeGenerator.o -c ../src/ByteCodeGenerator.cpp",
+    "file": "../src/ByteCodeGenerator.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/Expression.o -c ../src/Expression.cpp",
+    "file": "../src/Expression.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/JSONParser.o -c ../src/JSONParser.cpp",
+    "file": "../src/JSONParser.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/Lexer.o -c ../src/Lexer.cpp",
+    "file": "../src/Lexer.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSLib/src/Parser.o -c ../src/Parser.cpp",
+    "file": "../src/Parser.cpp" },
+  { "directory": "d:/repo/IPL/JSImpl/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../build/obj/Debug/Debug/JSImpl/src/main.o -c ../src/main.cpp",
+    "file": "../src/main.cpp" },
+  { "directory": "d:/repo/IPL/spasm/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/sprt/src/spasm.o -c ../src/spasm.cpp",
+    "file": "../src/spasm.cpp" },
+  { "directory": "d:/repo/IPL/spasm/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/assembler.o -c ../src/asm/assembler.cpp",
+    "file": "../src/asm/assembler.cpp" },
+  { "directory": "d:/repo/IPL/spasm/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/bytecode.o -c ../src/asm/bytecode.cpp",
+    "file": "../src/asm/bytecode.cpp" },
+  { "directory": "d:/repo/IPL/spasm/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/lexer.o -c ../src/asm/lexer.cpp",
+    "file": "../src/asm/lexer.cpp" },
+  { "directory": "d:/repo/IPL/spasm/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/symbol.o -c ../src/asm/symbol.cpp",
+    "file": "../src/asm/symbol.cpp" },
+  { "directory": "d:/repo/IPL/spasm/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/token.o -c ../src/asm/token.cpp",
+    "file": "../src/asm/token.cpp" },
+  { "directory": "d:/repo/IPL/spasm/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm_lib/src/asm/tokenizer.o -c ../src/asm/tokenizer.cpp",
+    "file": "../src/asm/tokenizer.cpp" },
+  { "directory": "d:/repo/IPL/spasm/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/spasm/src/asm/main.o -c ../src/asm/main.cpp",
+    "file": "../src/asm/main.cpp" },
+  { "directory": "d:/repo/IPL/spasm/solution",
+    "command": "g++ -MMD -MP -MP -D_SCL_SECURE_NO_WARNINGS -Werror -Wall -Wextra -g -std=c++17 -o ../../JSImpl/build/obj/Debug/Debug/sprun/src/main.o -c ../src/main.cpp",
+    "file": "../src/main.cpp" }
+]
\ No newline at end of file
diff --git a/gctest/solution/dummy_gc.make b/gctest/solution/dummy_gc.make
index fd8997d..e430d1c 100644
--- a/gctest/solution/dummy_gc.make
+++ b/gctest/solution/dummy_gc.make
@@ -43,9 +43,9 @@ endif
 MAKEFILE = dummy_gc.make
 
 ifeq ($(config),debug32)
-  OBJDIR              = ../build/obj/Debug/x32/Debug/dummy_gc
-  TARGETDIR           = ../build/bin/Debug
-  TARGET              = $(TARGETDIR)/dummy_gc.exe
+  OBJDIR              = ../../JSImpl/build/obj/Debug/x32/Debug/dummy_gc
+  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  TARGET              = $(TARGETDIR)/dummy_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
@@ -54,9 +54,9 @@ ifeq ($(config),debug32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m32
-  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
-  LDDEPS             += ../build/bin/Debug/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32
+  LIBDEPS            += ../../JSImpl/build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../../JSImpl/build/bin/Debug/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -75,9 +75,9 @@ ifeq ($(config),debug32)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR              = ../build/obj/Release/x32/Release/dummy_gc
-  TARGETDIR           = ../build/bin/Release
-  TARGET              = $(TARGETDIR)/dummy_gc.exe
+  OBJDIR              = ../../JSImpl/build/obj/Release/x32/Release/dummy_gc
+  TARGETDIR           = ../../JSImpl/build/bin/Release
+  TARGET              = $(TARGETDIR)/dummy_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
@@ -86,9 +86,9 @@ ifeq ($(config),release32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m32
-  LIBDEPS            += ../build/bin/Release/libtest_bench.a
-  LDDEPS             += ../build/bin/Release/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32
+  LIBDEPS            += ../../JSImpl/build/bin/Release/libtest_bench.a
+  LDDEPS             += ../../JSImpl/build/bin/Release/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -107,9 +107,9 @@ ifeq ($(config),release32)
 endif
 
 ifeq ($(config),debug64)
-  OBJDIR              = ../build/obj/Debug/x64/Debug/dummy_gc
-  TARGETDIR           = ../build/bin/Debug
-  TARGET              = $(TARGETDIR)/dummy_gc.exe
+  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/dummy_gc
+  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  TARGET              = $(TARGETDIR)/dummy_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
@@ -118,9 +118,9 @@ ifeq ($(config),debug64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m64
-  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
-  LDDEPS             += ../build/bin/Debug/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64
+  LIBDEPS            += ../../JSImpl/build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../../JSImpl/build/bin/Debug/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -139,9 +139,9 @@ ifeq ($(config),debug64)
 endif
 
 ifeq ($(config),release64)
-  OBJDIR              = ../build/obj/Release/x64/Release/dummy_gc
-  TARGETDIR           = ../build/bin/Release
-  TARGET              = $(TARGETDIR)/dummy_gc.exe
+  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/dummy_gc
+  TARGETDIR           = ../../JSImpl/build/bin/Release
+  TARGET              = $(TARGETDIR)/dummy_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
@@ -150,9 +150,9 @@ ifeq ($(config),release64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m64
-  LIBDEPS            += ../build/bin/Release/libtest_bench.a
-  LDDEPS             += ../build/bin/Release/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64
+  LIBDEPS            += ../../JSImpl/build/bin/Release/libtest_bench.a
+  LDDEPS             += ../../JSImpl/build/bin/Release/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
diff --git a/gctest/solution/dummy_gc.vcxproj b/gctest/solution/dummy_gc.vcxproj
index db98b09..5ca36a1 100644
--- a/gctest/solution/dummy_gc.vcxproj
+++ b/gctest/solution/dummy_gc.vcxproj
@@ -75,29 +75,29 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

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

-    <OutDir>..\build\bin\Debug\</OutDir>

-    <IntDir>..\build\obj\Debug\x32\Debug\dummy_gc\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\dummy_gc\</IntDir>

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

-    <OutDir>..\build\bin\Debug\</OutDir>

-    <IntDir>..\build\obj\Debug\x64\Debug\dummy_gc\</IntDir>

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

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

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

-    <OutDir>..\build\bin\Release\</OutDir>

-    <IntDir>..\build\obj\Release\x32\Release\dummy_gc\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\dummy_gc\</IntDir>

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

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

-    <OutDir>..\build\bin\Release\</OutDir>

-    <IntDir>..\build\obj\Release\x64\Release\dummy_gc\</IntDir>

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

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

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

diff --git a/gctest/solution/leak_gc.make b/gctest/solution/leak_gc.make
index c29f8ea..2cb1381 100644
--- a/gctest/solution/leak_gc.make
+++ b/gctest/solution/leak_gc.make
@@ -43,9 +43,9 @@ endif
 MAKEFILE = leak_gc.make
 
 ifeq ($(config),debug32)
-  OBJDIR              = ../build/obj/Debug/x32/Debug/leak_gc
-  TARGETDIR           = ../build/bin/Debug
-  TARGET              = $(TARGETDIR)/leak_gc.exe
+  OBJDIR              = ../../JSImpl/build/obj/Debug/x32/Debug/leak_gc
+  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  TARGET              = $(TARGETDIR)/leak_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
@@ -54,9 +54,9 @@ ifeq ($(config),debug32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m32
-  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
-  LDDEPS             += ../build/bin/Debug/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32
+  LIBDEPS            += ../../JSImpl/build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../../JSImpl/build/bin/Debug/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -75,9 +75,9 @@ ifeq ($(config),debug32)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR              = ../build/obj/Release/x32/Release/leak_gc
-  TARGETDIR           = ../build/bin/Release
-  TARGET              = $(TARGETDIR)/leak_gc.exe
+  OBJDIR              = ../../JSImpl/build/obj/Release/x32/Release/leak_gc
+  TARGETDIR           = ../../JSImpl/build/bin/Release
+  TARGET              = $(TARGETDIR)/leak_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
@@ -86,9 +86,9 @@ ifeq ($(config),release32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m32
-  LIBDEPS            += ../build/bin/Release/libtest_bench.a
-  LDDEPS             += ../build/bin/Release/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32
+  LIBDEPS            += ../../JSImpl/build/bin/Release/libtest_bench.a
+  LDDEPS             += ../../JSImpl/build/bin/Release/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -107,9 +107,9 @@ ifeq ($(config),release32)
 endif
 
 ifeq ($(config),debug64)
-  OBJDIR              = ../build/obj/Debug/x64/Debug/leak_gc
-  TARGETDIR           = ../build/bin/Debug
-  TARGET              = $(TARGETDIR)/leak_gc.exe
+  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/leak_gc
+  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  TARGET              = $(TARGETDIR)/leak_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
@@ -118,9 +118,9 @@ ifeq ($(config),debug64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m64
-  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
-  LDDEPS             += ../build/bin/Debug/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64
+  LIBDEPS            += ../../JSImpl/build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../../JSImpl/build/bin/Debug/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -139,9 +139,9 @@ ifeq ($(config),debug64)
 endif
 
 ifeq ($(config),release64)
-  OBJDIR              = ../build/obj/Release/x64/Release/leak_gc
-  TARGETDIR           = ../build/bin/Release
-  TARGET              = $(TARGETDIR)/leak_gc.exe
+  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/leak_gc
+  TARGETDIR           = ../../JSImpl/build/bin/Release
+  TARGET              = $(TARGETDIR)/leak_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
@@ -150,9 +150,9 @@ ifeq ($(config),release64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m64
-  LIBDEPS            += ../build/bin/Release/libtest_bench.a
-  LDDEPS             += ../build/bin/Release/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64
+  LIBDEPS            += ../../JSImpl/build/bin/Release/libtest_bench.a
+  LDDEPS             += ../../JSImpl/build/bin/Release/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
diff --git a/gctest/solution/leak_gc.vcxproj b/gctest/solution/leak_gc.vcxproj
index bf4ea47..cccba6f 100644
--- a/gctest/solution/leak_gc.vcxproj
+++ b/gctest/solution/leak_gc.vcxproj
@@ -75,29 +75,29 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

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

-    <OutDir>..\build\bin\Debug\</OutDir>

-    <IntDir>..\build\obj\Debug\x32\Debug\leak_gc\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\leak_gc\</IntDir>

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

-    <OutDir>..\build\bin\Debug\</OutDir>

-    <IntDir>..\build\obj\Debug\x64\Debug\leak_gc\</IntDir>

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

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

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

-    <OutDir>..\build\bin\Release\</OutDir>

-    <IntDir>..\build\obj\Release\x32\Release\leak_gc\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\leak_gc\</IntDir>

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

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

-    <OutDir>..\build\bin\Release\</OutDir>

-    <IntDir>..\build\obj\Release\x64\Release\leak_gc\</IntDir>

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

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

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

diff --git a/gctest/solution/test_bench.make b/gctest/solution/test_bench.make
index 9229102..9a503a5 100644
--- a/gctest/solution/test_bench.make
+++ b/gctest/solution/test_bench.make
@@ -43,8 +43,8 @@ endif
 MAKEFILE = test_bench.make
 
 ifeq ($(config),debug32)
-  OBJDIR              = ../build/obj/Debug/x32/Debug/test_bench
-  TARGETDIR           = ../build/bin/Debug
+  OBJDIR              = ../../JSImpl/build/obj/Debug/x32/Debug/test_bench
+  TARGETDIR           = ../../JSImpl/build/bin/Debug
   TARGET              = $(TARGETDIR)/libtest_bench.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -76,8 +76,8 @@ ifeq ($(config),debug32)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR              = ../build/obj/Release/x32/Release/test_bench
-  TARGETDIR           = ../build/bin/Release
+  OBJDIR              = ../../JSImpl/build/obj/Release/x32/Release/test_bench
+  TARGETDIR           = ../../JSImpl/build/bin/Release
   TARGET              = $(TARGETDIR)/libtest_bench.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -109,8 +109,8 @@ ifeq ($(config),release32)
 endif
 
 ifeq ($(config),debug64)
-  OBJDIR              = ../build/obj/Debug/x64/Debug/test_bench
-  TARGETDIR           = ../build/bin/Debug
+  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/test_bench
+  TARGETDIR           = ../../JSImpl/build/bin/Debug
   TARGET              = $(TARGETDIR)/libtest_bench.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -142,8 +142,8 @@ ifeq ($(config),debug64)
 endif
 
 ifeq ($(config),release64)
-  OBJDIR              = ../build/obj/Release/x64/Release/test_bench
-  TARGETDIR           = ../build/bin/Release
+  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/test_bench
+  TARGETDIR           = ../../JSImpl/build/bin/Release
   TARGET              = $(TARGETDIR)/libtest_bench.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
diff --git a/gctest/solution/test_bench.vcxproj b/gctest/solution/test_bench.vcxproj
index 3c6a9b1..6ea8e11 100644
--- a/gctest/solution/test_bench.vcxproj
+++ b/gctest/solution/test_bench.vcxproj
@@ -75,26 +75,26 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

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

-    <OutDir>..\build\bin\Debug\</OutDir>

-    <IntDir>..\build\obj\Debug\x32\Debug\test_bench\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\test_bench\</IntDir>

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

-    <OutDir>..\build\bin\Debug\</OutDir>

-    <IntDir>..\build\obj\Debug\x64\Debug\test_bench\</IntDir>

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

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

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

-    <OutDir>..\build\bin\Release\</OutDir>

-    <IntDir>..\build\obj\Release\x32\Release\test_bench\</IntDir>

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

+    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\test_bench\</IntDir>

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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

-    <OutDir>..\build\bin\Release\</OutDir>

-    <IntDir>..\build\obj\Release\x64\Release\test_bench\</IntDir>

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

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

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

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