[Sbcl-commits] master: Get alignment right for block headers on x86-64, this time

[Paul K. <pk...@us...>]

The branch "master" has been updated in SBCL:
       via  a3c77b1a48ba90df15e66da44331342ca7657602 (commit)
      from  ce118eb9bca784396335f6f10d59219362545afa (commit)

- Log -----------------------------------------------------------------
commit a3c77b1a48ba90df15e66da44331342ca7657602
Author: Paul Khuong <pv...@pv...>
Date:   Thu Jun 23 23:17:22 2011 -0400

    Get alignment right for block headers on x86-64, this time
    
     We want to align the code in the block, not the trampoline that
     leads to the block.  In theory, we could take the trampoline into
     account when inserting alignment, but really?
---
 src/compiler/x86-64/call.lisp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/x86-64/call.lisp b/src/compiler/x86-64/call.lisp
index 4071fb7..b1c5395 100644
--- a/src/compiler/x86-64/call.lisp
+++ b/src/compiler/x86-64/call.lisp
@@ -563,11 +563,11 @@
 (defun emit-block-header (start-label trampoline-label fall-thru-p alignp)
   (when (and fall-thru-p trampoline-label)
     (inst jmp start-label))
-  (when alignp
-    (emit-alignment n-lowtag-bits #x90))
   (when trampoline-label
     (emit-label trampoline-label)
     (popw rbp-tn (frame-word-offset return-pc-save-offset)))
+  (when alignp
+    (emit-alignment n-lowtag-bits #x90))
   (emit-label start-label))
 
 ;;; Non-TR local call for a fixed number of values passed according to

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL