fixed svm entry launch

[palacios.git] / palacios / src / palacios / svm_lowlevel.S

diff --git a/palacios/src/palacios/svm_lowlevel.S b/palacios/src/palacios/svm_lowlevel.S
index 3a17df4..e01f069 100644 (file)
--- a/palacios/src/palacios/svm_lowlevel.S
+++ b/palacios/src/palacios/svm_lowlevel.S
@@ -31,7 +31,7 @@
        movl    %edx, 40(%eax);         \
        movl    %ecx, 48(%eax);         \
        pushl   %ebx;                   \
-       movl    4(%esp), %ebx;          \
+       movl    8(%esp), %ebx;          \
        movl    %ebx, 56(%eax);         \
        popl    %ebx;                   \
        popl    %eax;                   
@@ -83,37 +83,85 @@ v3_svm_launch:
 #elif __V3_64BIT__
 
 #define Save_SVM_Registers(location)   \
-       pushl   %eax;                   \
-       movl    location, %eax;         \
-       movl    %edi, (%eax);           \
-       movl    %esi, 8(%eax);          \
-       movl    %ebp, 16(%eax);         \
-       movl    $0, 24(%eax);           \
-       movl    %ebx, 32(%eax);         \
-       movl    %edx, 40(%eax);         \
-       movl    %ecx, 48(%eax);         \
-       pushl   %ebx;                   \
-       movl    4(%esp), %ebx;          \
-       movl    %ebx, 56(%eax);         \
-       popl    %ebx;                   \
-       popl    %eax;                   
+       push    %rax;                   \
+       mov     location, %rax;         \
+       mov     %rdi, (%rax);           \
+       mov     %rsi, 8(%rax);          \
+       mov     %rbp, 16(%rax);         \
+       movq    $0, 24(%rax);           \
+       mov     %rbx, 32(%rax);         \
+       mov     %rdx, 40(%rax);         \
+       mov     %rcx, 48(%rax);         \
+       push    %rbx;                   \
+       mov     16(%rsp), %rbx;         \
+       mov     %rbx, 56(%rax);         \
+       pop     %rbx;                   \
+       pop     %rax;                   
        
 
 #define Restore_SVM_Registers(location) \
-       pushl   %eax;                   \
-       movl    location, %eax;         \
-       movl    (%eax), %edi;           \
-       movl    8(%eax), %esi;          \
-       movl    16(%eax), %ebp;         \
-       movl    32(%eax), %ebx;         \
-       movl    40(%eax), %edx;         \
-       movl    48(%eax), %ecx;         \
-       popl    %eax;
+       push    %rax;                   \
+       mov     location, %rax;         \
+       mov     (%rax), %rdi;           \
+       mov     8(%rax), %rsi;          \
+       mov     16(%rax), %rbp;         \
+       mov     32(%rax), %rbx;         \
+       mov     40(%rax), %rdx;         \
+       mov     48(%rax), %rcx;         \
+       pop     %rax;
+
+
 
 
+#define PUSHA                          \
+       pushq %rbp;                     \
+       pushq %rbx;                     \
+       pushq %r12;                     \
+       pushq %r13;                     \
+       pushq %r14;                     \
+       pushq %r15;                     
+
+
+#define POPA                           \
+       popq %r15;                      \
+       popq %r14;                      \
+       popq %r13;                      \
+       popq %r12;                      \
+       popq %rbx;                      \
+       popq %rbp;                      
+
+// VMCB => RDI
+// vm_regs => RSI
 
 v3_svm_launch:
+       pushf;
+       push    %fs;
+       push    %gs;
+       PUSHA
+
+
+       pushq %rsi
+
+       movq    %rdi, %rax
+       Restore_SVM_Registers(%rsi);
+
+
+
 
+       vmload;
+       vmrun;
+       vmsave;
+
+
+       
+       Save_SVM_Registers(8(%rsp));
+
+       addq $8, %rsp
+
+       POPA
+       pop     %gs;
+       pop     %fs;
+       popf;
        ret