projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
485ab9c
)
SPARC NCG: Also do misaligned reads
author
Ben.Lippmeier@anu.edu.au
<unknown>
Wed, 21 Jan 2009 23:24:23 +0000
(23:24 +0000)
committer
Ben.Lippmeier@anu.edu.au
<unknown>
Wed, 21 Jan 2009 23:24:23 +0000
(23:24 +0000)
rts/RtsAPI.c
patch
|
blob
|
history
diff --git
a/rts/RtsAPI.c
b/rts/RtsAPI.c
index
9fa0e01
..
c5c5561
100644
(file)
--- a/
rts/RtsAPI.c
+++ b/
rts/RtsAPI.c
@@
-292,6
+292,12
@@
rts_getInt32 (HaskellObj p)
return (HsInt32)(HsInt)(UNTAG_CLOSURE(p)->payload[0]);
}
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)
{
HsInt64
rts_getInt64 (HaskellObj p)
{
@@
-302,6
+308,25
@@
rts_getInt64 (HaskellObj p)
tmp = (HsInt64*)&(UNTAG_CLOSURE(p)->payload[0]);
return *tmp;
}
tmp = (HsInt64*)&(UNTAG_CLOSURE(p)->payload[0]);
return *tmp;
}
+
+#else
+
+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
+}
+
+#endif /* sparc_HOST_ARCH */
+
+
HsWord
rts_getWord (HaskellObj p)
{
HsWord
rts_getWord (HaskellObj p)
{