Changeset 8902 for src/Pugs/Embed

Timestamp:

02/01/06 14:58:31 (3 years ago)

Author:

audreyt

Message:

* add a parrot_init() call.
* switch to -f (fast core) for portability.

Files:

• src/Pugs/Embed/Parrot.hsc (modified) (4 diffs)

src/Pugs/Embed/Parrot.hsc

@@ -55 +55 @@
     args <- getEnv "PUGS_PARROT_OPTS"
     let args' | isJust args && fromJust args /= "" = fromJust args
-              | otherwise                          = "-C"
+              | otherwise                          = "-f"
     rawSystem cmd [args', file]
     return ()
@@ -145 +145 @@
 import Foreign.C.String
 import Foreign.Storable
+-- import Foreign.StablePtr
 import System.IO.Unsafe
 import System.Directory
@@ -173 +174 @@
     interp <- parrot_new nullPtr
     writeIORef _ParrotInterp interp
-#ifdef XXX_ENABLE_PARROT_RUNCORES
-#if PARROT_JIT_CAPABLE && defined(PARROT_JIT_CORE)
+#if XXX_ENABLE_PARROT_JIT && PARROT_JIT_CAPABLE && defined(PARROT_JIT_CORE)
     parrot_set_run_core interp PARROT_JIT_CORE
+#elsif defined(PARROT_FAST_CORE)
+    parrot_set_run_core interp PARROT_FAST_CORE
+#elsif defined(PARROT_CGP_CORE)
+    parrot_set_run_core interp PARROT_CGP_CORE
 #elsif defined(PARROT_CGOTO_CORE)
     parrot_set_run_core interp PARROT_CGOTO_CORE
-#elsif defined(PARROT_CGP_CORE)
-    parrot_set_run_core interp PARROT_CGP_CORE
-#endif
 #endif
     -- parrot_set_debug interp 0x20
+    -- ptr <- newStablePtr _ParrotInterp
+    -- parrot_init_stacktop interp (castStablePtrToPtr ptr)
+    parrot_init interp
     parrot_imcc_init interp
 
@@ -266 +270 @@
     parrot_init :: ParrotInterp -> IO ()
 
+foreign import ccall "Parrot_init_stacktop"
+    parrot_init_stacktop :: ParrotInterp -> Ptr () -> IO ()
+
 foreign import ccall "Parrot_readbc"
     parrot_readbc :: ParrotInterp -> CString -> IO ParrotPackFile