diff options
| author | PHO <pho@cielonegro.org> | 2012-12-20 02:13:51 +0900 |
|---|---|---|
| committer | PHO <pho@cielonegro.org> | 2013-02-02 13:00:37 +0900 |
| commit | aa1d7d35ac27625c9aa67fe71c186f79600f0201 (patch) | |
| tree | b965147c2176f0fbfbecd2575b4e0500c0ccfdcb /compiler/nativeGen/AsmCodeGen.lhs | |
| parent | 7d6fece2e7c1e98928b939dc483522d79fe6b7d6 (diff) | |
| download | haskell-aa1d7d35ac27625c9aa67fe71c186f79600f0201.tar.gz | |
Move AsmCodeGen.makeFarBranches to PPC.Instr (#709)
Its implementation is totally specific to PPC.
Diffstat (limited to 'compiler/nativeGen/AsmCodeGen.lhs')
| -rw-r--r-- | compiler/nativeGen/AsmCodeGen.lhs | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs index 58c3c75794..9ab1c4a87e 100644 --- a/compiler/nativeGen/AsmCodeGen.lhs +++ b/compiler/nativeGen/AsmCodeGen.lhs @@ -27,7 +27,6 @@ import qualified SPARC.ShortcutJump import qualified SPARC.CodeGen.Expand import qualified PPC.CodeGen -import qualified PPC.Cond import qualified PPC.Regs import qualified PPC.RegInfo import qualified PPC.Instr @@ -210,7 +209,7 @@ ppcNcgImpl dflags ,ncg_x86fp_kludge = id ,ncgAllocMoreStack = PPC.Instr.allocMoreStack platform ,ncgExpandTop = id - ,ncgMakeFarBranches = makeFarBranches + ,ncgMakeFarBranches = PPC.Instr.makeFarBranches } where platform = targetPlatform dflags @@ -734,42 +733,6 @@ reorder id accum (b@(block,id',out) : rest) -- ----------------------------------------------------------------------------- --- Making far branches - --- Conditional branches on PowerPC are limited to +-32KB; if our Procs get too --- big, we have to work around this limitation. - -makeFarBranches - :: [NatBasicBlock PPC.Instr.Instr] - -> [NatBasicBlock PPC.Instr.Instr] -makeFarBranches blocks - | last blockAddresses < nearLimit = blocks - | otherwise = zipWith handleBlock blockAddresses blocks - where - blockAddresses = scanl (+) 0 $ map blockLen blocks - blockLen (BasicBlock _ instrs) = length instrs - - handleBlock addr (BasicBlock id instrs) - = BasicBlock id (zipWith makeFar [addr..] instrs) - - makeFar _ (PPC.Instr.BCC PPC.Cond.ALWAYS tgt) = PPC.Instr.BCC PPC.Cond.ALWAYS tgt - makeFar addr (PPC.Instr.BCC cond tgt) - | abs (addr - targetAddr) >= nearLimit - = PPC.Instr.BCCFAR cond tgt - | otherwise - = PPC.Instr.BCC cond tgt - where Just targetAddr = lookupUFM blockAddressMap tgt - makeFar _ other = other - - nearLimit = 7000 -- 8192 instructions are allowed; let's keep some - -- distance, as we have a few pseudo-insns that are - -- pretty-printed as multiple instructions, - -- and it's just not worth the effort to calculate - -- things exactly - - blockAddressMap = listToUFM $ zip (map blockId blocks) blockAddresses - --- ----------------------------------------------------------------------------- -- Generate jump tables -- Analyzes all native code and generates data sections for all jump |