diff options
Diffstat (limited to 'ghc/compiler')
| -rw-r--r-- | ghc/compiler/absCSyn/Costs.lhs | 4 | ||||
| -rw-r--r-- | ghc/compiler/nativeGen/StixPrim.lhs | 3 | ||||
| -rw-r--r-- | ghc/compiler/prelude/primops.txt | 34 |
3 files changed, 18 insertions, 23 deletions
diff --git a/ghc/compiler/absCSyn/Costs.lhs b/ghc/compiler/absCSyn/Costs.lhs index 063fe130d8..32b948d3b7 100644 --- a/ghc/compiler/absCSyn/Costs.lhs +++ b/ghc/compiler/absCSyn/Costs.lhs @@ -1,7 +1,7 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % -% $Id: Costs.lhs,v 1.27 2000/10/24 07:35:00 simonpj Exp $ +% $Id: Costs.lhs,v 1.28 2001/01/15 16:55:24 sewardj Exp $ % % Only needed in a GranSim setup -- HWL % --------------------------------------------------------------------------- @@ -358,7 +358,7 @@ floatOps = gmpOps :: [PrimOp] gmpOps = [ IntegerAddOp , IntegerSubOp , IntegerMulOp - , IntegerQuotRemOp , IntegerDivModOp , IntegerNegOp + , IntegerQuotRemOp , IntegerDivModOp , IntegerCmpOp , Integer2IntOp , Int2IntegerOp ] diff --git a/ghc/compiler/nativeGen/StixPrim.lhs b/ghc/compiler/nativeGen/StixPrim.lhs index 1a699bc3aa..0fcdea207c 100644 --- a/ghc/compiler/nativeGen/StixPrim.lhs +++ b/ghc/compiler/nativeGen/StixPrim.lhs @@ -55,9 +55,6 @@ and modify our heap check accordingly. \begin{code} -- NB: ordering of clauses somewhere driven by -- the desire to getting sane patt-matching behavior -primCode res@[sr,dr] IntegerNegOp arg@[sa,da] - = gmpNegate (sr,dr) (sa,da) - primCode [res] IntegerCmpOp args@[sa1,da1, sa2,da2] = gmpCompare res (sa1,da1, sa2,da2) diff --git a/ghc/compiler/prelude/primops.txt b/ghc/compiler/prelude/primops.txt index 264fec2511..73d145ec39 100644 --- a/ghc/compiler/prelude/primops.txt +++ b/ghc/compiler/prelude/primops.txt @@ -1,5 +1,5 @@ ----------------------------------------------------------------------- --- $Id: primops.txt,v 1.14 2001/01/15 09:55:41 sewardj Exp $ +-- $Id: primops.txt,v 1.15 2001/01/15 16:55:24 sewardj Exp $ -- -- Primitive Operations -- @@ -362,9 +362,6 @@ primop Int64ToIntegerOp "int64ToInteger#" GenPrimOp --- Integer# --- ------------------------------------------------------------------------ -primop IntegerNegOp "negateInteger#" GenPrimOp - Int# -> ByteArr# -> (# Int#, ByteArr# #) - primop IntegerAddOp "plusInteger#" GenPrimOp Int# -> ByteArr# -> Int# -> ByteArr# -> (# Int#, ByteArr# #) with commutable = True @@ -772,9 +769,6 @@ primop ReadOffAddrOp_Double "readDoubleOffAddr#" GenPrimOp primop ReadOffAddrOp_StablePtr "readStablePtrOffAddr#" GenPrimOp Addr# -> Int# -> State# s -> (# State# s, StablePtr# a #) -primop ReadOffAddrOp_ForeignObj "readForeignObjOffAddr#" GenPrimOp - Addr# -> Int# -> State# s -> (# State# s, ForeignObj# #) - primop ReadOffAddrOp_Int8 "readInt8OffAddr#" GenPrimOp Addr# -> Int# -> State# s -> (# State# s, Int# #) @@ -1256,17 +1250,21 @@ primop ParAtForNowOp "parAtForNow#" GenPrimOp usage = { mangle ParAtForNowOp [mkO, mkZ, mkP, mkP, mkP, mkP, mkM] mkM } has_side_effects = True -primop CopyableOp "copyable#" GenPrimOp - a -> Int# - with - usage = { mangle CopyableOp [mkZ] mkR } - has_side_effects = True - -primop NoFollowOp "noFollow#" GenPrimOp - a -> Int# - with - usage = { mangle NoFollowOp [mkZ] mkR } - has_side_effects = True +-- copyable# and noFollow# have no corresponding entry in +-- PrelGHC.hi-boot, so I don't know whether they should still +-- be here or not. JRS, 15 Jan 01 +-- +--primop CopyableOp "copyable#" GenPrimOp +-- a -> Int# +-- with +-- usage = { mangle CopyableOp [mkZ] mkR } +-- has_side_effects = True +-- +--primop NoFollowOp "noFollow#" GenPrimOp +-- a -> Int# +-- with +-- usage = { mangle NoFollowOp [mkZ] mkR } +-- has_side_effects = True ------------------------------------------------------------------------ |