Changeset 47685 in vbox for trunk/src/bldprogs/VBoxDef2LazyLoad.cpp

Timestamp:

Aug 13, 2013 10:19:25 AM (12 years ago)

Author:

vboxsync

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

87893

Message:

VBoxDef2LazyLoad.cpp: Attempt at correct stack alignment.

File:

• trunk/src/bldprogs/VBoxDef2LazyLoad.cpp (modified) (8 diffs)

trunk/src/bldprogs/VBoxDef2LazyLoad.cpp

@@ -374 +374 @@
             "    lea     rsi, [g_hMod wrt rip]  ; phLdrMod\n"
             "    lea     rdi, [.szLib wrt rip]  ; pszFilename\n"
+            "    sub     rsp, 08h\n"
             "    call    IMP2(SUPR3HardenedLdrLoadAppPriv)\n"
+            "    add     rsp, 08h\n"
             "\n"
             "%%elifdef ASM_CALL64_MSC\n"
@@ -381 +383 @@
             "    lea     rdx, [g_hMod wrt rip]  ; phLdrMod\n"
             "    lea     rcx, [.szLib wrt rip]  ; pszFilename\n"
-            "    sub     rsp, 20h\n"
+            "    sub     rsp, 28h\n"
             "    call    IMP2(SUPR3HardenedLdrLoadAppPriv)\n"
-            "    add     rsp, 20h\n"
+            "    add     rsp, 28h\n"
             "\n"
             "%%elifdef RT_ARCH_X86\n"
+            "    sub     rsp, 0ch\n"
             "    push    0              ; pErrInfo\n"
             "    push    0              ; fFlags (local load)\n"
@@ -391 +394 @@
             "    push    .szLib         ; pszFilename\n"
             "    call    IMP2(SUPR3HardenedLdrLoadAppPriv)\n"
-            "    add     esp, 10h\n"
+            "    add     esp, 1ch\n"
             "%%else\n"
             " %%error \"Unsupported architecture\"\n"
@@ -427 +430 @@
             "    push    rcx\n"
             "    push    rdx\n"
+            "    push    r12\n"
             " %%ifdef ASM_CALL64_GCC\n"
             "    push    rsi\n"
             "    push    rdi\n"
+            "    mov     r12, rsp\n"
             " %%else\n"
+            "    mov     r12, rsp\n"
             "    sub     rsp, 20h\n"
             " %%endif\n"
+            "    and     rsp, 0fffffff0h ; Try make sure the stack is aligned\n"
             "\n"
             "    call    NAME(LazyLoading) ; returns handle in rcx\n"
@@ -451 +458 @@
             ".symok:\n"
             "\n"
+            "    mov     rsp, r12\n"
             " %%ifdef ASM_CALL64_GCC\n"
             "    pop     rdi\n"
             "    pop     rsi\n"
-            " %%else\n"
-            "    add     rsp, 20h\n"
             " %%endif\n"
+            "    pop     r12\n"
             "    pop     rdx\n"
             "    pop     rcx\n"
@@ -471 +478 @@
             "    push    ecx\n"
             "    push    edx\n"
+            "    and     esp, 0fffffff0h\n"
             "\n"
             ".loaded:\n"
@@ -480 +488 @@
             "    mov     ecx, [g_hMod]\n"
             "    call    IMP2(RTLdrGetSymbol)\n"
-            "    add     esp, 12\n"
             "    or      eax, eax\n"
             ".badsym:\n"
@@ -487 +494 @@
             "    jmp     .badsym\n"
             ".symok:\n"
+            "    lea     esp, [ebp - 0ch]\n"
             "    pop     edx\n"
             "    pop     ecx\n"