X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FnativeGen%2FStixPrim.lhs;h=9f014888ab885b2d4c1da7c9c0e904c0157a0ab3;hb=a5f7799965947977599a777dae10f103f9b9fd1a;hp=3579ca16e56c0505f320148de174830da60110a6;hpb=36c2d7c8e9da3b2e278d508ac25c7d53522f85f3;p=ghc-hetmet.git

diff --git a/ghc/compiler/nativeGen/StixPrim.lhs b/ghc/compiler/nativeGen/StixPrim.lhs
index 3579ca1..9f01488 100644
--- a/ghc/compiler/nativeGen/StixPrim.lhs
+++ b/ghc/compiler/nativeGen/StixPrim.lhs
@@ -314,14 +314,14 @@ amodeToStix (CAddr (HpRel off))
 amodeToStix (CAddr (NodeRel off))
   = StIndex IntRep stgNode (StInt (toInteger IBOX(off)))
 
+amodeToStix (CAddr (CIndex base off pk))
+  = StIndex pk (amodeToStix base) (amodeToStix off)
+
 amodeToStix (CReg magic)    = StReg (StixMagicId magic)
 amodeToStix (CTemp uniq pk) = StReg (StixTemp uniq pk)
 
 amodeToStix (CLbl      lbl _) = StCLbl lbl
 
-amodeToStix (CTableEntry base off pk)
-  = StInd pk (StIndex pk (amodeToStix base) (amodeToStix off))
-
  -- For CharLike and IntLike, we attempt some trivial constant-folding here.
 
 amodeToStix (CCharLike (CLit (MachChar c)))
@@ -342,9 +342,6 @@ amodeToStix (CIntLike (CLit (MachInt i _)))
 amodeToStix (CIntLike x)
   = panic "CIntLike"
 
- -- A CString is just a (CLit . MachStr)
-amodeToStix (CString s) = StString s
-
 amodeToStix (CLit core)
   = case core of
       MachChar c     -> StInt (toInteger (ord c))