June 2002 - Cvs-hugs - Haskell.org

cvs commit: hugs98/src ffi.c
by Alastair Reid 17 Jun '02

17 Jun '02

reid 2002/06/17 17:52:14 PDT Modified files: src ffi.c Log: Tweakings to make graphics/tests/GTest work. Made sure that if the Haskell source code asks for a ForeignObj it gets a ForeignObj not the current half-hearted, incomplete, broken attempt at ForeignPtr. Revision Changes Path 1.13 +5 -5 hugs98/src/ffi.c

1 0

cvs commit: hugs98/src ffi.c prelude.h
by Alastair Reid 17 Jun '02

17 Jun '02

reid 2002/06/17 17:41:59 PDT Modified files: src ffi.c prelude.h Log: Don't put quotes round libraries because the libraries are often lists of files. (Well, they are at the moment - discussion on ffi list may change this.) I've left the quotes in place on the windows part of the code but Sigbjorn will probably find he has to remove them. Doubled the amount of Text space allocated. The Xlib ffi code has a lot of strings in it. It may be worth looking for a way to eliminate some of these strings to save a little memory. With these changes and the recent greencard commits, the following makes HGL build and run correctly. green-card --target ffi --include-dir /home/reid/local/green-card/lib/ghc -fX_stub_ffi.c -fcbits/auxiliaries.c -f-L/usr/X11R6/lib -f-lX11 -f-lc X.gc -o X.hs green-card --target ffi --include-dir /home/reid/local/green-card/lib/ghc -fXlib_stub_ffi.c -fcbits/auxiliaries.c -f-L/usr/X11R6/lib -f-lX11 -f-lc Xlib.gc -o Xlib.hs green-card --target ffi --include-dir /home/reid/local/green-card/lib/ghc -fXlib_StdDIS_stub_ffi.c -fcbits/auxiliaries.c -f-L/usr/X11R6/lib -f-lX11 -f-lc Xlib_StdDIS.gc -o Xlib_StdDIS.hs cd ~/src/hugs-working make install make ./hugs -P/home/reid/src/hslibs/xlib:/home/reid/src/hslibs/graphics/lib/x11: \ ~/src/hslibs/graphics/demos/HelloWorld.hs WooHoo! Revision Changes Path 1.12 +3 -3 hugs98/src/ffi.c 1.36 +3 -3 hugs98/src/prelude.h

1 0

cvs commit: hugs98/src static.c
by Sigbjorn Finne 17 Jun '02

17 Jun '02

sof 2002/06/17 17:19:49 PDT Modified files: src static.c Log: checkImportEntity: correctly record imports/hidings of abstract tycons/classes on the computed imports list. Revision Changes Path 1.73 +6 -2 hugs98/src/static.c

1 0

cvs commit: hugs98/tests testScript.in
by Sigbjorn Finne 17 Jun '02

17 Jun '02

sof 2002/06/17 17:16:48 PDT Modified files: tests testScript.in Log: hook up static/mod112.hs Revision Changes Path 1.22 +1 -0 hugs98/tests/testScript.in

1 0

cvs commit: hugs98/tests/static mod112.hs
by Sigbjorn Finne 17 Jun '02

17 Jun '02

sof 2002/06/17 17:16:14 PDT Added files: tests/static mod112.hs Log: regression test for the handling of abstract class 'hiding's.

1 0

cvs commit: hugs98/tests testScript.in
by Sigbjorn Finne 17 Jun '02

17 Jun '02

sof 2002/06/17 17:09:23 PDT Modified files: tests testScript.in Log: factor out common options Revision Changes Path 1.21 +226 -222 hugs98/tests/testScript.in

1 0

cvs commit: hugs98/tests/static mod111.hs
by Sigbjorn Finne 17 Jun '02

17 Jun '02

sof 2002/06/17 17:08:57 PDT Added files: tests/static mod111.hs Log: regression test for the handling of abstract tycon 'hiding's.

1 0

cvs commit: hugs98/lib/exts ForeignObj.hs StablePtr.hs
by Alastair Reid 17 Jun '02

17 Jun '02

reid 2002/06/17 15:57:10 PDT Modified files: lib/exts ForeignObj.hs StablePtr.hs Log: Added new* synonyms for the old make* functions Revision Changes Path 1.2 +3 -0 hugs98/lib/exts/ForeignObj.hs 1.2 +3 -0 hugs98/lib/exts/StablePtr.hs

1 0

cvs commit: hugs98/src ffi.c
by Alastair Reid 17 Jun '02

17 Jun '02

reid 2002/06/17 15:56:15 PDT Modified files: src ffi.c Log: Add Addr support back in to make life with greencard --target=ffi easier - blech Revision Changes Path 1.11 +5 -2 hugs98/src/ffi.c

1 0

cvs commit: hugs98/src HsFFI.h builtin.c connect.h ffi.c static.c
by Alastair Reid 17 Jun '02

17 Jun '02

reid 2002/06/17 14:46:48 PDT Modified files: src HsFFI.h builtin.c connect.h ffi.c static.c Log: Made dynamic and wrapper forms work. This is my current test program: import Foreign import Exception import Prelude hiding (read) tests = do putStrLn "\nTesting sin==mysin (should return lots of Trues)" print (testSin sin mysin) putStrLn "\nTesting errno" err <- peek errno putStrLn $ "errno == " ++ show err putStrLn "\nTesting puts (and withString)" withString0 "Test successful" puts putStrLn "\nTesting peekArray0" s <- withString0 "Test successful" (peekArray0 '\0') putStr s putStrLn "\nTesting open, read and close" s <- testRead "test.hs" 200 putStrLn s putStrLn "\nTesting open, write and close" testWrite "/tmp/test_write" "Test successful" putStrLn "\nTesting sin==dynamic_sin (should return lots of Trues)" print (testSin sin (dyn_sin sin_addr)) putStrLn "\nTesting sin==IO wrapped_sin (should return lots of Trues)" sin_addr2 <- wrapIO (return . sin) print (testSin sin (unsafePerformIO . (dyn_sinIO sin_addr2))) freeHaskellFunPtr sin_addr2 putStrLn "\nTesting sin==Id wrapped_sin (should return lots of Trues)" sin_addr3 <- wrapId sin print (testSin sin (dyn_sin sin_addr3)) freeHaskellFunPtr sin_addr3 putStrLn "\nTesting exit" exit 3 testSin f g = [ (f x == g x) | x <- [0,0.01 .. 1] ] foreign import ccall "sin" mysin :: Double -> Double foreign import ccall "dynamic" dyn_sin :: FunPtr (Double -> Double) -> (Double -> Double) foreign import ccall "dynamic" dyn_sinIO :: FunPtr (Double -> IO Double) -> (Double -> IO Double) foreign import ccall "&sin" sin_addr :: FunPtr (Double -> Double) foreign import ccall "wrapper" wrapId :: (Double -> Double) -> IO (FunPtr (Double -> Double)) foreign import ccall "wrapper" wrapIO :: (Double -> IO Double) -> IO (FunPtr (Double -> IO Double)) foreign import ccall safe "static stdlib.h &errno" errno :: Ptr Int withString s = bracket (newArray s) free withString0 s = bracket (newArray0 '\0' s) free withBuffer sz m = do b <- mallocArray sz sz' <- m b s <- peekArray sz' b free b return s foreign import ccall puts :: Ptr Char -> IO Int foreign import ccall "open" open' :: Ptr Char -> Int -> IO Int foreign import ccall "open" open2' :: Ptr Char -> Int -> Int -> IO Int foreign import ccall "creat" creat' :: Ptr Char -> Int -> IO Int foreign import ccall close :: Int -> IO Int foreign import ccall "read" read' :: Int -> Ptr Char -> Int -> IO Int foreign import ccall "write" write' :: Int -> Ptr Char -> Int -> IO Int creat s m = withString0 s $ \s' -> unix "creat" $ creat' s' m open s m = withString0 s $ \s' -> unix "open" $ open' s' m open2 s m n = withString0 s $ \s' -> unix "open2" $ open2' s' m n write fd s = withString0 s $ \s' -> unix "write" $ write' fd s' (length s) read fd sz = withBuffer sz $ \s' -> unix "read" $ read' fd s' sz unix s m = do x <- m if x < 0 then do err <- peek errno ioError $ userError $ s ++ ": " ++ show (x,err) else return x testRead fn sz = bracket (open fn 0) close (flip read sz) testWrite fn s = bracket (open2 fn (512+64+1) 511) close (flip write s) foreign import ccall exit :: Int -> IO () -- Various bits of rubbish. -- foreign import ccall "static stdlib.h exit" (***) :: Ptr Char -> Ptr Char -> IO Int -- -- foreign import ccall safe "static stdlib.h printf" (+++) :: Ptr Char -> Ptr Char -> IO Int -- foreign import ccall safe "static stdlib.h &errno" illegal_foo :: Ptr Int -- -- foreign import ccall safe "wrapper" illegal_bar :: Char -> IO (FunPtr Char) -- foreign import ccall safe "dynamic" illegal_baz :: FunPtr Char -> Char -- foreign export ccall "id_charstar" id :: Ptr Char -> Ptr Char Revision Changes Path 1.4 +8 -3 hugs98/src/HsFFI.h 1.26 +30 -5 hugs98/src/builtin.c 1.38 +3 -3 hugs98/src/connect.h 1.10 +36 -11 hugs98/src/ffi.c 1.72 +20 -4 hugs98/src/static.c

1 0