Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for Visual C++ #29

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions libvm68k.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30804.86
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvm68kapi", "libvm68kapi\libvm68kapi.vcxproj", "{5F7B0707-5A29-4CC6-892B-854AEE7F5CD2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvm68k", "libvm68k\libvm68k.vcxproj", "{3A617641-3F17-412A-AE62-088A6F6B88EF}"
ProjectSection(ProjectDependencies) = postProject
{5F7B0707-5A29-4CC6-892B-854AEE7F5CD2} = {5F7B0707-5A29-4CC6-892B-854AEE7F5CD2}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5F7B0707-5A29-4CC6-892B-854AEE7F5CD2}.Debug|x64.ActiveCfg = Debug|x64
{5F7B0707-5A29-4CC6-892B-854AEE7F5CD2}.Debug|x64.Build.0 = Debug|x64
{5F7B0707-5A29-4CC6-892B-854AEE7F5CD2}.Debug|x86.ActiveCfg = Debug|Win32
{5F7B0707-5A29-4CC6-892B-854AEE7F5CD2}.Debug|x86.Build.0 = Debug|Win32
{5F7B0707-5A29-4CC6-892B-854AEE7F5CD2}.Release|x64.ActiveCfg = Release|x64
{5F7B0707-5A29-4CC6-892B-854AEE7F5CD2}.Release|x64.Build.0 = Release|x64
{5F7B0707-5A29-4CC6-892B-854AEE7F5CD2}.Release|x86.ActiveCfg = Release|Win32
{5F7B0707-5A29-4CC6-892B-854AEE7F5CD2}.Release|x86.Build.0 = Release|Win32
{3A617641-3F17-412A-AE62-088A6F6B88EF}.Debug|x64.ActiveCfg = Debug|x64
{3A617641-3F17-412A-AE62-088A6F6B88EF}.Debug|x64.Build.0 = Debug|x64
{3A617641-3F17-412A-AE62-088A6F6B88EF}.Debug|x86.ActiveCfg = Debug|Win32
{3A617641-3F17-412A-AE62-088A6F6B88EF}.Debug|x86.Build.0 = Debug|Win32
{3A617641-3F17-412A-AE62-088A6F6B88EF}.Release|x64.ActiveCfg = Release|x64
{3A617641-3F17-412A-AE62-088A6F6B88EF}.Release|x64.Build.0 = Release|x64
{3A617641-3F17-412A-AE62-088A6F6B88EF}.Release|x86.ActiveCfg = Release|Win32
{3A617641-3F17-412A-AE62-088A6F6B88EF}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9BE8DEF1-ABA1-44E5-AD22-8A14B06800CB}
EndGlobalSection
EndGlobal
9 changes: 9 additions & 0 deletions libvm68k/bits/vm68k/execution_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@

namespace vm68k
{
#if _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4251)
#endif

/*
* Execution contexts.
*/
Expand Down Expand Up @@ -246,6 +251,10 @@ namespace vm68k
return function_code::data; // FIXME
}
};

#if _MSC_VER
#pragma warning(pop)
#endif
}

#endif
172 changes: 172 additions & 0 deletions libvm68k/libvm68k.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<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">
<VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{3a617641-3f17-412a-ae62-088a6f6b88ef}</ProjectGuid>
<RootNamespace>libvm68k</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<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|Win32'">
<LinkIncremental>true</LinkIncremental>
<TargetName>vm68k-1</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<TargetName>vm68k-1</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<TargetName>vm68k-1</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>vm68k-1</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>.;..\libvm68kapi</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIBVM68K;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>.;..\libvm68kapi</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIBVM68K;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>.;..\libvm68kapi</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIBVM68K;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>.;..\libvm68kapi</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIBVM68K;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="execution_context.cpp" />
<ClCompile Include="executor.cpp" />
<ClCompile Include="instruction_decoder.cpp" />
<ClCompile Include="pipeline.cpp" />
<ClCompile Include="read_write_memory.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="bits\vm68kdef.h" />
<ClInclude Include="bits\vm68k\execution_context.h" />
<ClInclude Include="bits\vm68k\executor.h" />
<ClInclude Include="bits\vm68k\instruction_decoder.h" />
<ClInclude Include="bits\vm68k\pipeline.h" />
<ClInclude Include="bits\vm68k\read_write_memory.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\libvm68kapi\libvm68kapi.vcxproj">
<Project>{5f7b0707-5a29-4cc6-892b-854aee7f5cd2}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
54 changes: 54 additions & 0 deletions libvm68k/libvm68k.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<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>
</ItemGroup>
<ItemGroup>
<ClCompile Include="instruction_decoder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="execution_context.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="executor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pipeline.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="read_write_memory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="bits\vm68kdef.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="bits\vm68k\execution_context.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="bits\vm68k\executor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="bits\vm68k\instruction_decoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="bits\vm68k\pipeline.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="bits\vm68k\read_write_memory.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
9 changes: 9 additions & 0 deletions libvm68kapi/bits/vm68k/memory_exception.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@

namespace vm68k
{
#if _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4275)
#endif

/**
* Generic memory exceptions.
*/
Expand Down Expand Up @@ -68,6 +73,10 @@ namespace vm68k
const char *what() const noexcept override;
};

#if _MSC_VER
#pragma warning(pop)
#endif

/**
* Bus errors.
*/
Expand Down
Loading