Changeset 22523 in vbox for trunk/src/recompiler/VBoxREMWrapperA.asm

Timestamp:

Aug 27, 2009 1:31:35 PM (15 years ago)

Author:

vboxsync

Message:

Unbreak SSMR3RegisterInternal REM wrapper (broke win64 restore)

File:

• trunk/src/recompiler/VBoxREMWrapperA.asm (modified) (3 diffs)

trunk/src/recompiler/VBoxREMWrapperA.asm

@@ -535 +535 @@
 ;
 ; SSMR3DECL(int) SSMR3RegisterInternal(PVM pVM, const char *pszName, uint32_t u32Instance, uint32_t u32Version, size_t cbGuess,
+;    PFNSSMINTLIVEPREP pfnLivePrep, PFNSSMINTLIVEEXEC pfnLiveExec, PFNSSMINTLIVEVOTE pfnLiveVote,
 ;    PFNSSMINTSAVEPREP pfnSavePrep, PFNSSMINTSAVEEXEC pfnSaveExec, PFNSSMINTSAVEDONE pfnSaveDone,
 ;    PFNSSMINTLOADPREP pfnLoadPrep, PFNSSMINTLOADEXEC pfnLoadExec, PFNSSMINTLOADDONE pfnLoadDone);
@@ -555 +556 @@
     mov     rbp, rsp
 
-    sub     rsp, 60h
-
-    mov     r10, [ebp + 30h]
+    sub     rsp, 80h
+
+    mov     r10, [rbp + 48h]
+    mov     [rsp + 68h], r10            ; pfnLiveDone
+    mov     r11, [rbp + 40h]
+    mov     [rsp + 60h], r11            ; pfnLiveExec
+    mov     rax, [rbp + 38h]
+    mov     [rsp + 58h], rax            ; pfnLivePrep
+    mov     r10, [rbp + 30h]
     mov     [rsp + 50h], r10            ; pfnLoadDone
-    mov     r11, [ebp + 28h]
+    mov     r11, [rbp + 28h]
     mov     [rsp + 48h], r11            ; pfnLoadExec
-    mov     rax, [ebp + 20h]
+    mov     rax, [rbp + 20h]
     mov     [rsp + 40h], rax            ; pfnLoadPrep
-    mov     r10, [ebp + 18h]
+    mov     r10, [rbp + 18h]
     mov     [rsp + 38h], r10            ; pfnSaveDone
-    mov     r11, [ebp + 10h]
+    mov     r11, [rbp + 10h]
     mov     [rsp + 30h], r11            ; pfnSaveExec
     mov     [rsp + 28h], r9             ; pfnSavePrep
@@ -611 +618 @@
     lea     rdx, [rsp + 50h + 20h]      ; pValue
     mov     r8d, 10                     ; iParam
+    mov     rax, REM_FIXUP_64_WRAP_GCC_CB
+    call    rax
+
+    mov     rcx, REM_FIXUP_64_DESC      ; pDesc
+    lea     rdx, [rsp + 58h + 20h]      ; pValue
+    mov     r8d, 11                     ; iParam
+    mov     rax, REM_FIXUP_64_WRAP_GCC_CB
+    call    rax
+
+    mov     rcx, REM_FIXUP_64_DESC      ; pDesc
+    lea     rdx, [rsp + 60h + 20h]      ; pValue
+    mov     r8d, 12                     ; iParam
+    mov     rax, REM_FIXUP_64_WRAP_GCC_CB
+    call    rax
+
+    mov     rcx, REM_FIXUP_64_DESC      ; pDesc
+    lea     rdx, [rsp + 68h + 20h]      ; pValue
+    mov     r8d, 13                     ; iParam
     mov     rax, REM_FIXUP_64_WRAP_GCC_CB
     call    rax