Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/dfb8d40b3f737a824e92ec61e198bfcbc60b5361 >--------------------------------------------------------------- commit dfb8d40b3f737a824e92ec61e198bfcbc60b5361 Author: Ian Lynagh <i...@well-typed.com> Date: Fri Nov 16 15:34:18 2012 +0000 We now assume that offsetof() is always defined >--------------------------------------------------------------- utils/deriveConstants/DeriveConstants.hs | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/utils/deriveConstants/DeriveConstants.hs b/utils/deriveConstants/DeriveConstants.hs index 75f17ce..ff47456 100644 --- a/utils/deriveConstants/DeriveConstants.hs +++ b/utils/deriveConstants/DeriveConstants.hs @@ -152,7 +152,7 @@ fieldOffset w theType theField = fieldOffset_ w nameBase theType theField fieldOffset_ :: Where -> Name -> String -> String -> Wanteds fieldOffset_ w nameBase theType theField = [(w, GetWord name (Fst (CExpr expr)))] where name = "OFFSET_" ++ nameBase - expr = "OFFSET(" ++ theType ++ ", " ++ theField ++ ")" + expr = "offsetof(" ++ theType ++ ", " ++ theField ++ ")" -- FieldType is for defining REP_x to be b32 etc -- These are both the C-- types used in a load @@ -217,7 +217,7 @@ closureField w theType theField = closureField_ w nameBase theType theField closureFieldOffset_ :: Where -> Name -> String -> String -> Wanteds closureFieldOffset_ w nameBase theType theField - = defOffset w nameBase (CExpr ("OFFSET(" ++ theType ++ ", " ++ theField ++ ") - TYPE_SIZE(StgHeader)")) + = defOffset w nameBase (CExpr ("offsetof(" ++ theType ++ ", " ++ theField ++ ") - TYPE_SIZE(StgHeader)")) -- Size of a closure type, minus the header, named SIZEOF_<type>_NoHdr -- Also, we #define SIZEOF_<type> to be the size of the whole closure for .cmm. @@ -241,7 +241,7 @@ closureFieldOffset :: Where -> String -> String -> Wanteds closureFieldOffset w theType theField = defOffset w nameBase (CExpr expr) where nameBase = theType ++ "_" ++ theField - expr = "OFFSET(" ++ theType ++ ", " ++ theField ++ ") - TYPE_SIZE(StgHeader)" + expr = "offsetof(" ++ theType ++ ", " ++ theField ++ ") - TYPE_SIZE(StgHeader)" thunkSize :: Where -> String -> Wanteds thunkSize w theType @@ -637,14 +637,9 @@ getWanted verbose tmpdir gccProgram gccFlags nmProgram "#include <stdio.h>", "#include <string.h>", "", - "#if defined(offsetof)", - "#define OFFSET(s_type, field) offsetof(s_type, field)", - "#else", - "#define OFFSET(s_type, field) ((size_t)&(((s_type*)0)->field))", - "#endif", "#define FIELD_SIZE(s_type, field) ((size_t)sizeof(((s_type*)0)->field))", "#define TYPE_SIZE(type) (sizeof(type))", - "#define FUN_OFFSET(sym) (OFFSET(Capability,f.sym) - OFFSET(Capability,r))", + "#define FUN_OFFSET(sym) (offsetof(Capability,f.sym) - offsetof(Capability,r))", "", "#pragma GCC poison sizeof" ] _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
