Merge pull request #921 from rianquinn/upstream_master

Bug fixes for Boxy

Author: rianquinn

bfdriver/src/platform/linux/intrinsics.S

@@ -41,3 +41,4 @@ _vmcall:
 
         pop rbx
         ret
+        .size _vmcall, .-_vmcall

bfintrinsics/src/arch/intel_x64/vmx.asm

@@ -150,113 +150,3 @@ _vmcall:
 
     pop rbx
     ret
-
-global _vmcall1
-_vmcall1:
-
-    push rbx
-
-%ifdef MS64
-    mov r8,  rcx
-%else
-    mov r8,  rdi
-%endif
-
-    mov rax, [r8]
-    mov rbx, 0
-    mov rcx, 0
-    mov rdx, 0
-
-    vmcall
-
-    mov [r8], rax
-
-    pop rbx
-    ret
-
-global _vmcall2
-_vmcall2:
-
-    push rbx
-
-%ifdef MS64
-    mov r8,  rcx
-    mov r9,  rdx
-%else
-    mov r8,  rdi
-    mov r9,  rsi
-%endif
-
-    mov rax, [r8]
-    mov rbx, [r9]
-    mov rcx, 0
-    mov rdx, 0
-
-    vmcall
-
-    mov [r8], rax
-    mov [r9], rbx
-
-    pop rbx
-    ret
-
-global _vmcall3
-_vmcall3:
-
-    push rbx
-
-%ifdef MS64
-    mov r10, r8
-    mov r8,  rcx
-    mov r9,  rdx
-%else
-    mov r8,  rdi
-    mov r9,  rsi
-    mov r10, rdx
-%endif
-
-    mov rax, [r8]
-    mov rbx, [r9]
-    mov rcx, [r10]
-    mov rdx, 0
-
-    vmcall
-
-    mov [r8], rax
-    mov [r9], rbx
-    mov [r10], rcx
-
-    pop rbx
-    ret
-
-global _vmcall4
-_vmcall4:
-
-    push rbx
-
-%ifdef MS64
-    mov r10, r8
-    mov r11, r9
-    mov r8,  rcx
-    mov r9,  rdx
-%else
-    mov r8,  rdi
-    mov r9,  rsi
-    mov r10, rdx
-    mov r11, rcx
-%endif
-
-    mov rax, [r8]
-    mov rbx, [r9]
-    mov rcx, [r10]
-    mov rdx, [r11]
-
-    vmcall
-
-    mov [r8], rax
-    mov [r9], rbx
-    mov [r10], rcx
-    mov [r11], rdx
-
-    pop rbx
-    ret

bfvmm/include/test/intrinsics.h

@@ -238,6 +238,7 @@ intel_x64::cr2::value_type g_cr2 = 0;
 intel_x64::cr3::value_type g_cr3 = 0;
 intel_x64::cr4::value_type g_cr4 = 0;
 intel_x64::cr8::value_type g_cr8 = 0;
+intel_x64::xcr0::value_type g_xcr0 = 0;
 intel_x64::dr7::value_type g_dr7 = 0;
 
 bool g_vmload_fails = false;
@@ -268,6 +269,10 @@ extern "C" uint64_t
 _read_cr8(void) noexcept
 { return g_cr8; }
 
+extern "C" uint64_t
+_read_xcr0(void) noexcept
+{ return g_xcr0; }
+
 extern "C" void
 _write_cr0(uint64_t val) noexcept
 { g_cr0 = val; }
@@ -296,7 +301,7 @@ _write_cr8(uint64_t val) noexcept
 
 extern "C" void
 _write_xcr0(uint64_t val) noexcept
-{ bfignored(val); }
+{ g_xcr0 = val; }
 
 extern "C" uint64_t
 _read_dr7() noexcept

scripts/cmake/config/example_config.cmake

@@ -142,6 +142,10 @@ if(ENABLE_BOXY)
     list(APPEND EXTENSION
         ${CMAKE_CURRENT_LIST_DIR}/boxy
     )
+
+    if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/linux)
+        set(LINUX_DIR ${CMAKE_CURRENT_LIST_DIR}/linux)
+    endif()
 endif()
 
 if(OVERRIDE_VMM)