[project @ 1998-02-05 12:23:33 by simonm]

[ghc-hetmet.git] / ghc / compiler / nativeGen / StixMacro.lhs

diff --git a/ghc/compiler/nativeGen/StixMacro.lhs b/ghc/compiler/nativeGen/StixMacro.lhs
index 419283c..ab0ecc4 100644 (file)
--- a/ghc/compiler/nativeGen/StixMacro.lhs
+++ b/ghc/compiler/nativeGen/StixMacro.lhs
@@ -3,25 +3,23 @@
 %
 
 \begin{code}
-#include "HsVersions.h"
-
 module StixMacro ( macroCode, heapCheck ) where
 
-IMP_Ubiq(){-uitious-}
-IMPORT_DELOOPER(NcgLoop)               ( amodeToStix )
+#include "HsVersions.h"
+
+import {-# SOURCE #-} StixPrim ( amodeToStix )
 
 import MachMisc
 import MachRegs
-
 import AbsCSyn         ( CStmtMacro(..), MagicId(..), mkIntCLit, CAddrMode )
-import CgCompInfo      ( uF_RET, uF_SUA, uF_SUB, uF_UPDATEE,
+import Constants       ( uF_RET, uF_SUA, uF_SUB, uF_UPDATEE,
                          sTD_UF_SIZE
                        )
 import OrdList         ( OrdList )
 import PrimOp          ( PrimOp(..) )
 import PrimRep         ( PrimRep(..) )
 import Stix
-import UniqSupply      ( returnUs, thenUs, SYN_IE(UniqSM) )
+import UniqSupply      ( returnUs, thenUs, UniqSM )
 \end{code}
 
 The @ARGS_CHK_A{_LOAD_NODE}@ macros check for sufficient arguments on