Merge pull request #4812 from jkotas/x64-coop

Push proper RBP frame in PUSH_COOP_PINVOKE_FRAME
dotnet · Oct 27, 2017 · 35f6894 · 35f6894
2 parents dbd9f5d + 0dcd4a7
commit 35f6894
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/Native/Runtime/unix/unixasmmacrosamd64.inc b/src/Native/Runtime/unix/unixasmmacrosamd64.inc
@@ -308,7 +308,9 @@ C_FUNC(\Name):
 DEFAULT_FRAME_SAVE_FLAGS = PTFF_SAVE_ALL_PRESERVED + PTFF_SAVE_RSP
 
 .macro PUSH_COOP_PINVOKE_FRAME trashReg
-    lea             \trashReg, [rsp +  8h]
+    push_nonvol_reg rbp                         // push RBP frame
+    mov             rbp, rsp
+    lea             \trashReg, [rsp + 10h]
     push_register   \trashReg                   // save caller's RSP
     push_nonvol_reg r15                         // save preserved registers
     push_nonvol_reg r14                         //   ..
@@ -317,19 +319,15 @@ DEFAULT_FRAME_SAVE_FLAGS = PTFF_SAVE_ALL_PRESERVED + PTFF_SAVE_RSP
     push_nonvol_reg rbx                         //   ..
     push_imm        DEFAULT_FRAME_SAVE_FLAGS    // save the register bitmask
     push_register   \trashReg                   // Thread * (unused by stackwalker)
-    push_nonvol_reg rbp                         // save caller's RBP
-    mov             \trashReg, [rsp + 9*8]      // Find the return address
-    push_register   \trashReg                   // save m_RIP
+    mov             \trashReg, [rsp + 8*8]      // Find and save the callers RBP
+    push_register   \trashReg
+    mov             \trashReg, [rsp + 10*8]     // Find and save the return address
+    push_register   \trashReg
     lea             \trashReg, [rsp]            // trashReg == address of frame
-
-    // stack alignment
-    alloc_stack 8
 .endm
 
 .macro POP_COOP_PINVOKE_FRAME
-    // Adjust for stack alignment and discard RIP
-    free_stack 16
-
+    pop_register r10    // discard RIP
     pop_nonvol_reg rbp  // restore RBP
     pop_register r10    // discard thread
     pop_register r10    // discard bitmask
@@ -339,4 +337,5 @@ DEFAULT_FRAME_SAVE_FLAGS = PTFF_SAVE_ALL_PRESERVED + PTFF_SAVE_RSP
     pop_nonvol_reg r14
     pop_nonvol_reg r15
     pop_register r10    // discard caller RSP
+    pop_register r10    // discard RBP frame
 .endm