diff --git a/code16.asm b/code16.asm index 111d0f9..5f67ab8 100644 --- a/code16.asm +++ b/code16.asm @@ -582,10 +582,6 @@ end if push cs call EnterUnreal -; Real mode test -mov ax,0900h -mov dx,rm1 -int 21h if TEST_MULTI > 0 @@ -642,8 +638,13 @@ thrtest FromThread6,thr6 end if +; Real mode test +mov ax,0900h +mov dx,rm1 +int 21h ; PM mode test + mov ax,DATA32 mov gs,ax cmp [gs:d32],1 @@ -682,6 +683,11 @@ vmxshow vmt1,vmm1 vmxshow vmt2,vmm2 vmxshow vmt3,vmm2 + +mov ax,0900h +mov dx,crlf +int 21h + ; A20 off if enabled cmp [ds:a20enabled],1 diff --git a/data16.asm b/data16.asm index 3c4a0b4..31ff973 100644 --- a/data16.asm +++ b/data16.asm @@ -48,8 +48,8 @@ vmt1 db 0 ; existence vmt2 db 0 ; protected mode guest vmt3 db 0 ; unrestricted guest -vmm1 db "VMX Exists, OK, ","$" -vmm2 db "VMX Launch VM OK",0dh,0ah,"$" +vmm1 db "[VMX] ","$" +vmm2 db "[VMX Launch] ","$" ; --------------------------------------- 16 bit mutexes --------------------------------------- mut_ipi db 0xFF @@ -57,9 +57,9 @@ mut_1 db 0xFF mut_i21 db 0xFF ; --------------------------------------- Messages --------------------------------------- -rm1 db "Real mode test, OK",0dh,0ah,"$" -pm1 db "Protected mode test, OK",0dh,0ah,"$" -lm1 db "Long mode test, OK",0dh,0ah,"$" +rm1 db "[Real mode] ","$" +pm1 db "[Protected mode] ","$" +lm1 db "[Long mode] ","$" ap1 db "Apic 1 found ","$" ap2 db "Apic 2 found ","$" diff --git a/entry.exe b/entry.exe index 2434807..7b069dd 100644 Binary files a/entry.exe and b/entry.exe differ diff --git a/guest16.asm b/guest16.asm index cdba0ba..5941a03 100644 --- a/guest16.asm +++ b/guest16.asm @@ -12,6 +12,7 @@ StartVM: ; Remember we used a protected mode selector to get here? ; Jump to a real mode segment now so CS gets a proper value + nop nop