Changeset 6258

Timestamp:

01/06/08 02:38:45 (1 year ago)

Author:

vboxsync

Message:

db x,y,z -> mnemonics; yasm supports them.

Files:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm

@@ -25 +25 @@
-%include "VBox/x86.mac"
-
-build cvs nasm like on OS X
+fix OMF support in yasm and kick nasm out completely
- %macro vmwrite 2,
-    int3
@@ -721 +721 @@
-    mov     xAX, [xBP + xS*2]       ; pVMCBHostPhys (64 bits physical address; x86: take low dword only)
-    push    xAX                     ; save for the vmload after vmrun
-DB      0x0F, 0x01, 0xDB        ; VMSAVE
+vmsave
-
-    ; setup eax for VMLOAD
@@ -736 +736 @@
-
-    ; Clear the global interrupt flag & execute sti to make sure external interrupts cause a world switch
-DB      0x0f, 0x01, 0xDD        ; CLGI
+clgi
-    sti
-
-    ; load guest fs, gs, sysenter msr etc
-DB      0x0f, 0x01, 0xDA        ; VMLOAD
+vmload
-    ; run the VM
-DB      0x0F, 0x01, 0xD8        ; VMRUN
+vmrun
-
-    ;/* EAX is in the VMCB already; we can use it here. */
-
-    ; save guest fs, gs, sysenter msr etc
-DB      0x0F, 0x01, 0xDB        ; VMSAVE
+vmsave
-
-    ; load host fs, gs, sysenter msr etc
-    pop     xAX                     ; pushed above
-DB      0x0F, 0x01, 0xDA        ; VMLOAD
+vmload
-
-    ; Set the global interrupt flag again, but execute cli to make sure IF=0.
-    cli
-DB      0x0f, 0x01, 0xDC        ; STGI
+stgi
-
-    pop     xAX                     ; pCtx
@@ -777 +777 @@
-    ret
-ENDPROC SVMVMRun
+
-
-;;
@@ -794 +795 @@
-    mov     ecx, edx
- %endif
-    ;invlpga rax, ecx - YASM 0.6.2 BUG? ;; @todo investigate and file bug report.
-    db 0fh, 01h, 0dfh
-%else
-    mov     eax, [esp + 4]
-    mov     ecx, [esp + 8]
-
-
-
+
+
-    ret
-ENDPROC SVMInvlpgA