cope with ThreadRelocated on the sleeping_queue

[ghc-hetmet.git] / rts / RtsAPI.c

diff --git a/rts/RtsAPI.c b/rts/RtsAPI.c
index d0bdead..e0740b1 100644 (file)
--- a/rts/RtsAPI.c
+++ b/rts/RtsAPI.c
@@ -74,6 +74,31 @@ rts_mkInt32 (Capability *cap, HsInt32 i)
   return p;
 }
 
+
+#ifdef sparc_HOST_ARCH
+/* The closures returned by allocateLocal are only guaranteed to be 32 bit
+   aligned, because that's the size of pointers. SPARC v9 can't do
+   misaligned loads/stores, so we have to write the 64bit word in chunks         */
+
+HaskellObj
+rts_mkInt64 (Capability *cap, HsInt64 i_)
+{
+  StgInt64 i   = (StgInt64)i_;
+  StgInt32 *tmp;
+
+  StgClosure *p = (StgClosure *)allocateLocal(cap,CONSTR_sizeW(0,2));
+  SET_HDR(p, I64zh_con_info, CCS_SYSTEM);
+
+  tmp    = (StgInt32*)&(p->payload[0]);
+
+  tmp[0] = (StgInt32)((StgInt64)i >> 32);
+  tmp[1] = (StgInt32)i;                /* truncate high 32 bits */
+
+  return p;
+}
+
+#else
+
 HaskellObj
 rts_mkInt64 (Capability *cap, HsInt64 i)
 {
@@ -85,6 +110,9 @@ rts_mkInt64 (Capability *cap, HsInt64 i)
   return p;
 }
 
+#endif /* sparc_HOST_ARCH */
+
+
 HaskellObj
 rts_mkWord (Capability *cap, HsWord i)
 {
@@ -264,6 +292,27 @@ rts_getInt32 (HaskellObj p)
   return (HsInt32)(HsInt)(UNTAG_CLOSURE(p)->payload[0]);
 }
 
+
+#ifdef sparc_HOST_ARCH
+/* The closures returned by allocateLocal are only guaranteed to be 32 bit
+   aligned, because that's the size of pointers. SPARC v9 can't do
+   misaligned loads/stores, so we have to read the 64bit word in chunks         */
+
+HsInt64
+rts_getInt64 (HaskellObj p)
+{
+    HsInt32* tmp;
+    // See comment above:
+    // ASSERT(p->header.info == I64zh_con_info ||
+    //        p->header.info == I64zh_static_info);
+    tmp = (HsInt32*)&(UNTAG_CLOSURE(p)->payload[0]);
+
+    HsInt64 i  = (HsInt64)(tmp[0] << 32) | (HsInt64)tmp[1];
+    return i;
+}
+
+#else
+
 HsInt64
 rts_getInt64 (HaskellObj p)
 {
@@ -274,6 +323,10 @@ rts_getInt64 (HaskellObj p)
     tmp = (HsInt64*)&(UNTAG_CLOSURE(p)->payload[0]);
     return *tmp;
 }
+
+#endif /* sparc_HOST_ARCH */
+
+
 HsWord
 rts_getWord (HaskellObj p)
 {