From: wolfgang <unknown>
Date: Sat, 24 Sep 2005 04:22:22 +0000 (+0000)
Subject: [project @ 2005-09-24 04:22:22 by wolfgang]
X-Git-Tag: Initial_conversion_from_CVS_complete~196
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d1e7092f2c4ddf8ee07da15bcef6828923b391a2;p=ghc-hetmet.git

[project @ 2005-09-24 04:22:22 by wolfgang]
x86 & PIC: make floating point constants on x86 PIC-aware
---

diff --git a/ghc/compiler/nativeGen/MachCodeGen.hs b/ghc/compiler/nativeGen/MachCodeGen.hs
index 8560d4a..50d886c 100644
--- a/ghc/compiler/nativeGen/MachCodeGen.hs
+++ b/ghc/compiler/nativeGen/MachCodeGen.hs
@@ -735,12 +735,14 @@ getRegister leaf
 
 getRegister (CmmLit (CmmFloat f F32)) = do
     lbl <- getNewLabelNat
-    let code dst = toOL [
+    dynRef <- cmmMakeDynamicReference addImportNat False lbl
+    Amode addr addr_code <- getAmode dynRef
+    let code dst =
 	    LDATA ReadOnlyData
 			[CmmDataLabel lbl,
-			 CmmStaticLit (CmmFloat f F32)],
-	    GLD F32 (ImmAddr (ImmCLbl lbl) 0) dst
-	    ]
+			 CmmStaticLit (CmmFloat f F32)]
+	    `consOL` (addr_code `snocOL`
+	    GLD F32 addr dst)
     -- in
     return (Any F32 code)
 
@@ -756,12 +758,14 @@ getRegister (CmmLit (CmmFloat d F64))
 
   | otherwise = do
     lbl <- getNewLabelNat
-    let code dst = toOL [
+    dynRef <- cmmMakeDynamicReference addImportNat False lbl
+    Amode addr addr_code <- getAmode dynRef
+    let code dst =
 	    LDATA ReadOnlyData
 			[CmmDataLabel lbl,
-			 CmmStaticLit (CmmFloat d F64)],
-	    GLD F64 (ImmAddr (ImmCLbl lbl) 0) dst
-	    ]
+			 CmmStaticLit (CmmFloat d F64)]
+	    `consOL` (addr_code `snocOL`
+	    GLD F64 addr dst)
     -- in
     return (Any F64 code)