[project @ 1999-12-03 00:03:06 by lewie]

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

diff --git a/ghc/compiler/nativeGen/RegAllocInfo.lhs b/ghc/compiler/nativeGen/RegAllocInfo.lhs
index 2c30b18..811a39a 100644 (file)
--- a/ghc/compiler/nativeGen/RegAllocInfo.lhs
+++ b/ghc/compiler/nativeGen/RegAllocInfo.lhs
@@ -1,5 +1,5 @@
 %
-% (c) The AQUA Project, Glasgow University, 1996
+% (c) The AQUA Project, Glasgow University, 1996-1998
 %
 \section[RegAllocInfo]{Machine-specific info used for register allocation}
 
@@ -57,13 +57,11 @@ import MachMisc
 import MachRegs
 import MachCode                ( InstrList )
 
-import AbsCSyn         ( MagicId )
 import BitSet          ( unitBS, mkBS, minusBS, unionBS, listBS, BitSet )
 import CLabel          ( pprCLabel_asm, CLabel{-instance Ord-} )
 import FiniteMap       ( addToFM, lookupFM, FiniteMap )
-import OrdList         ( mkUnitList, OrdList )
+import OrdList         ( mkUnitList )
 import PrimRep         ( PrimRep(..) )
-import Stix            ( StixTree, CodeSegment )
 import UniqSet         -- quite a bit of it
 import Outputable
 \end{code}
@@ -376,7 +374,7 @@ regUsage instr = case instr of
     TEST sz src dst    -> usage (opToReg src ++ opToReg dst) []
     CMP  sz src dst    -> usage (opToReg src ++ opToReg dst) []
     SETCC cond op      -> usage [] (opToReg op)
-    JXX cond label     -> usage [] []
+    JXX cond lbl       -> usage [] []
     JMP op             -> usage (opToReg op) freeRegs
     CALL imm           -> usage [] callClobberedRegs
     CLTD               -> usage [eax] [edx]
@@ -419,7 +417,7 @@ regUsage instr = case instr of
     FISUBR sz asrc     -> usage (addrToRegs asrc) [st0]
     FTST               -> usage [st0] []
     FCOMP sz op                -> usage (st0:opToReg op) [st0] -- allFPRegs
-    FUCOMPP            -> usage [st0, st1] [] --  allFPRegs
+    FUCOMPP            -> usage [st0, st1] [st0, st1] --  allFPRegs
     FXCH               -> usage [st0, st1] [st0, st1]
     FNSTSW             -> usage [] [eax]
     _                  -> noUsage