[commit: ghc] ghc-7.8: pprC: declare extern cmm primitives as functions, not data (04e21ae)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/04e21ae3c47fba6d2f6ca0ecdbea394fbe1d881c/ghc

>---------------------------------------------------------------

commit 04e21ae3c47fba6d2f6ca0ecdbea394fbe1d881c
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Thu Sep 4 17:50:45 2014 +0300

    pprC: declare extern cmm primitives as functions, not data
    
    Summary:
      The commit fixes incorrect code generation of
      integer-gmp package on ia64 due to C prototypes mismatch.
      Before the patch prototypes for "foreign import prim" were:
          StgWord poizh[];
      After the patch they became:
          StgFunPtr poizh();
    
    Long story:
    
    Consider the following simple example:
    
        {-# LANGUAGE MagicHash, GHCForeignImportPrim, UnliftedFFITypes #-}
        module M where
        import GHC.Prim -- Int#
        foreign import prim "poizh" poi# :: Int# -> Int#
    
    Before the patch unregisterised build generated the
    following 'poizh' reference:
        EI_(poizh); /* StgWord poizh[]; */
        FN_(M_poizh_entry) {
        // ...
        JMP_((W_)&poizh);
        }
    
    After the patch it looks this way:
        EF_(poizh); /* StgFunPtr poizh(); */
        FN_(M_poizh_entry) {
        // ...
        JMP_((W_)&poizh);
        }
    
    On ia64 it leads to different relocation types being generated:
      incorrect one:
        addl r14 = @ltoffx(poizh#)
        ld8.mov r14 = [r14], poizh# ; r14 = address-of 'poizh#'
      correct one:
        addl r14 = @ltoff(@fptr(poizh#)), gp ; r14 = address-of-thunk 'poizh#'
        ld8 r14 = [r14]
    
    '@fptr(poizh#)' basically instructs assembler to creates
    another obect consisting of real address to 'poizh' instructions
    and module address. That '@fptr' object is used as a function "address"
    This object is different for every module referencing 'poizh' symbol.
    
    All indirect function calls expect '@fptr' object. That way
    call site reads real destination address and set destination
    module address in 'gp' register from '@fptr'.
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
    (cherry picked from commit e18525fae273f4c1ad8d6cbe1dea4fc074cac721)


>---------------------------------------------------------------

04e21ae3c47fba6d2f6ca0ecdbea394fbe1d881c
 compiler/cmm/CLabel.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
index 65c597c..991fc57 100644
--- a/compiler/cmm/CLabel.hs
+++ b/compiler/cmm/CLabel.hs
@@ -801,6 +801,7 @@ labelType (CmmLabel _ _ CmmClosure)             = GcPtrLabel
 labelType (CmmLabel _ _ CmmCode)                = CodeLabel
 labelType (CmmLabel _ _ CmmInfo)                = DataLabel
 labelType (CmmLabel _ _ CmmEntry)               = CodeLabel
+labelType (CmmLabel _ _ CmmPrimCall)            = CodeLabel
 labelType (CmmLabel _ _ CmmRetInfo)             = DataLabel
 labelType (CmmLabel _ _ CmmRet)                 = CodeLabel
 labelType (RtsLabel (RtsSelectorInfoTable _ _)) = DataLabel