R .kdev4/jasm.kdev4 =>  +0 -51
@@ 1,51 0,0 @@ 
-[Buildset]
-BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x08\x00j\x00a\x00s\x00m)
-
-[CMake]
-Build Directory Count=1
-Current Build Directory Index-Host System=0
-
-[CMake][CMake Build Directory 0]
-Build Directory Path=/home/jonas/dev/c64/jasm/build
-Build Type=Debug
-CMake Binary=/usr/bin/cmake
-CMake Executable=/usr/bin/cmake
-Environment Profile=
-Extra Arguments=
-Install Directory=/usr/local
-Runtime=Host System
-
-[Launch]
-Launch Configurations=Launch Configuration 2,Launch Configuration 0
-
-[Launch][Launch Configuration 0]
-Configured Launch Modes=execute
-Configured Launchers=nativeAppLauncher
-Name=jasm
-Type=Native Application
-
-[Launch][Launch Configuration 0][Data]
-Arguments=-v3 test/test.jasm test.prg
-Dependencies=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x00)
-Dependency Action=Nothing
-EnvironmentGroup=
-Executable=file:///home/jonas/dev/c64/jasm
-External Terminal=konsole --noclose --workdir %workdir -e %exe
-Project Target=jasm,jasm,jasm
-Use External Terminal=false
-Working Directory=file:///home/jonas/dev/c64/jasm/jasm
-isExecutable=false
-
-[Launch][Launch Configuration 2]
-Configured Launch Modes=execute
-Configured Launchers=nativeAppLauncher
-Name=hasher
-Type=Native Application
-
-[Launch][Launch Configuration 2][Data]
-Dependencies=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x03\x00\x00\x00\x08\x00j\x00a\x00s\x00m\x00\x00\x00\x0c\x00h\x00a\x00s\x00h\x00e\x00r\x00\x00\x00\x0c\x00h\x00a\x00s\x00h\x00e\x00r)
-Dependency Action=Build
-Project Target=jasm,hasher,hasher
-
-[Project]
-VersionControlSupport=kdevgit

          
R core/core.cbp =>  +0 -142
@@ 1,142 0,0 @@ 
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="core" />
-		<Option pch_mode="2" />
-		<Option compiler="clang" />
-		<Build>
-			<Target title="debug">
-				<Option output="bin/debug/core" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="obj/debug/" />
-				<Option type="2" />
-				<Option compiler="clang" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-g" />
-					<Add option="-D_GLIBCXX_DEBUG" />
-					<Add option="-D_DEBUG" />
-				</Compiler>
-			</Target>
-			<Target title="debug-6502">
-				<Option output="bin/debug/core" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="obj/debug/" />
-				<Option type="2" />
-				<Option compiler="clang" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-g" />
-					<Add option="-D_GLIBCXX_DEBUG" />
-					<Add option="-D_DEBUG" />
-				</Compiler>
-			</Target>
-			<Target title="debug-z80">
-				<Option output="bin/debug/core" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="obj/debug/" />
-				<Option type="2" />
-				<Option compiler="clang" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-g" />
-					<Add option="-D_GLIBCXX_DEBUG" />
-					<Add option="-D_DEBUG" />
-				</Compiler>
-			</Target>
-			<Target title="release">
-				<Option output="bin/release/core" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="obj/release/" />
-				<Option type="2" />
-				<Option compiler="clang" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-			<Target title="release-6502">
-				<Option output="bin/release/core" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="obj/release/" />
-				<Option type="2" />
-				<Option compiler="clang" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-			<Target title="release-z80">
-				<Option output="bin/release/core" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="obj/release/" />
-				<Option type="2" />
-				<Option compiler="clang" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wnon-virtual-dtor" />
-			<Add option="-Wbind-to-temporary-copy" />
-			<Add option="-Wambiguous-member-template" />
-			<Add option="-Wextra-tokens" />
-			<Add option="-Weverything" />
-			<Add option="-Wall" />
-			<Add option="-std=c++14" />
-			<Add directory="/home/jonas/dev/c64/jasm/core/" />
-		</Compiler>
-		<Unit filename="core/collections/array_helper.h" />
-		<Unit filename="core/collections/hash_map.h" />
-		<Unit filename="core/collections/null_hash_compare.h" />
-		<Unit filename="core/collections/static_array.h" />
-		<Unit filename="core/collections/string_hash_functor.h" />
-		<Unit filename="core/debug/timer.cpp" />
-		<Unit filename="core/debug/timer.h" />
-		<Unit filename="core/environment/log.cpp" />
-		<Unit filename="core/environment/log.h" />
-		<Unit filename="core/exceptions/exception.h" />
-		<Unit filename="core/exceptions/file_exception.h" />
-		<Unit filename="core/io/file_helpers.cpp" />
-		<Unit filename="core/io/file_helpers.h" />
-		<Unit filename="core/io/file_helpers_linux.cpp" />
-		<Unit filename="core/io/file_helpers_win.cpp" />
-		<Unit filename="core/io/file_id.h" />
-		<Unit filename="core/io/file_id_linux.cpp" />
-		<Unit filename="core/io/file_id_linux.h" />
-		<Unit filename="core/io/file_id_win.cpp" />
-		<Unit filename="core/io/file_id_win.h" />
-		<Unit filename="core/io/file_writer.cpp" />
-		<Unit filename="core/io/file_writer.h" />
-		<Unit filename="core/io/text_reader.cpp" />
-		<Unit filename="core/io/text_reader.h" />
-		<Unit filename="core/math/algorithm.h" />
-		<Unit filename="core/ownership/destruct_call.h" />
-		<Unit filename="core/strings/murmur_hash.cpp" />
-		<Unit filename="core/strings/murmur_hash.h" />
-		<Unit filename="core/strings/string_helpers.cpp" />
-		<Unit filename="core/strings/string_helpers.h" />
-		<Unit filename="core/strings/utf8.cpp" />
-		<Unit filename="core/strings/utf8.h" />
-		<Unit filename="pch.cpp" />
-		<Unit filename="pch.h" />
-		<Extensions>
-			<envvars />
-			<code_completion />
-			<lib_finder disable_auto="1" />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

          
R core/core.vcxproj =>  +0 -257
@@ 1,257 0,0 @@ 
-<?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-hasher|x64">
-      <Configuration>debug-hasher</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug-jasm-6502|x64">
-      <Configuration>debug-jasm-6502</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug-jasm-z80|x64">
-      <Configuration>debug-jasm-z80</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-hasher|x64">
-      <Configuration>release-hasher</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-jasm-6502|x64">
-      <Configuration>release-jasm-6502</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release-jasm-z80|x64">
-      <Configuration>release-jasm-z80</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{082DD209-F99C-4F50-B360-7F0E75103418}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>core</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug-jasm-z80|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug-jasm-6502|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug-hasher|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-jasm-z80|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-jasm-6502|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-hasher|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug-jasm-z80|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)'=='debug-jasm-6502|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)'=='debug-hasher|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-jasm-z80|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-jasm-6502|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-hasher|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 />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug-jasm-z80|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug-jasm-6502|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug-hasher|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release-jasm-z80|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release-jasm-6502|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release-hasher|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="core\collections\array_helper.h" />
-    <ClInclude Include="core\collections\hash_map.h" />
-    <ClInclude Include="core\collections\null_hash_compare.h" />
-    <ClInclude Include="core\collections\static_array.h" />
-    <ClInclude Include="core\collections\string_hash_functor.h" />
-    <ClInclude Include="core\debug\timer.h" />
-    <ClInclude Include="core\environment\log.h" />
-    <ClInclude Include="core\exceptions\exception.h" />
-    <ClInclude Include="core\exceptions\file_exception.h" />
-    <ClInclude Include="core\io\file_helpers.h" />
-    <ClInclude Include="core\io\file_id.h" />
-    <ClInclude Include="core\io\file_id_linux.h" />
-    <ClInclude Include="core\io\file_id_win.h" />
-    <ClInclude Include="core\io\file_writer.h" />
-    <ClInclude Include="core\io\text_reader.h" />
-    <ClInclude Include="core\math\algorithm.h" />
-    <ClInclude Include="core\math\sign.h" />
-    <ClInclude Include="core\ownership\destruct_call.h" />
-    <ClInclude Include="core\strings\murmur_hash.h" />
-    <ClInclude Include="core\strings\string_helpers.h" />
-    <ClInclude Include="core\strings\utf8.h" />
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="core\debug\timer.cpp" />
-    <ClCompile Include="core\environment\log.cpp" />
-    <ClCompile Include="core\io\file_helpers.cpp" />
-    <ClCompile Include="core\io\file_helpers_linux.cpp" />
-    <ClCompile Include="core\io\file_helpers_win.cpp" />
-    <ClCompile Include="core\io\file_id_linux.cpp" />
-    <ClCompile Include="core\io\file_id_win.cpp" />
-    <ClCompile Include="core\io\file_writer.cpp" />
-    <ClCompile Include="core\io\text_reader.cpp" />
-    <ClCompile Include="core\strings\murmur_hash.cpp" />
-    <ClCompile Include="core\strings\string_helpers.cpp" />
-    <ClCompile Include="core\strings\utf8.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='debug-jasm-z80|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='debug-jasm-6502|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='debug-hasher|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='release-jasm-z80|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='release-jasm-6502|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='release-hasher|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
  No newline at end of file

          
R core/core.vcxproj.filters =>  +0 -135
@@ 1,135 0,0 @@ 
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="collections">
-      <UniqueIdentifier>{6c1c965c-0ac2-49af-9d27-b1cda263bdc8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="debug">
-      <UniqueIdentifier>{02714a81-401f-42e0-bc79-be31bad04c66}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="environment">
-      <UniqueIdentifier>{b0e33496-f614-446a-b33b-1c82759c9666}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="exceptions">
-      <UniqueIdentifier>{edc7827e-b658-4f4c-862d-e32c242e375e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="io">
-      <UniqueIdentifier>{03abcd40-4323-43a8-8c4e-9ad68bd8d194}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="math">
-      <UniqueIdentifier>{b20e845d-8774-42b8-a05b-ea381a2e05b1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ownership">
-      <UniqueIdentifier>{cda4ac4c-2405-4c9e-83cb-04e5bc66adf4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="strings">
-      <UniqueIdentifier>{fb689b3e-bbea-4048-9e54-3de14cd453d8}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="core\collections\array_helper.h">
-      <Filter>collections</Filter>
-    </ClInclude>
-    <ClInclude Include="core\collections\hash_map.h">
-      <Filter>collections</Filter>
-    </ClInclude>
-    <ClInclude Include="core\collections\null_hash_compare.h">
-      <Filter>collections</Filter>
-    </ClInclude>
-    <ClInclude Include="core\collections\string_hash_functor.h">
-      <Filter>collections</Filter>
-    </ClInclude>
-    <ClInclude Include="core\debug\timer.h">
-      <Filter>debug</Filter>
-    </ClInclude>
-    <ClInclude Include="core\environment\log.h">
-      <Filter>environment</Filter>
-    </ClInclude>
-    <ClInclude Include="core\exceptions\exception.h">
-      <Filter>exceptions</Filter>
-    </ClInclude>
-    <ClInclude Include="core\exceptions\file_exception.h">
-      <Filter>exceptions</Filter>
-    </ClInclude>
-    <ClInclude Include="core\io\file_helpers.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="core\io\file_id.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="core\io\file_id_linux.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="core\io\file_id_win.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="core\io\file_writer.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="core\io\text_reader.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="core\math\algorithm.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="core\math\sign.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="core\ownership\destruct_call.h">
-      <Filter>ownership</Filter>
-    </ClInclude>
-    <ClInclude Include="core\strings\utf8.h">
-      <Filter>strings</Filter>
-    </ClInclude>
-    <ClInclude Include="core\strings\string_helpers.h">
-      <Filter>strings</Filter>
-    </ClInclude>
-    <ClInclude Include="core\strings\murmur_hash.h">
-      <Filter>strings</Filter>
-    </ClInclude>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="core\debug\timer.cpp">
-      <Filter>debug</Filter>
-    </ClCompile>
-    <ClCompile Include="core\environment\log.cpp">
-      <Filter>environment</Filter>
-    </ClCompile>
-    <ClCompile Include="core\io\file_helpers.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="core\io\file_helpers_linux.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="core\io\file_helpers_win.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="core\io\file_id_linux.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="core\io\file_id_win.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="core\io\file_writer.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="core\io\text_reader.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="core\strings\string_helpers.cpp">
-      <Filter>strings</Filter>
-    </ClCompile>
-    <ClCompile Include="core\strings\utf8.cpp">
-      <Filter>strings</Filter>
-    </ClCompile>
-    <ClCompile Include="core\strings\murmur_hash.cpp">
-      <Filter>strings</Filter>
-    </ClCompile>
-    <ClCompile Include="pch.cpp" />
-  </ItemGroup>
-</Project>
  No newline at end of file

          
M jasm/docs/jasm.md +2 -2
@@ 2854,8 2854,8 @@ The following example measures the size 
 		section code, "string", *
 		{
 			define byte[] str = {
-				P"LONG STRING DATA STORED HERE... ",
-				P"NO ONE KNOWS WHERE IT ENDS..."
+				"LONG STRING DATA STORED HERE... ",
+				"NO ONE KNOWS WHERE IT ENDS..."
 			}
 		}
 	}

          
M jasm/processor/45gs02/processor_45gs02.cpp +1 -1
@@ 1025,7 1025,7 @@ const SyntaxToken *Processor45gs02::pars
 	}
 	if (addr_mode == AddressingModeMask::RelW) {
 		if (generate) {
-			int32_t reference_addr = assembler._program_counter.integer_value + 3; // move past the instruction
+			int32_t reference_addr = assembler._program_counter.integer_value + 2; // move past the first two bytes of the instruction (NOT THE ENTIRE INSTRUCTION)
 			int32_t relative_addr = argument_value - reference_addr;
 			if (relative_addr < -32768 || relative_addr > 32767) {
 				std::stringstream ss;

          
M jasm/processor/65ce02/processor_65ce02.cpp +1 -1
@@ 931,7 931,7 @@ const SyntaxToken *Processor65ce02::pars
 	}
 	if (addr_mode == AddressingModeMask::RelW) {
 		if (generate) {
-			int32_t reference_addr = assembler._program_counter.integer_value + 3; // move past the instruction
+			int32_t reference_addr = assembler._program_counter.integer_value + 2; // move past the first two bytes of the instruction (NOT THE ENTIRE INSTRUCTION)
 			int32_t relative_addr = argument_value - reference_addr;
 			if (relative_addr < -32768 || relative_addr > 32767) {
 				std::stringstream ss;

          
M jasm/unit_tests/results/test_all_instructions_45gs02.bin +0 -0

M jasm/unit_tests/results/test_all_instructions_65ce02.bin +0 -0

M jasm/unit_tests/results/test_instruction_data_label_offsets_65ce02.bin +1 -1
@@ 1,1 1,1 @@ 
-l4|4
  No newline at end of file
+l4|4
  No newline at end of file

          
M jasm/unit_tests/results/test_instruction_data_label_sizes_65ce02.bin +1 -1
@@ 1,1 1,1 @@ 
-l4|4
  No newline at end of file
+l4|4
  No newline at end of file

          
M jasm/unit_tests/test_addressing_mode_branch_too_long_1_65ce02.asm +1 -1
@@ 2,5 2,5 @@ 
 
 section code, "main", $8000
 {
-	bne 2
+	bne 1
 }

          
M jasm/unit_tests/test_addressing_mode_branch_too_long_2_65ce02.asm +1 -1
@@ 2,5 2,5 @@ 
 
 section code, "main", $1000
 {
-	bne $9003
+	bne $9002
 }

          
M jasm/version.h +1 -1
@@ 1,1 1,1 @@ 
-1,30
+1,31

          
M jasm/website/site/docs/index.html +2 -2
@@ 2971,8 2971,8 @@ end:
     <span class="keyword">section</span> <span class="keyword">code</span>, <span class="literal">"string"</span>, <span class="operator">*</span>
     <span class="special">{</span>
         <span class="keyword">define</span> <span class="keyword">byte</span><span class="special">[</span><span class="special">]</span> str <span class="operator">=</span> <span class="special">{</span>
-            P<span class="literal">"LONG STRING DATA STORED HERE... "</span>,
-            P<span class="literal">"NO ONE KNOWS WHERE IT ENDS..."</span>
+            <span class="literal">"LONG STRING DATA STORED HERE... "</span>,
+            <span class="literal">"NO ONE KNOWS WHERE IT ENDS..."</span>
         <span class="special">}</span>
     <span class="special">}</span>
 <span class="special">}</span>

          
M jasm/website/site/index.html +8 -8
@@ 121,16 121,10 @@ 
 				<h1>The Binaries</h1>
 				<ul>
 					<li>
-						<a href="binaries/jasm_1.30_linux64.7z">jAsm 1.30 for 64-bit Linux</a>
+						<a href="binaries/jasm_1.31_linux64.7z">jAsm 1.31 for 64-bit Linux</a>
 					</li>
 					<li>
-						<a href="binaries/jasm_1.29_linux64.7z">jAsm 1.29 for 64-bit Linux</a>
-					</li>
-					<li>
-						<a href="binaries/jasm_1.30_win64.7z">jAsm 1.30 for 64-bit Windows</a>
-					</li>
-					<li>
-						<a href="binaries/jasm_1.29_win64.7z">jAsm 1.29 for 64-bit Windows</a>
+						<a href="binaries/jasm_1.31_win64.7z">jAsm 1.31 for 64-bit Windows</a>
 					</li>
 				</ul>
 				<h1>The Source</h1>

          
@@ 145,6 139,12 @@ 
 				<h1>Version History</h1>
 				<ul>
 					<li>
+						1.31
+						<ul>
+							<li>A serious bug where 16 bit branches in 65ce02 and 45gs02 jumps to the wrong address.</li>
+						</ul>
+					</li>
+					<li>
 						1.30
 						<ul>
 							<li>Fixed a crash when a symbol definition referred to the constant or variable being created.</li>