Changeset 7853

Timestamp:

11/05/05 20:23:35 (3 years ago)

Author:

autrijus

Message:

* Parrot 0.3.1 doesn't allow set_addr for Closure, so use

newclosure instead.

Location:

src

Files:

• Emit/PIR.hs (modified) (3 diffs)
• Pugs/CodeGen/PIR.hs (modified) (1 diff)

src/Emit/PIR.hs

@@ -48 +48 @@
     | InsComment    !String !(Maybe Ins)            -- ^ Comment
     | InsExp        !Expression                     -- ^ Generic expressions
+    | InsConst      !LValue !ObjType !Expression    -- ^ Constant
     deriving (Show, Eq, Typeable)
 
@@ -87 +88 @@
     = PerlScalar | PerlArray | PerlHash
     | PerlInt | PerlPair | PerlRef | PerlEnv
-    | Closure | Continuation
+    | Sub | Closure | Continuation
     | BareType String
     deriving (Show, Eq, Typeable)
@@ -152 +153 @@
     emit (InsTailFun fun args) = emitFun "tailcall" fun args []
     emit (InsExp _) = empty
+    emit (InsConst ident rtyp lit) =
+        emit ".const" <+> emit rtyp <+> emit ident <+> equals <+> emit lit
     emit (InsLabel label) = nest (-2) (emit label <> colon)
     emit (InsComment comment ins) = emit (StmtComment comment) $+$ emit ins

src/Pugs/CodeGen/PIR.hs

@@ -110 +110 @@
         [begL, endL] <- genLabel ["blockBegin", "blockEnd"]
         this    <- genPMC "block"
-        tellIns $ InsNew (reg this) Closure
-        tellIns $ "set_addr" .- [reg this, bare begL]
+        let begP = begL ++ "_C"
+        tellIns $ InsConst (VAR begP) Sub (lit begL)
+        tellIns $ reg this <-- "newclosure" $ [bare begP]
         tellIns $ "goto" .- [bare endL]
         tellLabel begL