X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgMacros.lh;h=f4234aa12b72334d895425ab3cc35f47178659ec;hb=0b51506092d1eb7db21b507bedd5d90caab01867;hp=059f44c34f0456ca98255cbf3e211dd515be189a;hpb=1912120196ed0c0f5b59dfdea23925a32f186247;p=ghc-hetmet.git

diff --git a/ghc/includes/StgMacros.lh b/ghc/includes/StgMacros.lh
index 059f44c..f4234aa 100644
--- a/ghc/includes/StgMacros.lh
+++ b/ghc/includes/StgMacros.lh
@@ -457,6 +457,8 @@ I_ stg_div PROTO((I_ a, I_ b));
 #define ZdZh(r,a,b)		r=ULTRASAFESTGCALL2(I_,(void *, I_, I_),stg_div,(a),(b))
 #define remIntZh(r,a,b)		r=(a)%(b)
 #define negateIntZh(r,a)	r=-(a)
+/* Ever used ? -- SOF */
+#define absIntZh(a)		r=(( (a) >= 0 ) ? (a) : (-(a)))
 \end{code}
 
 %************************************************************************
@@ -872,7 +874,8 @@ Some floating-point format info, made with the \tr{enquire} program
  || m68k_TARGET_ARCH	\
  || mipsel_TARGET_ARCH	\
  || mipseb_TARGET_ARCH	\
- || powerpc_TARGET_ARCH
+ || powerpc_TARGET_ARCH \
+ || rs6000_TARGET_ARCH
 
 /* yes, it is IEEE floating point */
 #include "ieee-flpt.h"
@@ -1160,6 +1163,12 @@ of one ptr (not bytes).
 #define indexFloatArrayZh(r,a,i)  indexFloatOffAddrZh(r,BYTE_ARR_CTS(a),i)
 #define indexDoubleArrayZh(r,a,i) indexDoubleOffAddrZh(r,BYTE_ARR_CTS(a),i)
 
+#define indexCharOffForeignObjZh(r,fo,i)   indexCharOffAddrZh(r,ForeignObj_CLOSURE_DATA(fo),i)
+#define indexIntOffForeignObjZh(r,fo,i)    indexIntOffAddrZh(r,ForeignObj_CLOSURE_DATA(fo),i)
+#define indexAddrOffForeignObjZh(r,fo,i)   indexAddrOffAddrZh(r,ForeignObj_CLOSURE_DATA(fo),i)
+#define indexFloatOffForeignObjZh(r,fo,i)  indexFloatOffAddrZh(r,ForeignObj_CLOSURE_DATA(fo),i)
+#define indexDoubleOffForeignObjZh(r,fo,i) indexDoubleOffAddrZh(r,ForeignObj_CLOSURE_DATA(fo),i)
+
 #define indexCharOffAddrZh(r,a,i)   r= ((C_ *)(a))[i]
 #define indexIntOffAddrZh(r,a,i)    r= ((I_ *)(a))[i]
 #define indexAddrOffAddrZh(r,a,i)   r= ((PP_)(a))[i]
@@ -2010,6 +2019,8 @@ extern I_ required_thread_count;
 }
 
 #endif  /* GRAN */ 
+
+#endif	/* CONCURRENT */
 \end{code}
 
 The following seq# code should only be used in unoptimized code.
@@ -2044,7 +2055,6 @@ ED_RO_(vtbl_seq);
     r = 1; /* Should be unnecessary */	    \
   })
 
-#endif	/* CONCURRENT */
 \end{code}
 
 %************************************************************************