Changeset 8900 for src/Pugs/Embed

Timestamp:

02/01/06 13:28:50 (3 years ago)

Author:

audreyt

Message:

* embedded parrot lives again, thanks to leo++'s hints.

Files:

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

src/Pugs/Embed/Parrot.hsc

@@ -170 +170 @@
     interp <- readIORef _ParrotInterp 
     if interp /= nullPtr then return interp else do
+    parrot_set_config_hash
     interp <- parrot_new nullPtr
     writeIORef _ParrotInterp interp
@@ -183 +184 @@
     -- parrot_set_debug interp 0x20
     parrot_imcc_init interp
+
+    pf      <- parrot_packfile_new interp 0
+    parrot_loadbc interp pf
+    seg     <- withCString "pugs" $ \p -> do
+        parrot_pf_create_default_segs interp p 1
+    set_pf_cur_cs pf seg
+    parrot_loadbc interp pf
+
     callback    <- mkCompileCallback compileToParrot
     pugsStr     <- withCString "Pugs" (const_string interp)
     parrot_compreg interp pugsStr callback
 
-    pf      <- parrot_packfile_new interp 0
-    pf_dir  <- get_pf_directory pf
-    seg     <- withCString "pugs" $ \p -> do
-        parrot_packfile_segment_new_seg interp pf_dir 4 p 1
-    set_pf_cur_cs pf seg
-    parrot_loadbc interp pf
     modifyIORef _GlobalFinalizer (>> parrot_exit 0)
     return interp
@@ -206 +209 @@
     cwd     <- getCurrentDirectory
     setCurrentDirectory path
-    withCString "PGE.pbc" $ parrot_load_bytecode interp
-    withCString "PGE/Hs.pir" $ parrot_load_bytecode interp
+    pge_pbc <- withCString "PGE.pbc" $ const_string interp
+    pge_hs  <- withCString "PGE/Hs.pir" $ const_string interp
+    parrot_load_bytecode interp pge_pbc
+    parrot_load_bytecode interp pge_hs
     setCurrentDirectory cwd
     loadPGE interp path
@@ -252 +257 @@
     mkCompileCallback :: ParrotCompilerFunc -> IO (FunPtr ParrotCompilerFunc)
 
+foreign import ccall "Parrot_set_config_hash"
+    parrot_set_config_hash :: IO ()
+
 foreign import ccall "Parrot_new"
     parrot_new :: ParrotInterp -> IO ParrotInterp
@@ -276 +284 @@
     parrot_packfile_segment_new_seg :: ParrotInterp -> ParrotPackFileDirectory -> CInt -> CString-> CInt -> IO ParrotPackFileByteCode
 
+foreign import ccall "PF_create_default_segs"
+    parrot_pf_create_default_segs :: ParrotInterp -> CString -> CInt -> IO ParrotPackFileByteCode
+
 foreign import ccall "dod_register_pmc"
     parrot_dod_register_pmc :: ParrotInterp -> ParrotPMC -> IO ()
@@ -286 +297 @@
 
 foreign import ccall "Parrot_load_bytecode"
-    parrot_load_bytecode :: ParrotInterp -> CString -> IO ()
+    parrot_load_bytecode :: ParrotInterp -> ParrotString -> IO ()
 
 foreign import ccall "Parrot_call_sub"