Skip to content

Commit

Permalink
VMWare Added
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Chourdakis committed Dec 25, 2018
1 parent e3722c8 commit faf3628
Show file tree
Hide file tree
Showing 9 changed files with 107 additions and 24 deletions.
1 change: 1 addition & 0 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ At the moment, the first part is implemented (Real/Protected/Long mode). More to
2. In Project Properties -> Debugger, put the BOCHSDBG.EXE path to command to run

Build and run, it will automatically start bochs with the included FreeDOS image. It will create a CD-ROM as R: and you can run it.
You have also a VMWare configuration to test


9 changes: 6 additions & 3 deletions asm.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asm", "asm.vcxproj", "{68FE
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|x64 = Release|x64
Bochs|DOS = Bochs|DOS
VMWare|DOS = VMWare|DOS
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{68FEA001-C33A-4EBC-A70F-9788736975B5}.Release|x64.ActiveCfg = Release|x64
{68FEA001-C33A-4EBC-A70F-9788736975B5}.Release|x64.Build.0 = Release|x64
{68FEA001-C33A-4EBC-A70F-9788736975B5}.Bochs|DOS.ActiveCfg = DOS|x64
{68FEA001-C33A-4EBC-A70F-9788736975B5}.Bochs|DOS.Build.0 = DOS|x64
{68FEA001-C33A-4EBC-A70F-9788736975B5}.VMWare|DOS.ActiveCfg = VMWare|x64
{68FEA001-C33A-4EBC-A70F-9788736975B5}.VMWare|DOS.Build.0 = VMWare|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
40 changes: 20 additions & 20 deletions asm.vcxproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<ProjectConfiguration Include="DOS|x64">
<Configuration>DOS</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<ProjectConfiguration Include="VMWare|x64">
<Configuration>VMWare</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
Expand All @@ -17,14 +17,14 @@
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DOS|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='VMWare|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
Expand All @@ -36,15 +36,15 @@
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='DOS|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='VMWare|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)'=='Release|x64'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DOS|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
Expand All @@ -58,7 +58,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='VMWare|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
Expand All @@ -75,16 +75,16 @@
<ItemGroup>
<CustomBuild Include="entry.asm">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">build.bat</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">build.bat</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">entry.exe</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">entry.exe</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</TreatOutputAsContent>
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TreatOutputAsContent>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">*.asm</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">*.asm</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='DOS|x64'">build.bat</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='VMWare|x64'">build.bat</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='DOS|x64'">entry.exe</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='VMWare|x64'">entry.exe</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='DOS|x64'">false</LinkObjects>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='VMWare|x64'">false</LinkObjects>
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='DOS|x64'">true</TreatOutputAsContent>
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='VMWare|x64'">true</TreatOutputAsContent>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DOS|x64'">*.asm</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='VMWare|x64'">*.asm</AdditionalInputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion bx_enh_dbg.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ ListWidthPix[1] = 498
ListWidthPix[2] = 569
FontName = System
FontSize = -16
MainWindow = 447, 192, 1887, 959
MainWindow = 448, 184, 1888, 951
1 change: 1 addition & 0 deletions code64.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ORG 0h

Start64:

xchg bx,bx ; BOCHS magic breakpoint
xor r8d,r8d
mov rsp,stack64_end
push rax
Expand Down
Binary file added vm.nvram
Binary file not shown.
Empty file added vm.vmsd
Empty file.
70 changes: 70 additions & 0 deletions vm.vmx
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
.encoding = "UTF-8"
config.version = "8"
virtualHW.version = "12"
numvcpus = "4"
cpuid.coresPerSocket = "2"
scsi0.present = "TRUE"
scsi0.virtualDev = "lsilogic"
memsize = "256"
ide1:0.present = "TRUE"
ide1:0.fileName = "d.iso"
ide1:0.deviceType = "cdrom-image"
ethernet0.present = "TRUE"
ethernet0.virtualDev = "e1000"
ethernet0.wakeOnPcktRcv = "FALSE"
ethernet0.addressType = "generated"
sound.present = "TRUE"
sound.fileName = "-1"
sound.autodetect = "TRUE"
pciBridge0.present = "TRUE"
pciBridge4.present = "TRUE"
pciBridge4.virtualDev = "pcieRootPort"
pciBridge4.functions = "8"
pciBridge5.present = "TRUE"
pciBridge5.virtualDev = "pcieRootPort"
pciBridge5.functions = "8"
pciBridge6.present = "TRUE"
pciBridge6.virtualDev = "pcieRootPort"
pciBridge6.functions = "8"
pciBridge7.present = "TRUE"
pciBridge7.virtualDev = "pcieRootPort"
pciBridge7.functions = "8"
vmci0.present = "TRUE"
hpet0.present = "TRUE"
displayName = "vm"
guestOS = "other-64"
nvram = "vm.nvram"
virtualHW.productCompatibility = "hosted"
powerType.powerOff = "soft"
powerType.powerOn = "soft"
powerType.suspend = "soft"
powerType.reset = "soft"
extendedConfigFile = "vm.vmxf"
floppy0.present = "TRUE"
floppy0.fileType = "file"
floppy0.fileName = "a.img"
floppy0.clientDevice = "FALSE"
ide1:1.present = "FALSE"
numa.autosize.vcpu.maxPerVirtualNode = "4"
numa.autosize.cookie = "40001"
uuid.bios = "56 4d 7d ca 1a f4 3a f5-56 4f dd da 39 38 a1 15"
uuid.location = "56 4d 7d ca 1a f4 3a f5-56 4f dd da 39 38 a1 15"
migrate.hostlog = ".\vm-e7233550.hlog"
pciBridge0.pciSlotNumber = "17"
pciBridge4.pciSlotNumber = "21"
pciBridge5.pciSlotNumber = "22"
pciBridge6.pciSlotNumber = "23"
pciBridge7.pciSlotNumber = "24"
scsi0.pciSlotNumber = "16"
ethernet0.pciSlotNumber = "32"
sound.pciSlotNumber = "33"
vmci0.pciSlotNumber = "34"
ethernet0.generatedAddress = "00:0c:29:38:a1:15"
ethernet0.generatedAddressOffset = "0"
vmci0.id = "960012565"
monitor.phys_bits_used = "42"
vmotion.checkpointFBSize = "33554432"
vmotion.checkpointSVGAPrimarySize = "33554432"
cleanShutdown = "TRUE"
softPowerOff = "TRUE"
checkpoint.vmState = ""
8 changes: 8 additions & 0 deletions vm.vmxf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<Foundry>
<VM>
<VMId type="string">52 02 53 21 5d ef 94 b8-dc 4b 85 9c d9 6d f4 1b</VMId>
<ClientMetaData>
<clientMetaDataAttributes/>
<HistoryEventList/></ClientMetaData>
<vmxPathName type="string">vm.vmx</vmxPathName></VM></Foundry>

0 comments on commit faf3628

Please sign in to comment.