From: wolfgang <unknown>
Date: Wed, 10 Nov 2004 01:58:32 +0000 (+0000)
Subject: [project @ 2004-11-10 01:58:32 by wolfgang]
X-Git-Tag: Initial_conversion_from_CVS_complete~1461
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=d23da8bfa03b85bd3f67d300d4fbb85b6ee12d5f

[project @ 2004-11-10 01:58:32 by wolfgang]
64-bit fix:
when loading the "era" global variable, convert it from cIntRep to
wordRep after loading (this is a no-op on all 32-bit platforms).
---

diff --git a/ghc/compiler/codeGen/CgProf.hs b/ghc/compiler/codeGen/CgProf.hs
index 0c2381b..84061e4 100644
--- a/ghc/compiler/codeGen/CgProf.hs
+++ b/ghc/compiler/codeGen/CgProf.hs
@@ -457,7 +457,8 @@ ldvEnter cl_ptr
 		 (cmmOrWord loadEra (CmmLit (mkWordCLit lDV_STATE_USE)))
 
 loadEra :: CmmExpr 
-loadEra = CmmLoad (mkLblExpr (mkRtsDataLabel SLIT("era"))) cIntRep
+loadEra = CmmMachOp (MO_U_Conv cIntRep wordRep)
+	  [CmmLoad (mkLblExpr (mkRtsDataLabel SLIT("era"))) cIntRep]
 
 ldvWord :: CmmExpr -> CmmExpr
 -- Takes the address of a closure, and returns