[project @ 2000-08-21 15:40:14 by sewardj]

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

diff --git a/ghc/compiler/nativeGen/AsmCodeGen.lhs b/ghc/compiler/nativeGen/AsmCodeGen.lhs
index d85bc69..0234819 100644 (file)
--- a/ghc/compiler/nativeGen/AsmCodeGen.lhs
+++ b/ghc/compiler/nativeGen/AsmCodeGen.lhs
@@ -8,7 +8,6 @@ module AsmCodeGen ( nativeCodeGen ) where
 #include "HsVersions.h"
 #include "nativeGen/NCG.h"
 
-import IO              ( Handle )
 import List            ( intersperse )
 
 import MachMisc
@@ -28,14 +27,13 @@ import Stix         ( StixTree(..), StixReg(..),
                           NatM, initNat, mapNat,
                           NatM_State, mkNatM_State,
                           uniqOfNatM_State, deltaOfNatM_State )
-import PrimRep         ( isFloatingRep, PrimRep(..) )
 import UniqSupply      ( returnUs, thenUs, mapUs, initUs, 
                           initUs_, UniqSM, UniqSupply,
                          lazyThenUs, lazyMapUs )
 import MachMisc                ( IF_ARCH_i386(i386_insert_ffrees,) )
 
 import OrdList         ( fromOL, concatOL )
-import Outputable      
+import Outputable
 
 \end{code}
 
@@ -97,10 +95,10 @@ nativeCodeGen absC us
          insn_sdoc         = my_vcat insn_sdocs
          stix_sdoc         = vcat stix_sdocs
 
-#        if DEBUG
+#        ifdef NCG_DEBUG
          my_trace m x = trace m x
          my_vcat sds = vcat (intersperse (char ' ' 
-                                          $$ ptext SLIT("# ___stg_split_marker")
+                                          $$ ptext SLIT("# ___ncg_debug_marker")
                                           $$ char ' ') 
                                           sds)
 #        else
@@ -201,7 +199,7 @@ stixPeep ( t1@(StAssign pka (StReg (StixTemp u pk)) rhs)
    | stixCountTempUses u t2 == 1
      && sum (map (stixCountTempUses u) ts) == 0
    = 
-#    ifdef DEBUG
+#    ifdef NCG_DEBUG
      trace ("nativeGen: inlining " ++ showSDoc (pprStixTree rhs))
 #    endif
            (stixPeep (stixSubst u rhs t2 : ts))
@@ -226,7 +224,7 @@ stixConFold (StInd pk addr) = StInd pk (stixConFold addr)
 stixConFold (StAssign pk dst src)
   = StAssign pk (stixConFold dst) (stixConFold src)
 
-stixConFold (StJump addr) = StJump (stixConFold addr)
+stixConFold (StJump dsts addr) = StJump dsts (stixConFold addr)
 
 stixConFold (StCondJump addr test)
   = StCondJump addr (stixConFold test)
@@ -372,4 +370,4 @@ comparison_ops
        FloatGtOp , FloatGeOp , FloatEqOp , FloatNeOp , FloatLtOp , FloatLeOp,
        DoubleGtOp, DoubleGeOp, DoubleEqOp, DoubleNeOp, DoubleLtOp, DoubleLeOp
      ]
-\end{code}
\ No newline at end of file
+\end{code}