summaryrefslogtreecommitdiff
path: root/compiler/nativeGen/RegAlloc/Graph
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-07-15 17:42:24 +0100
committerIan Lynagh <igloo@earth.li>2011-07-15 17:47:25 +0100
commit5c718b15e83e3b205e13c882660a4952714c3b4c (patch)
treec458ff0e31c1e966f900ff041c33fe2d37559837 /compiler/nativeGen/RegAlloc/Graph
parent3b322660f82d0c7c4f7d02523367ebd0e34c5287 (diff)
downloadhaskell-5c718b15e83e3b205e13c882660a4952714c3b4c.tar.gz
Remove some more defaultTargetPlatform uses
Diffstat (limited to 'compiler/nativeGen/RegAlloc/Graph')
-rw-r--r--compiler/nativeGen/RegAlloc/Graph/Main.hs11
-rw-r--r--compiler/nativeGen/RegAlloc/Graph/Stats.hs8
2 files changed, 10 insertions, 9 deletions
diff --git a/compiler/nativeGen/RegAlloc/Graph/Main.hs b/compiler/nativeGen/RegAlloc/Graph/Main.hs
index 1b3ecd19f1..3cdc1228da 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Main.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/Main.hs
@@ -59,9 +59,10 @@ regAlloc dflags regsFree slotsFree code
-- TODO: the regClass function is currently hard coded to the default target
-- architecture. Would prefer to determine this from dflags.
-- There are other uses of targetRegClass later in this module.
- let triv = trivColorable (targetPlatform dflags)
- targetVirtualRegSqueeze
- targetRealRegSqueeze
+ let platform = targetPlatform dflags
+ triv = trivColorable platform
+ (targetVirtualRegSqueeze platform)
+ (targetRealRegSqueeze platform)
(code_final, debug_codeGraphs, _)
<- regAlloc_spin dflags 0
@@ -349,8 +350,8 @@ patchRegsFromGraph platform graph code
$$ Color.dotGraph
(\_ -> text "white")
(trivColorable platform
- targetVirtualRegSqueeze
- targetRealRegSqueeze)
+ (targetVirtualRegSqueeze platform)
+ (targetRealRegSqueeze platform))
graph)
in patchEraseLive patchF code
diff --git a/compiler/nativeGen/RegAlloc/Graph/Stats.hs b/compiler/nativeGen/RegAlloc/Graph/Stats.hs
index 4b10e9fafa..ccbe3fe22d 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Stats.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/Stats.hs
@@ -76,8 +76,8 @@ instance (Outputable statics, PlatformOutputable instr) => PlatformOutputable (R
$$ Color.dotGraph
targetRegDotColor
(trivColorable platform
- targetVirtualRegSqueeze
- targetRealRegSqueeze)
+ (targetVirtualRegSqueeze platform)
+ (targetRealRegSqueeze platform))
(raGraph s)
@@ -113,8 +113,8 @@ instance (Outputable statics, PlatformOutputable instr) => PlatformOutputable (R
$$ Color.dotGraph
targetRegDotColor
(trivColorable platform
- targetVirtualRegSqueeze
- targetRealRegSqueeze)
+ (targetVirtualRegSqueeze platform)
+ (targetRealRegSqueeze platform))
(raGraphColored s)
$$ text ""