diff options
Diffstat (limited to 'compiler/nativeGen/RegAlloc')
| -rw-r--r-- | compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 2 | ||||
| -rw-r--r-- | compiler/nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs b/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs index c63d52dda2..b42fb4c39e 100644 --- a/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs +++ b/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs @@ -255,7 +255,7 @@ worst n classN classC -- register allocator to attempt to map VRegs to. allocatableRegs :: [RegNo] allocatableRegs - = let isFree i = isFastTrue (freeReg i) + = let isFree i = freeReg i in filter isFree allMachRegNos diff --git a/compiler/nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs b/compiler/nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs index 6b6e67c612..2cb9999ce7 100644 --- a/compiler/nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs +++ b/compiler/nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs @@ -10,7 +10,6 @@ import Reg import CodeGen.Platform import Outputable import Platform -import FastBool import Data.Word import Data.Bits @@ -75,7 +74,7 @@ allocateReg platform (FreeRegs g f d) -- can't allocate free regs - | not $ isFastTrue (freeReg platform r) + | not $ freeReg platform r = pprPanic "SPARC.FreeRegs.allocateReg: not allocating pinned reg" (ppr reg) -- a general purpose reg @@ -131,7 +130,7 @@ releaseReg platform regs@(FreeRegs g f d) -- don't release pinned reg - | not $ isFastTrue (freeReg platform r) + | not $ freeReg platform r = regs -- a general purpose reg |