Revert "Revert "Test""

This reverts commit 70cda67.

Readme.md

@@ -21,7 +21,7 @@ in the repository.
 Build and run, it will automatically start bochs/vmware/virtualbox with the included FreeDOS image. 
 It will create a CD-ROM as D: and you can run it from d:\entry.exe, by default it is automatically run (autoexec.bat)
 
-## 3rd Part Apps included
+## 3rd Party Apps included
 1. DOS32A - http://dos32a.narechk.net/index_en.html
 2. 386SWAT - http://www.sudleyplace.com/swat/
 3. UDIS86 - http://udis86.sourceforge.net/ , including an open watcom C project that is used by VDEBUG and MDEBUG

asm.vcxproj

@@ -172,6 +172,7 @@
     <None Include="data64.asm" />
     <None Include="directlong.asm" />
     <None Include="dmmic.asm" />
+    <None Include="dpmic.asm" />
     <None Include="gdt.asm" />
     <None Include="guest16.asm" />
     <None Include="guest32.asm" />

asm.vcxproj.filters

@@ -210,10 +210,13 @@
     <None Include="runx.bat">
       <Filter>Configuration</Filter>
     </None>
+    <None Include="dpmic.asm">
+      <Filter>DPMI Client</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dis\main.c">
-      <Filter>VDebug</Filter>
-    </ClCompile>
+    <Text Include="dis\main.c">
+      <Filter>16 bit code</Filter>
+    </Text>
   </ItemGroup>
 </Project>

build.bat

@@ -1,5 +1,6 @@
 del d.iso
 fasm entry.asm
+fasm dpmic.asm
 fasm dmmic.asm
 fasm vdebug.asm
 fasm mdebug.asm
@@ -12,6 +13,7 @@ copy /y mdebug.exe .\CD\mdebug.exe
 copy /y debuggee.exe .\CD\debuggee.exe 
 copy /y entry.exe .\CD\entry.exe 
 copy /y dmmic.exe .\CD\dmmic.exe
+copy /y dpmic.exe .\CD\dpmic.exe
 copy /y le.exe .\CD\le.exe
 copy /y runx.bat .\CD\runx.bat
 powershell -ExecutionPolicy RemoteSigned -File "iso.ps1"

config.asm

@@ -8,6 +8,6 @@ TEST_VMX = 1
 RESIDENT = 1
 
 
-VDEBUG = 0
+VDEBUG = 1
 MDEBUG = 0
 

dpmic.asm

@@ -0,0 +1,53 @@
+FORMAT MZ
+HEAP 0
+
+
+segment DATA16
+USE16
+
+
+; main
+segment CODE16
+USE16
+
+error:
+
+mov ax,0x4C00
+int 0x21
+
+	modesw	dd	0
+
+start16:
+
+	; A raw (not DOS32A) DPMI client
+	xchg bx,bx
+				
+	mov	ax,1687h		; get address of DPMI host's
+	int	2fh
+	or	ax,ax			; exit if no DPMI host
+	jnz	error
+	mov	word [modesw],di
+	mov	word [modesw+2],es
+	or	si,si			; check private data area size
+	jz .l1		     	; jump if no private data area
+
+	mov	bx,si			; allocate DPMI private area
+	mov	ah,48h			; allocate memory
+	int	21h			    ; transfer to DOS
+	jc error			; jump, allocation failed
+	mov	es,ax			; let ES=segment of data area
+
+.l1:
+	mov	ax,0			; bit 0=0 indicates 16-bit app
+	call [modesw]			; switch to protected mode
+	jc error			; jump if mode switch failed
+					; else we're in prot. mode now
+	nop
+
+	mov ax,0x4C00
+	int 0x21
+
+SEGMENT ENDS 
+entry CODE16:start16
+
+

runx.bat

@@ -12,9 +12,7 @@ rem dpmione pro=dpmione.pro
 cd ..
 
 vdebug debuggee.exe
-REM dism
-
-mdebug debuggee.exe
+rem mdebug debuggee.exe
 
 
 a:

vdisplay.asm

@@ -611,15 +611,15 @@ WaitForInput:
 
 	.CmdGo:
 		; Clear Trap
-		vmw32 0x4004,0x40 ; trap exception 0x06
+		vmw32 0x4004,0x0 ; trap exception 0x06
 		vmr rax,0x6820
 		btr rax,8
 		vmw64 0x6820,rax
 		jmp .InputEnd
 
 	.CmdTrace:
 		; Set Trap
-		vmw32 0x4004,0x42 ; trap exception 0x06 and 0x01
+		vmw32 0x4004,0x2 ; trap exception 0x06 and 0x01
 		vmr rax,0x6820
 		bts rax,8
 		vmw64 0x6820,rax