diff options
Diffstat (limited to 'compiler/nativeGen')
-rw-r--r-- | compiler/nativeGen/BlockLayout.hs | 2 | ||||
-rw-r--r-- | compiler/nativeGen/NCGMonad.hs | 2 | ||||
-rw-r--r-- | compiler/nativeGen/PIC.hs | 2 | ||||
-rw-r--r-- | compiler/nativeGen/PPC/CodeGen.hs | 2 | ||||
-rw-r--r-- | compiler/nativeGen/RegAlloc/Graph/Main.hs | 2 | ||||
-rw-r--r-- | compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 2 | ||||
-rw-r--r-- | compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/compiler/nativeGen/BlockLayout.hs b/compiler/nativeGen/BlockLayout.hs index ba15e0063f..9b5f2eda8f 100644 --- a/compiler/nativeGen/BlockLayout.hs +++ b/compiler/nativeGen/BlockLayout.hs @@ -374,7 +374,7 @@ combineNeighbourhood :: [CfgEdge] -- ^ Edges to consider -- were used to fuse chains and as such no longer need to be -- considered. combineNeighbourhood edges chains - = -- pprTraceIt "Neigbours" $ + = -- pprTraceIt "Neighbours" $ -- pprTrace "combineNeighbours" (ppr edges) $ applyEdges edges endFrontier startFrontier (Set.empty) where diff --git a/compiler/nativeGen/NCGMonad.hs b/compiler/nativeGen/NCGMonad.hs index 71503aa653..e1bb927d0b 100644 --- a/compiler/nativeGen/NCGMonad.hs +++ b/compiler/nativeGen/NCGMonad.hs @@ -226,7 +226,7 @@ addNodeBetweenNat from between to addWeightEdge between old weight . delEdge from old $ m | otherwise - = pprPanic "Faild to update cfg: Untracked edge" (ppr (from,to)) + = pprPanic "Failed to update cfg: Untracked edge" (ppr (from,to)) -- | Place `succ` after `block` and change any edges diff --git a/compiler/nativeGen/PIC.hs b/compiler/nativeGen/PIC.hs index a38f3fa18f..760ba7925d 100644 --- a/compiler/nativeGen/PIC.hs +++ b/compiler/nativeGen/PIC.hs @@ -217,7 +217,7 @@ howToAccessLabel -- Windows -- In Windows speak, a "module" is a set of objects linked into the --- same Portable Exectuable (PE) file. (both .exe and .dll files are PEs). +-- same Portable Executable (PE) file. (both .exe and .dll files are PEs). -- -- If we're compiling a multi-module program then symbols from other modules -- are accessed by a symbol pointer named __imp_SYMBOL. At runtime we have the diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs index 05883d0e5a..e669630956 100644 --- a/compiler/nativeGen/PPC/CodeGen.hs +++ b/compiler/nativeGen/PPC/CodeGen.hs @@ -425,7 +425,7 @@ getRegister' dflags (CmmReg reg) getRegister' dflags tree@(CmmRegOff _ _) = getRegister' dflags (mangleIndexTree dflags tree) - -- for 32-bit architectuers, support some 64 -> 32 bit conversions: + -- for 32-bit architectures, support some 64 -> 32 bit conversions: -- TO_W_(x), TO_W_(x >> 32) getRegister' dflags (CmmMachOp (MO_UU_Conv W64 W32) diff --git a/compiler/nativeGen/RegAlloc/Graph/Main.hs b/compiler/nativeGen/RegAlloc/Graph/Main.hs index e756068ca1..1171689e66 100644 --- a/compiler/nativeGen/RegAlloc/Graph/Main.hs +++ b/compiler/nativeGen/RegAlloc/Graph/Main.hs @@ -83,7 +83,7 @@ regAlloc dflags regsFree slotsFree slotsCount code cfg -- | Perform solver iterations for the graph coloring allocator. -- --- We extract a register confict graph from the provided cmm code, +-- We extract a register conflict graph from the provided cmm code, -- and try to colour it. If that works then we use the solution rewrite -- the code with real hregs. If coloring doesn't work we add spill code -- and try to colour it again. After `maxSpinCount` iterations we give up. diff --git a/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs b/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs index 4be25a71ba..42de5503ba 100644 --- a/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs +++ b/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs @@ -38,7 +38,7 @@ import Data.Maybe import Control.Monad (join) --- | Records the expected cost to spill some regster. +-- | Records the expected cost to spill some register. type SpillCostRecord = ( VirtualReg -- register name , Int -- number of writes to this reg diff --git a/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs b/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs index 773db33293..cc2ad7d594 100644 --- a/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs +++ b/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs @@ -26,7 +26,7 @@ import Panic -- This gets hammered by scanGraph during register allocation, -- so needs to be fairly efficient. -- --- NOTE: This only works for arcitectures with just RcInteger and RcDouble +-- NOTE: This only works for architectures with just RcInteger and RcDouble -- (which are disjoint) ie. x86, x86_64 and ppc -- -- The number of allocatable regs is hard coded in here so we can do |