From: simonmar <unknown>
Date: Tue, 7 Sep 2004 10:10:14 +0000 (+0000)
Subject: [project @ 2004-09-07 10:10:07 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~1627
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=6a56f3ba02d33c38c95ff8f8da8a28d07f02ede9

[project @ 2004-09-07 10:10:07 by simonmar]
The 7-ptr-arg version of generic apply has gone away, but parts of the
byte code generator hadn't been updated.  This fixes the ffi009(ghci)
test.
---

diff --git a/ghc/compiler/ghci/ByteCodeAsm.lhs b/ghc/compiler/ghci/ByteCodeAsm.lhs
index 3958753..5067aea 100644
--- a/ghc/compiler/ghci/ByteCodeAsm.lhs
+++ b/ghc/compiler/ghci/ByteCodeAsm.lhs
@@ -249,7 +249,6 @@ mkBits findLabel st proto_insns
 	       PUSH_APPLY_PPPP	    -> do instr1 st bci_PUSH_APPLY_PPPP
 	       PUSH_APPLY_PPPPP	    -> do instr1 st bci_PUSH_APPLY_PPPPP
 	       PUSH_APPLY_PPPPPP    -> do instr1 st bci_PUSH_APPLY_PPPPPP
-	       PUSH_APPLY_PPPPPPP   -> do instr1 st bci_PUSH_APPLY_PPPPPPP
 
                SLIDE     n by     -> instr3 st bci_SLIDE n by
                ALLOC_AP  n        -> instr2 st bci_ALLOC_AP n
@@ -395,7 +394,6 @@ instrSize16s instr
 	PUSH_APPLY_PPPP{}	-> 1
 	PUSH_APPLY_PPPPP{}	-> 1
 	PUSH_APPLY_PPPPPP{}	-> 1
-	PUSH_APPLY_PPPPPPP{}	-> 1
         SLIDE{}			-> 3
         ALLOC_AP{}		-> 2
         ALLOC_PAP{}		-> 3
diff --git a/ghc/compiler/ghci/ByteCodeGen.lhs b/ghc/compiler/ghci/ByteCodeGen.lhs
index cad4789..2c9db61 100644
--- a/ghc/compiler/ghci/ByteCodeGen.lhs
+++ b/ghc/compiler/ghci/ByteCodeGen.lhs
@@ -612,8 +612,6 @@ doTailCall init_d s p fn args
     return (final_d, push_code `appOL` more_push_code)
 
 -- v. similar to CgStackery.findMatch, ToDo: merge
-findPushSeq (PtrArg: PtrArg: PtrArg: PtrArg: PtrArg: PtrArg: PtrArg: rest)
-  = (PUSH_APPLY_PPPPPPP, 7, rest)
 findPushSeq (PtrArg: PtrArg: PtrArg: PtrArg: PtrArg: PtrArg: rest)
   = (PUSH_APPLY_PPPPPP, 6, rest)
 findPushSeq (PtrArg: PtrArg: PtrArg: PtrArg: PtrArg: rest)
diff --git a/ghc/compiler/ghci/ByteCodeInstr.lhs b/ghc/compiler/ghci/ByteCodeInstr.lhs
index 43c5515..80788d6 100644
--- a/ghc/compiler/ghci/ByteCodeInstr.lhs
+++ b/ghc/compiler/ghci/ByteCodeInstr.lhs
@@ -83,7 +83,6 @@ data BCInstr
    | PUSH_APPLY_PPPP
    | PUSH_APPLY_PPPPP
    | PUSH_APPLY_PPPPPP
-   | PUSH_APPLY_PPPPPPP
 
    | SLIDE     Int{-this many-} Int{-down by this much-}
 
@@ -164,7 +163,6 @@ instance Outputable BCInstr where
    ppr PUSH_APPLY_PPPP		= text "PUSH_APPLY_PPPP"
    ppr PUSH_APPLY_PPPPP		= text "PUSH_APPLY_PPPPP"
    ppr PUSH_APPLY_PPPPPP	= text "PUSH_APPLY_PPPPPP"
-   ppr PUSH_APPLY_PPPPPPP	= text "PUSH_APPLY_PPPPPPP"
 
    ppr (SLIDE n d)           = text "SLIDE   " <+> int n <+> int d
    ppr (ALLOC_AP sz)         = text "ALLOC_AP   " <+> int sz
@@ -228,7 +226,6 @@ bciStackUse PUSH_APPLY_PPP{}	  = 1
 bciStackUse PUSH_APPLY_PPPP{}	  = 1
 bciStackUse PUSH_APPLY_PPPPP{}	  = 1
 bciStackUse PUSH_APPLY_PPPPPP{}	  = 1
-bciStackUse PUSH_APPLY_PPPPPPP{}  = 1
 bciStackUse ALLOC_AP{}            = 1
 bciStackUse ALLOC_PAP{}           = 1
 bciStackUse (UNPACK sz)           = sz
diff --git a/ghc/includes/Bytecodes.h b/ghc/includes/Bytecodes.h
index 19b3fd1..b6e05dd 100644
--- a/ghc/includes/Bytecodes.h
+++ b/ghc/includes/Bytecodes.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Bytecodes.h,v 1.9 2002/12/11 15:36:37 simonmar Exp $
+ * $Id: Bytecodes.h,v 1.10 2004/09/07 10:10:07 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2002
  *
@@ -48,7 +48,7 @@
 #define bci_PUSH_APPLY_PPPP		22
 #define bci_PUSH_APPLY_PPPPP		23
 #define bci_PUSH_APPLY_PPPPPP		24
-#define bci_PUSH_APPLY_PPPPPPP		25
+/* #define bci_PUSH_APPLY_PPPPPPP		25 */
 #define bci_SLIDE     			26
 #define bci_ALLOC_AP   			27
 #define bci_ALLOC_PAP  			28