From: Simon Marlow <marlowsd@gmail.com>
Date: Fri, 18 Jun 2010 08:22:58 +0000 (+0000)
Subject: generate "movl lbl(%reg1), %reg2" instructions, better codegen for -fPIC
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=23d372c0c749ea729daa0101618289da51f1d72d;p=ghc-hetmet.git

generate "movl lbl(%reg1), %reg2" instructions, better codegen for -fPIC
---

diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs
index 89a26a9..02abd04 100644
--- a/compiler/nativeGen/X86/CodeGen.hs
+++ b/compiler/nativeGen/X86/CodeGen.hs
@@ -991,11 +991,11 @@ getAmode (CmmMachOp (MO_Sub rep) [x, CmmLit lit@(CmmInt i _)])
        let off = ImmInt (-(fromInteger i))
        return (Amode (AddrBaseIndex (EABaseReg x_reg) EAIndexNone off) x_code)
   
-getAmode (CmmMachOp (MO_Add rep) [x, CmmLit lit@(CmmInt i _)])
+getAmode (CmmMachOp (MO_Add rep) [x, CmmLit lit])
   | is32BitLit lit
   -- ASSERT(rep == II32)???
   = do (x_reg, x_code) <- getSomeReg x
-       let off = ImmInt (fromInteger i)
+       let off = litToImm lit
        return (Amode (AddrBaseIndex (EABaseReg x_reg) EAIndexNone off) x_code)
 
 -- Turn (lit1 << n  + lit2) into  (lit2 + lit1 << n) so it will be