From: sof <unknown>
Date: Mon, 25 Aug 1997 21:45:21 +0000 (+0000)
Subject: [project @ 1997-08-25 21:45:21 by sof]
X-Git-Tag: Approximately_1000_patches_recorded~123
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=4d92c752f7d09ed441cc3105accfedf6078af641;p=ghc-hetmet.git

[project @ 1997-08-25 21:45:21 by sof]
Added #define for MachRegs.ImmAddr (sigh)
---

diff --git a/ghc/compiler/nativeGen/MachCode.lhs b/ghc/compiler/nativeGen/MachCode.lhs
index 96a148c..b98ab15 100644
--- a/ghc/compiler/nativeGen/MachCode.lhs
+++ b/ghc/compiler/nativeGen/MachCode.lhs
@@ -23,11 +23,13 @@ import qualified MachRegs (Addr(..))
 #define MachRegsAddr MachRegs.Addr
 #define MachRegsAddrRegImm MachRegs.AddrRegImm
 #define MachRegsAddrRegReg MachRegs.AddrRegReg
+#define MachRegsImmAddr    MachRegs.ImmAddr
 #else
 import MachRegs
 #define MachRegsAddr Addr
 #define MachRegsAddrRegImm AddrRegImm
 #define MachRegsAddrRegReg AddrRegReg
+#define MachRegsImmAddr    ImmAddr
 #endif
 
 import AbsCSyn		( MagicId )
@@ -1133,7 +1135,7 @@ getAmode (StPrim IntAddOp [x, StInt i])
   = let
 	code = mkSeqInstrs []
     in
-    returnUs (Amode (ImmAddr imm__2 (fromInteger i)) code)
+    returnUs (Amode (MachRegsImmAddr imm__2 (fromInteger i)) code)
   where
     imm    = maybeImm x
     imm__2 = case imm of Just x -> x
@@ -1167,7 +1169,7 @@ getAmode leaf
   = let
 	code = mkSeqInstrs []
     in
-    returnUs (Amode (ImmAddr imm__2 0) code)
+    returnUs (Amode (MachRegsImmAddr imm__2 0) code)
   where
     imm    = maybeImm leaf
     imm__2 = case imm of Just x -> x