Commit e21c922f authored by simonpj@microsoft.com's avatar simonpj@microsoft.com

Remove unncessary fromIntegral calls

parent 2d367f85
...@@ -245,7 +245,7 @@ mkLiveness uniq live = ...@@ -245,7 +245,7 @@ mkLiveness uniq live =
small_bitmap = case bitmap of small_bitmap = case bitmap of
[] -> 0 [] -> 0
[b] -> fromIntegral b [b] -> b
_ -> panic "mkLiveness" _ -> panic "mkLiveness"
small_liveness = small_liveness =
fromIntegral (length bits) .|. (small_bitmap `shiftL` bITMAP_BITS_SHIFT) fromIntegral (length bits) .|. (small_bitmap `shiftL` bITMAP_BITS_SHIFT)
......
...@@ -150,7 +150,7 @@ mkLiveness name size bits ...@@ -150,7 +150,7 @@ mkLiveness name size bits
= let = let
small_bits = case bits of small_bits = case bits of
[] -> 0 [] -> 0
[b] -> fromIntegral b [b] -> b
_ -> panic "livenessToAddrMode" _ -> panic "livenessToAddrMode"
in in
return (smallLiveness size small_bits) return (smallLiveness size small_bits)
......
...@@ -29,7 +29,7 @@ cgTickBox :: Module -> Int -> Code ...@@ -29,7 +29,7 @@ cgTickBox :: Module -> Int -> Code
cgTickBox mod n = do cgTickBox mod n = do
let tick_box = (cmmIndex W64 let tick_box = (cmmIndex W64
(CmmLit $ CmmLabel $ mkHpcTicksLabel $ mod) (CmmLit $ CmmLabel $ mkHpcTicksLabel $ mod)
(fromIntegral n) n
) )
stmtsC [ CmmStore tick_box stmtsC [ CmmStore tick_box
(CmmMachOp (MO_Add W64) (CmmMachOp (MO_Add W64)
......
...@@ -32,7 +32,7 @@ mkTickBox mod n ...@@ -32,7 +32,7 @@ mkTickBox mod n
where where
tick_box = cmmIndex W64 tick_box = cmmIndex W64
(CmmLit $ CmmLabel $ mkHpcTicksLabel $ mod) (CmmLit $ CmmLabel $ mkHpcTicksLabel $ mod)
(fromIntegral n) n
initHpc :: Module -> HpcInfo -> FCode CmmAGraph initHpc :: Module -> HpcInfo -> FCode CmmAGraph
-- Emit top-level tables for HPC and return code to initialise -- Emit top-level tables for HPC and return code to initialise
......
...@@ -400,7 +400,7 @@ mkLiveness name size bits ...@@ -400,7 +400,7 @@ mkLiveness name size bits
= let = let
small_bits = case bits of small_bits = case bits of
[] -> 0 [] -> 0
[b] -> fromIntegral b [b] -> b
_ -> panic "livenessToAddrMode" _ -> panic "livenessToAddrMode"
in in
return (smallLiveness size small_bits) return (smallLiveness size small_bits)
......
...@@ -298,7 +298,7 @@ schemeER_wrk d p rhs ...@@ -298,7 +298,7 @@ schemeER_wrk d p rhs
| Just (tickInfo, (_annot, newRhs)) <- isTickedExp' rhs = do | Just (tickInfo, (_annot, newRhs)) <- isTickedExp' rhs = do
code <- schemeE d 0 p newRhs code <- schemeE d 0 p newRhs
arr <- getBreakArray arr <- getBreakArray
let idOffSets = getVarOffSets (fromIntegral d) p tickInfo let idOffSets = getVarOffSets d p tickInfo
let tickNumber = tickInfo_number tickInfo let tickNumber = tickInfo_number tickInfo
let breakInfo = BreakInfo let breakInfo = BreakInfo
{ breakInfo_module = tickInfo_module tickInfo { breakInfo_module = tickInfo_module tickInfo
......
...@@ -32,8 +32,8 @@ noFreeRegs = FreeRegs 0 0 ...@@ -32,8 +32,8 @@ noFreeRegs = FreeRegs 0 0
releaseReg :: RealReg -> FreeRegs -> FreeRegs releaseReg :: RealReg -> FreeRegs -> FreeRegs
releaseReg (RealRegSingle r) (FreeRegs g f) releaseReg (RealRegSingle r) (FreeRegs g f)
| r > 31 = FreeRegs g (f .|. (1 `shiftL` (fromIntegral r - 32))) | r > 31 = FreeRegs g (f .|. (1 `shiftL` (r - 32)))
| otherwise = FreeRegs (g .|. (1 `shiftL` fromIntegral r)) f | otherwise = FreeRegs (g .|. (1 `shiftL` r)) f
releaseReg _ _ releaseReg _ _
= panic "RegAlloc.Linear.PPC.releaseReg: bad reg" = panic "RegAlloc.Linear.PPC.releaseReg: bad reg"
...@@ -53,8 +53,8 @@ getFreeRegs cls (FreeRegs g f) ...@@ -53,8 +53,8 @@ getFreeRegs cls (FreeRegs g f)
allocateReg :: RealReg -> FreeRegs -> FreeRegs allocateReg :: RealReg -> FreeRegs -> FreeRegs
allocateReg (RealRegSingle r) (FreeRegs g f) allocateReg (RealRegSingle r) (FreeRegs g f)
| r > 31 = FreeRegs g (f .&. complement (1 `shiftL` (fromIntegral r - 32))) | r > 31 = FreeRegs g (f .&. complement (1 `shiftL` (r - 32)))
| otherwise = FreeRegs (g .&. complement (1 `shiftL` fromIntegral r)) f | otherwise = FreeRegs (g .&. complement (1 `shiftL` r)) f
allocateReg _ _ allocateReg _ _
= panic "RegAlloc.Linear.PPC.allocateReg: bad reg" = panic "RegAlloc.Linear.PPC.allocateReg: bad reg"
...@@ -47,7 +47,7 @@ getFreeRegs cls f = go f 0 ...@@ -47,7 +47,7 @@ getFreeRegs cls f = go f 0
allocateReg :: RealReg -> FreeRegs -> FreeRegs allocateReg :: RealReg -> FreeRegs -> FreeRegs
allocateReg (RealRegSingle r) f allocateReg (RealRegSingle r) f
= f .&. complement (1 `shiftL` fromIntegral r) = f .&. complement (1 `shiftL` r)
allocateReg _ _ allocateReg _ _
= panic "RegAlloc.Linear.X86.FreeRegs.allocateReg: no reg" = panic "RegAlloc.Linear.X86.FreeRegs.allocateReg: no reg"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment