diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-12-13 22:00:15 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-12-13 22:00:15 +0000 |
| commit | ab9de78dc557697c03f70b46f699a6520a7985ab (patch) | |
| tree | f409491d96d89c9d8c0effab7d973e8c5eb4aaf6 /compiler/codeGen | |
| parent | e2564ce2878db7157f67e7710633b4cb1b2db0b0 (diff) | |
| parent | 2e8c769422740c001e0a247bfec61d4f78598582 (diff) | |
| download | haskell-ab9de78dc557697c03f70b46f699a6520a7985ab.tar.gz | |
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/StgCmmPrim.hs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/codeGen/StgCmmPrim.hs b/compiler/codeGen/StgCmmPrim.hs index fe2a0217e0..66832c125a 100644 --- a/compiler/codeGen/StgCmmPrim.hs +++ b/compiler/codeGen/StgCmmPrim.hs @@ -491,6 +491,12 @@ emitPrimOp _ [res] PopCnt32Op [w] = emitPopCntCall res w W32 emitPrimOp _ [res] PopCnt64Op [w] = emitPopCntCall res w W64 emitPrimOp dflags [res] PopCntOp [w] = emitPopCntCall res w (wordWidth dflags) +-- Unsigned int to floating point conversions +emitPrimOp _ [res] Word2FloatOp [w] = emitPrimCall [res] + (MO_UF_Conv W32) [w] +emitPrimOp _ [res] Word2DoubleOp [w] = emitPrimCall [res] + (MO_UF_Conv W64) [w] + -- The rest just translate straightforwardly emitPrimOp dflags [res] op [arg] | nopOp op |