diff options
Diffstat (limited to 'compiler/cmm')
| -rw-r--r-- | compiler/cmm/CLabel.hs | 2 | ||||
| -rw-r--r-- | compiler/cmm/CmmMachOp.hs | 1 | ||||
| -rw-r--r-- | compiler/cmm/CmmNode.hs | 2 | ||||
| -rw-r--r-- | compiler/cmm/CmmParse.y | 2 | ||||
| -rw-r--r-- | compiler/cmm/CmmSwitch.hs | 2 | ||||
| -rw-r--r-- | compiler/cmm/PprC.hs | 1 |
6 files changed, 6 insertions, 4 deletions
diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs index 66e39f0d69..9452b5f6c8 100644 --- a/compiler/cmm/CLabel.hs +++ b/compiler/cmm/CLabel.hs @@ -348,7 +348,7 @@ data ForeignLabelSource -- external packages. It is safe to treat the RTS package as "external". | ForeignLabelInExternalPackage - -- | Label is in the package currenly being compiled. + -- | Label is in the package currently being compiled. -- This is only used for creating hacky tmp labels during code generation. -- Don't use it in any code that might be inlined across a package boundary -- (ie, core code) else the information will be wrong relative to the diff --git a/compiler/cmm/CmmMachOp.hs b/compiler/cmm/CmmMachOp.hs index 9740d21bef..f8b7d4fb74 100644 --- a/compiler/cmm/CmmMachOp.hs +++ b/compiler/cmm/CmmMachOp.hs @@ -583,6 +583,7 @@ data CallishMachOp | MO_UF_Conv Width + | MO_S_Mul2 Width | MO_S_QuotRem Width | MO_U_QuotRem Width | MO_U_QuotRem2 Width diff --git a/compiler/cmm/CmmNode.hs b/compiler/cmm/CmmNode.hs index 9d6fa7f29b..1b387020f5 100644 --- a/compiler/cmm/CmmNode.hs +++ b/compiler/cmm/CmmNode.hs @@ -669,7 +669,7 @@ scopeUniques (SubScope u _) = [u] scopeUniques (CombinedScope s1 s2) = scopeUniques s1 ++ scopeUniques s2 -- Equality and order is based on the head uniques defined above. We --- take care to short-cut the (extremly) common cases. +-- take care to short-cut the (extremely) common cases. instance Eq CmmTickScope where GlobalScope == GlobalScope = True GlobalScope == _ = False diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index 3cfb7ecee2..e568378197 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -574,7 +574,7 @@ importName :: { (FastString, CLabel) } -- A label imported without an explicit packageId. - -- These are taken to come frome some foreign, unnamed package. + -- These are taken to come from some foreign, unnamed package. : NAME { ($1, mkForeignLabel $1 Nothing ForeignLabelInExternalPackage IsFunction) } diff --git a/compiler/cmm/CmmSwitch.hs b/compiler/cmm/CmmSwitch.hs index c2ce3b9e00..a5fa6457e2 100644 --- a/compiler/cmm/CmmSwitch.hs +++ b/compiler/cmm/CmmSwitch.hs @@ -195,7 +195,7 @@ switchTargetsToTable (SwitchTargets _ (lo,hi) mbdef branches) -- .quad _c20q -- .quad _c20r --- | The list of all labels occuring in the SwitchTargets value. +-- | The list of all labels occurring in the SwitchTargets value. switchTargetsToList :: SwitchTargets -> [Label] switchTargetsToList (SwitchTargets _ _ mbdef branches) = maybeToList mbdef ++ M.elems branches diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index 506116c584..d94bc01e03 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -825,6 +825,7 @@ pprCallishMachOp_for_C mop (MO_AtomicWrite w) -> ptext (sLit $ atomicWriteLabel w) (MO_UF_Conv w) -> ptext (sLit $ word2FloatLabel w) + MO_S_Mul2 {} -> unsupported MO_S_QuotRem {} -> unsupported MO_U_QuotRem {} -> unsupported MO_U_QuotRem2 {} -> unsupported |