GitLab

Solved conflicts:
	GHC/Types.hs

Also related to #5464. Now GHC.Generics imports GHC.Types,
and the Generic instances for primitive types use
StandaloneDeriving.

Also related to #5464. Now GHC.Generics imports GHC.Types,
and the Generic instances for primitive types use
StandaloneDeriving.

All the hs_popcntX functions should return an StgWord in accordance with
the primop types.
I'm not sure whether the argument should also become an StgWord
(except for the 64-bit versions), the primops have type Word# -> Word#,
but we have e.g. StgWord hs_popcnt8(StgWord8 x).
StgWord8 is an unsigned char (usually, at least), but I think arguments
are passed at least word-sized to C-functions, so it probably works.
For the moment it works and passes tests, I'll ask tibbe to be sure.

tibbe authored Jul 20, 2011 and Simon Marlow committed Aug 16, 2011

Add fallbacks for processor specific instructions (e.g. POPCNT). These fallbacks are referred to by code generated by GHC.

It causes GHC to use vast amounts of space compiling GHC/Tuple.hs.

Add new module GHC.CString with functions relating to CString (moved from GHC.Base). Updated the base type modules so that the Generics flag is on (the CString functions are required because the generic representation uses strings).