Fix pretty-printing of integer constants on 64-bit platforms.
If sizeof(int) == 4 on a 64-bit platform, we have to add an 'L' suffix
to integer constants.
caseify (ix:ixs, ident) = vcat (map do_fallthrough ixs) $$ final_branch ix
where
do_fallthrough ix =
caseify (ix:ixs, ident) = vcat (map do_fallthrough ixs) $$ final_branch ix
where
do_fallthrough ix =
- hsep [ ptext SLIT("case") , pprHexVal ix <> colon ,
+ hsep [ ptext SLIT("case") , pprHexVal ix wordRep <> colon ,
ptext SLIT("/* fall through */") ]
final_branch ix =
ptext SLIT("/* fall through */") ]
final_branch ix =
- hsep [ ptext SLIT("case") , pprHexVal ix <> colon ,
+ hsep [ ptext SLIT("case") , pprHexVal ix wordRep <> colon ,
ptext SLIT("goto") , (pprBlockId ident) <> semi ]
-- ---------------------------------------------------------------------
ptext SLIT("goto") , (pprBlockId ident) <> semi ]
-- ---------------------------------------------------------------------
pprLit :: CmmLit -> SDoc
pprLit lit = case lit of
pprLit :: CmmLit -> SDoc
pprLit lit = case lit of
- CmmInt i I64 | machRepByteWidth I32 == wORD_SIZE
- -> pprHexVal i <> ptext SLIT("LL")
- -- Append an 'LL' suffix to 64-bit integers on a 32-bit
- -- platform. This might not be strictly necessary (the
- -- type will always be apparent from the context), but
- -- it avoids some warnings from gcc.
- CmmInt i _rep -> pprHexVal i
+ CmmInt i rep -> pprHexVal i rep
CmmFloat f rep -> parens (machRepCType rep) <> (rational f)
CmmLabel clbl -> mkW_ <> pprCLabel clbl
CmmLabelOff clbl i -> mkW_ <> pprCLabel clbl <> char '+' <> int i
CmmFloat f rep -> parens (machRepCType rep) <> (rational f)
CmmLabel clbl -> mkW_ <> pprCLabel clbl
CmmLabelOff clbl i -> mkW_ <> pprCLabel clbl <> char '+' <> int i
commafy xs = hsep $ punctuate comma xs
-- Print in C hex format: 0x13fa
commafy xs = hsep $ punctuate comma xs
-- Print in C hex format: 0x13fa
-pprHexVal :: Integer -> SDoc
-pprHexVal 0 = ptext SLIT("0x0")
-pprHexVal w
- | w < 0 = parens (char '-' <> ptext SLIT("0x") <> go (-w))
- | otherwise = ptext SLIT("0x") <> go w
+pprHexVal :: Integer -> MachRep -> SDoc
+pprHexVal 0 _ = ptext SLIT("0x0")
+pprHexVal w rep
+ | w < 0 = parens (char '-' <> ptext SLIT("0x") <> go (-w) <> repsuffix rep)
+ | otherwise = ptext SLIT("0x") <> go w <> repsuffix rep
+ -- type suffix for literals:
+ -- on 32-bit platforms, add "LL" to 64-bit literals
+ repsuffix I64 | wORD_SIZE == 4 = ptext SLIT("LL")
+ -- on 64-bit platforms with 32-bit int, add "L" to 64-bit literals
+ repsuffix I64 | cINT_SIZE == 4 = ptext SLIT("L")
+ repsuffix _ = empty
+
go 0 = empty
go w' = go q <> dig
where
go 0 = empty
go w' = go q <> dig
where
wORD_SIZE_IN_BITS = wORD_SIZE * 8 :: Int
\end{code}
wORD_SIZE_IN_BITS = wORD_SIZE * 8 :: Int
\end{code}
+Size of a C int, in bytes. May be smaller than wORD_SIZE.
+
+\begin{code}
+cINT_SIZE = (SIZEOF_INT :: Int)
+\end{code}
+
Size of a storage manager block (in bytes).
\begin{code}
Size of a storage manager block (in bytes).
\begin{code}