diff options
| author | David Waern <david.waern@gmail.com> | 2011-06-10 23:56:19 +0000 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2011-06-10 23:56:19 +0000 |
| commit | def7f873b4a37c67aef34d6f31de39d2a566638b (patch) | |
| tree | 84b75b5d172d228d730ed05d127c6d41a824b606 /compiler/nativeGen/X86/CodeGen.hs | |
| parent | a0770aa618f81e04737ba7bf4047ae4e7b644671 (diff) | |
| parent | 0b4324456e472d15a3a124f56387486f71cb765d (diff) | |
| download | haskell-def7f873b4a37c67aef34d6f31de39d2a566638b.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Diffstat (limited to 'compiler/nativeGen/X86/CodeGen.hs')
| -rw-r--r-- | compiler/nativeGen/X86/CodeGen.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs index 2f3e13936a..39de19c412 100644 --- a/compiler/nativeGen/X86/CodeGen.hs +++ b/compiler/nativeGen/X86/CodeGen.hs @@ -82,22 +82,22 @@ if_sse2 sse2 x87 = do if b then sse2 else x87 cmmTopCodeGen - :: DynFlags - -> RawCmmTop + :: RawCmmTop -> NatM [NatCmmTop Instr] -cmmTopCodeGen dynflags (CmmProc info lab (ListGraph blocks)) = do +cmmTopCodeGen (CmmProc info lab (ListGraph blocks)) = do (nat_blocks,statics) <- mapAndUnzipM basicBlockCodeGen blocks picBaseMb <- getPicBaseMaybeNat + dflags <- getDynFlagsNat let proc = CmmProc info lab (ListGraph $ concat nat_blocks) tops = proc : concat statics - os = platformOS $ targetPlatform dynflags + os = platformOS $ targetPlatform dflags case picBaseMb of Just picBase -> initializePicBase_x86 ArchX86 os picBase tops Nothing -> return tops -cmmTopCodeGen _ (CmmData sec dat) = do +cmmTopCodeGen (CmmData sec dat) = do return [CmmData sec dat] -- no translation, we just use CmmStatic |