Changeset 106658 in vbox for trunk/src

Timestamp:

Oct 24, 2024 12:43:36 PM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165505

Message:

Add/3d/VBoxICD: Better code and explain why lazy loading fails on amd64. jiraref:VBP-1253

Location:

trunk/src/VBox/Additions/3D/win/VBoxICD

Files:

• VBoxICD.c (modified) (1 diff)
• icd_forwarders.py (modified) (2 diffs)

trunk/src/VBox/Additions/3D/win/VBoxICD/VBoxICD.c

@@ -121 +121 @@
  * and loading it in a lazy way fails for unknown reason on 64 bit Windows.
  *
+ * Update 2024-10-24 / bird: It fails on AMD64 because you trash the parameter registers
+ *                           when making the call. duh.
+ *
  * So just call VBoxLoadICD from DLL_PROCESS_ATTACH.
  */

trunk/src/VBox/Additions/3D/win/VBoxICD/icd_forwarders.py

@@ -57 +57 @@
         sys.exit()
 
+    asm_file.write('; AUTOGENERATED - DO NOT EDIT!\n')
     asm_file.write('%include "iprt/asmdefs.mac"\n')
     asm_file.write('\n')
     asm_file.write(';;;; Enable ICD_LAZY_LOAD to lazy load the ICD DLL (does not work on Win64)\n')
     asm_file.write('; %define ICD_LAZY_LOAD 1\n')
-    asm_file.write('\n')
-    asm_file.write('%ifdef RT_ARCH_AMD64\n')
-    asm_file.write('%define PTR_SIZE_PREFIX qword\n')
-    asm_file.write('%else ; X86\n')
-    asm_file.write('%define PTR_SIZE_PREFIX dword\n')
-    asm_file.write('%endif\n')
     asm_file.write('\n')
     asm_file.write('%ifdef ICD_LAZY_LOAD\n')
@@ -81 +76 @@
         asm_file.write(';    int3\n')
         asm_file.write('%ifdef ICD_LAZY_LOAD\n')
-        asm_file.write('    mov   xAX, PTR_SIZE_PREFIX NAME(g_hmodICD)\n')
-        asm_file.write('    mov   xAX, [xAX]\n')
-        asm_file.write('    or    xAX, xAX\n')
-        asm_file.write('    jnz   l_icd_loaded_%s\n' % fn)
+        asm_file.write('    mov   xAX, [NAME(g_hmodICD) xWrtRIP]\n')
+        asm_file.write('    test  xAX, xAX\n')
+        asm_file.write('    jnz   .already_loaded\n')
         asm_file.write('    call  NAME(VBoxLoadICD)\n')
-        asm_file.write('l_icd_loaded_%s:\n' % fn)
+        asm_file.write('.already_loaded:\n')
         asm_file.write('%endif\n')
-        asm_file.write('    mov   xAX, PTR_SIZE_PREFIX NAME(pfn_%s)\n' % fn)
-        asm_file.write('    mov   xAX, [xAX]\n')
-        asm_file.write('    or    xAX, xAX\n')
-        asm_file.write('    jnz   l_jmp_to_%s\n' % fn)
+        asm_file.write('    mov   xAX, [NAME(pfn_%s) xWrtRIP]\n' % fn)
+        asm_file.write('    test  xAX, xAX\n')
+        asm_file.write('    jz    .return\n')
+        asm_file.write('    jmp   xAX\n')
+        asm_file.write('.return:\n')
         asm_file.write('%ifdef RT_ARCH_AMD64\n')
         asm_file.write('    ret\n')
         asm_file.write('%else ; X86\n')
-        asm_file.write('    ret %s\n' % cbRet)
+        asm_file.write('    ret   %s\n' % cbRet)
         asm_file.write('%endif\n')
-        asm_file.write('l_jmp_to_%s:\n' % fn)
-        asm_file.write('    jmp   xAX\n')
         asm_file.write('ENDPROC %s\n' % fn)