From 0668eed81e51d9794eb83bd3f66ec5d5102f87a1 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Mon, 7 Nov 2011 21:50:28 -0800
Subject: [PATCH] fix alignment of xmm register storage

---
 src/rt/arch/x86_64/_context.S  | 28 ++++++++++++++--------------
 src/rt/arch/x86_64/context.cpp |  2 +-
 src/rt/arch/x86_64/context.h   |  7 +++++--
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/rt/arch/x86_64/_context.S b/src/rt/arch/x86_64/_context.S
index 66b4fd9d3a7..2eba7296df2 100644
--- a/src/rt/arch/x86_64/_context.S
+++ b/src/rt/arch/x86_64/_context.S
@@ -55,7 +55,7 @@ swap_registers:
         
         // Save instruction pointer:
         pop %rax
-        mov %rax, 104(%rdi)
+        mov %rax, 56(%rdi)
 
         // Save non-volatile integer registers:
         //   (including RSP)
@@ -68,12 +68,12 @@ swap_registers:
         mov %r15,  48(%rdi)
 
         // Save non-volatile XMM registers:
-        movapd %xmm0, 56(%rdi)
-        movapd %xmm1, 64(%rdi)
-        movapd %xmm2, 72(%rdi)
-        movapd %xmm3, 80(%rdi)
-        movapd %xmm4, 88(%rdi)
-        movapd %xmm5, 96(%rdi)
+        movapd %xmm0,  64(%rdi)
+        movapd %xmm1,  80(%rdi)
+        movapd %xmm2,  96(%rdi)
+        movapd %xmm3, 112(%rdi)
+        movapd %xmm4, 128(%rdi)
+        movapd %xmm5, 144(%rdi)
 
         // Restore non-volatile integer registers:
         //   (including RSP)
@@ -86,14 +86,14 @@ swap_registers:
         mov 48(%rsi), %r15
 
         // Restore non-volatile XMM registers:
-        movapd 56(%rsi), %xmm0
-        movapd 64(%rsi), %xmm1
-        movapd 72(%rsi), %xmm2
-        movapd 80(%rsi), %xmm3
-        movapd 88(%rsi), %xmm4
-        movapd 96(%rsi), %xmm5
+        movapd  64(%rsi), %xmm0
+        movapd  80(%rsi), %xmm1
+        movapd  96(%rsi), %xmm2
+        movapd 112(%rsi), %xmm3
+        movapd 128(%rsi), %xmm4
+        movapd 144(%rsi), %xmm5
 
         // Jump to the instruction pointer
         // found in regs:
-        jmp *104(%rsi)
+        jmp *56(%rsi)
 
diff --git a/src/rt/arch/x86_64/context.cpp b/src/rt/arch/x86_64/context.cpp
index 0190261c7d3..edfae486b4f 100644
--- a/src/rt/arch/x86_64/context.cpp
+++ b/src/rt/arch/x86_64/context.cpp
@@ -17,7 +17,7 @@ context::context()
 
 void context::swap(context &out)
 {
-  swap_registers(&out.regs, &regs);
+    swap_registers(&out.regs, &regs);
 }
 
 void context::call(void *f, void *arg, void *stack) {
diff --git a/src/rt/arch/x86_64/context.h b/src/rt/arch/x86_64/context.h
index 4341365fd5b..305298093cc 100644
--- a/src/rt/arch/x86_64/context.h
+++ b/src/rt/arch/x86_64/context.h
@@ -6,6 +6,7 @@
 #include <cstdlib>
 #include <inttypes.h>
 #include <stdint.h>
+#include <xmmintrin.h>
 
 #ifdef HAVE_VALGRIND
 #include <valgrind/memcheck.h>
@@ -20,9 +21,11 @@ T align_down(T sp)
 }
 
 struct registers_t {
-    uint64_t regs[7]; // Space for the volatile regs: rbx, rsp, rbp, r12:r15
-    uint64_t xmms[6]; // Space for the volatile regs: xmm0:xmm5
+    uint64_t regs[7];  // Space for the volatile regs: rbx, rsp, rbp, r12:r15
     uint64_t ip;
+
+    // n.b.: These must be 16-byte aligned or movapd is unhappy.
+    __m128 xmms[6]; // Space for the volatile regs: xmm0:xmm5
 };
 
 class context {