- Cvs-hugs - Haskell.org

cvs commit: hugs98/lib/exts .cvsignore
by Alastair Reid 20 Jun '02

20 Jun '02

reid 2002/06/20 09:15:36 PDT Added files: lib/exts .cvsignore Log: Forget the ffi

1 0

cvs commit: hugs98/tests/ffi .cvsignore
by Alastair Reid 20 Jun '02

20 Jun '02

reid 2002/06/20 09:10:31 PDT Modified files: tests/ffi .cvsignore Log: More thoroughly ignore intermediate files Revision Changes Path 1.2 +3 -1 hugs98/tests/ffi/.cvsignore

1 0

RE: cvs commit: hugs98/src HsFFI.h builtin.c connect.h ffi.c static.c
by Simon Marlow 19 Jun '02

19 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: Thanks Alastair, I slurped your test program into GHC's test suite. I had to make a few changes to get it to run: the main one is that you used 'Ptr Char' in a lot of places where the type should have been 'Ptr CChar', i.e. CString. I guess in Hugs that doesn't matter too much because Char and CChar have the same representation at the C level, but that's not the case for GHC. I've attached my version. You might want to take a look in fptools/testsuite/tests/ghc-regress/ccall, and see if there's anything in there that might be useful for your test suite. Cheers, Simon

1 0

cvs commit: hugs98/src/unix aclocal.m4 configure configure.in
by Alastair Reid 18 Jun '02

18 Jun '02

reid 2002/06/18 15:40:19 PDT Modified files: src/unix aclocal.m4 configure configure.in Log: Stole some autoconfery from fptools/{aclocal.m4,configure.in}. Thanks Dudes! Revision Changes Path 1.6 +191 -0 hugs98/src/unix/aclocal.m4 1.23 +4205 -159 hugs98/src/unix/configure 1.26 +85 -0 hugs98/src/unix/configure.in

1 0

cvs commit: hugs98/lib/exts Storable.hs
by Alastair Reid 18 Jun '02

18 Jun '02

reid 2002/06/18 13:28:25 PDT Modified files: lib/exts Storable.hs Log: Replaced libspec "[Storable_aux.o]" with "[Storable_aux.c]" Revision Changes Path 1.4 +51 -51 hugs98/lib/exts/Storable.hs

1 0

cvs commit: hugs98/tests testScript hugs98/tests/ffi FileIO.hs FileIO.input FileIO.output String.hs String.input String.output
by Alastair Reid 18 Jun '02

18 Jun '02

reid 2002/06/18 13:26:55 PDT Modified files: tests testScript Added files: tests/ffi FileIO.hs FileIO.input FileIO.output String.hs String.input String.output Log: More runtime checks. I'm not sure how portable these are - I expect we'll iterate a few times to find something portable. You should expect to see some spurious warnings from gcc as it complains about perfectly legal but unusual code (like giving a function prototype for gcc builtin functions). The output I see from these tests is: ./../src/hugs +q +w -pHugs: -P../lib:../lib/hugs:../lib/exts +G ffi/Sin.hs < /dev/null expected stderr not matched by reality *** /tmp/no_stderr27731 Tue Jun 18 21:34:24 2002 --- /tmp/runtest27731.2 Tue Jun 18 21:34:24 2002 *************** *** 0 **** --- 1,2 ---- + Sin.c: In function `hugsprim_sin_3': + Sin.c:51: warning: built-in function `sin' declared as non-function -- !!! Testing static, dynamic and wrapped import of trig function -- !!! Testing marshalling of strings ./../src/hugs +q +w -pHugs: -P../lib:../lib/hugs:../lib/exts +G ffi/String.hs < /dev/null expected stderr not matched by reality *** /tmp/no_stderr27767 Tue Jun 18 21:34:25 2002 --- /tmp/runtest27767.2 Tue Jun 18 21:34:25 2002 *************** *** 0 **** --- 1,3 ---- + MarshalUtils.c: In function `hugsprim_memcpy_0': + MarshalUtils.c:22: warning: conflicting types for built-in function `memcpy' + MarshalUtils.c:22: warning: extern declaration of `memcpy' doesn't match global one -- !!! Testing marshalling of strings -- !!! Testing system calls ./../src/hugs +q +w -pHugs: -P../lib:../lib/hugs:../lib/exts +G ffi/FileIO.hs < /dev/null expected stderr not matched by reality *** /tmp/no_stderr27827 Tue Jun 18 21:34:25 2002 --- /tmp/runtest27827.2 Tue Jun 18 21:34:26 2002 *************** *** 0 **** --- 1,3 ---- + MarshalUtils.c: In function `hugsprim_memcpy_0': + MarshalUtils.c:22: warning: conflicting types for built-in function `memcpy' + MarshalUtils.c:22: warning: extern declaration of `memcpy' doesn't match global one -- !!! Testing system calls Revision Changes Path 1.3 +8 -0 hugs98/tests/testScript

1 0

cvs commit: hugs98/tests .cvsignore testScript hugs98/tests/ffi .cvsignore Sin.hs Sin.input Sin.output
by Alastair Reid 18 Jun '02

18 Jun '02

reid 2002/06/18 13:02:08 PDT Modified files: tests .cvsignore testScript Added files: tests/ffi .cvsignore Sin.hs Sin.input Sin.output Log: Simple runtime checks Revision Changes Path 1.2 +1 -1 hugs98/tests/.cvsignore 1.2 +4 -0 hugs98/tests/testScript

1 0

cvs commit: hugs98/tests/ffi types_aux.c
by Alastair Reid 18 Jun '02

18 Jun '02

reid 2002/06/18 12:44:28 PDT Added files: tests/ffi types_aux.c Log: forgeto

1 0

cvs commit: hugs98/src/unix configure configure.in hugs98/tests config.in testScript Readme testScript.in
by Alastair Reid 18 Jun '02

18 Jun '02

reid 2002/06/18 12:37:54 PDT Modified files: src/unix configure configure.in tests Readme Added files: tests config.in testScript Removed files: tests testScript.in Log: Important change to testscript - read this if you are adding/modifying tests. I have tweaked testscript so that it consists of: 1) A small variable part config.in 2) A large fixed part testScript I have removed testScript.in and tweaked configure to modify the small variable part. You no longer have to remember to copy changes you're testing in testScript over into testScript.in. Revision Changes Path 1.22 +16 -12 hugs98/src/unix/configure 1.25 +2 -2 hugs98/src/unix/configure.in 1.6 +3 -9 hugs98/tests/Readme

1 0

cvs commit: hugs98/tests testScript.in hugs98/tests/ffi Forms.hs Loaded.output Types.hs forms_aux.c forms_aux.h
by Alastair Reid 18 Jun '02

18 Jun '02

reid 2002/06/18 12:14:39 PDT Modified files: tests testScript.in Added files: tests/ffi Forms.hs Loaded.output Types.hs forms_aux.c forms_aux.h Log: First cut at a test suite for the ffi. As you'd expect you do 'sh ./testScript ffi' to run the test. These checks only check that typechecking and code generation works ok for correct input. So far, there are no checks for erroneous input and there are no checks that it executes ok. Revision Changes Path 1.23 +15 -3 hugs98/tests/testScript.in

2 1

RE: cvs commit: hugs98/src ffi.c
by Simon Marlow 18 Jun '02

18 Jun '02

> > btw The storable instances are bogus - fixing now > > Ooops, they were in fact fine (I got confused over whether they should > use byte offsets or element offsets). > > But while killing my commit of the 'fixed' code I got myself > in this state: > > cvs server: [09:47:46] waiting for reid's lock in > /home/cvs/root/hugs98/lib/extscvs server: [09:48:16] waiting > for reid's lock in /home/cvs/root/hugs98/lib/extscvs server: > [09:48:46] waiting for reid's lock in > /home/cvs/root/hugs98/lib/extsKilled by signal 2. > > I have no idea how to clean this up. I assume you've probably fixed this by now. For future reference (and anyone else who runs into this problem): stale locks tend to be left around when CVS crashes, and have to be removed by hand by logging on to cvs.haskelll.org with SSH, and removing the appropriate lock file from /home/cvs/root/<wherever> which is usually called something beginning with '.#cvs' IIRC. Cheers, Simon

2 1

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

cvs commit: hugs98/lib/exts Foreign.hs Ptr.hs FunPtr.hs
by Alastair Reid 17 Jun '02

17 Jun '02

reid 2002/06/17 14:44:52 PDT Modified files: lib/exts Foreign.hs Ptr.hs Removed files: lib/exts FunPtr.hs Log: Killed FunPtr - I'd misread the ffi spec when I added it. Brought FunPtr impln closer to ffi spec. Added unsafePerformIO to Foreign Revision Changes Path 1.5 +2 -0 hugs98/lib/exts/Foreign.hs 1.2 +19 -3 hugs98/lib/exts/Ptr.hs

1 0

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

17 Jun '02

reid 2002/06/17 14:43:11 PDT Modified files: src storage.c Log: Added FLOATCELL support to debug printer Revision Changes Path 1.43 +5 -2 hugs98/src/storage.c

1 0

cvs commit: hugs98/lib Prelude.hs
by Alastair Reid 17 Jun '02

17 Jun '02

reid 2002/06/17 14:42:37 PDT Modified files: lib Prelude.hs Log: Added a decent error message when the IO scheduler loop hits an unrecognised thunk. The previous error message of 'undefined' didn't really do it for me. Revision Changes Path 1.27 +1 -1 hugs98/lib/Prelude.hs

1 0

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

17 Jun '02

sof 2002/06/17 09:29:15 PDT Modified files: src ffi.c Log: Simple-minded additions for compiling via MSVC Revision Changes Path 1.9 +20 -4 hugs98/src/ffi.c

2 2

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

17 Jun '02

sof 2002/06/17 09:27:46 PDT Modified files: src builtin.c Log: proto wibble Revision Changes Path 1.25 +13 -6 hugs98/src/builtin.c

1 0

cvs commit: hugs98/src HsFFI.h
by Sigbjorn Finne 17 Jun '02

17 Jun '02

sof 2002/06/17 09:26:25 PDT Modified files: src HsFFI.h Log: Tweaks to support MSVC's 64-bit types Revision Changes Path 1.3 +18 -8 hugs98/src/HsFFI.h

1 0

cvs commit: hugs98/lib/exts Storable.hs Storable_aux.c hugs98/src ffi.c
by Alastair Reid 14 Jun '02

14 Jun '02

reid 2002/06/14 18:12:33 PDT Modified files: lib/exts Storable.hs Storable_aux.c src ffi.c Log: ffi.c: Generates correct code for CAFs Storable: Contains instances for all types. (The alignment field is 1 for all entries. This is because I can't think of an appropriate piece of code to determine the correct alignment at runtime. Would sizeof be a conservative guess?) Revision Changes Path 1.3 +68 -47 hugs98/lib/exts/Storable.hs 1.2 +22 -16 hugs98/lib/exts/Storable_aux.c 1.8 +10 -12 hugs98/src/ffi.c

1 0

cvs commit: hugs98/lib/exts Storable.hs hugs98/src MkInstal.in connect.h ffi.c machdep.c static.c storage.c storage.h
by Alastair Reid 14 Jun '02

14 Jun '02

reid 2002/06/14 17:29:10 PDT Modified files: lib/exts Storable.hs src MkInstal.in connect.h ffi.c machdep.c static.c storage.c storage.h Log: Tweaked install to install HsFFI.h in $prefix/share/hugs/include As a result you have to 'make install' before testing the code. Note: Use of the install directory $prefix/share/hugs isn't really appropriate since HsFFI.h is machine dependent and any libraries containing ffi code will be machine dependent too. Tweaked ffi code to compile the code it generates. (As before, the code needs autoconfed. It currently uses cc -shared and it assumes directory separators of "/".) Note: There's now an awful lot of code scattered around Hugs for manipulating strings: parsing them, finding substrings (notable equivalents of gnumake's basename, notdir, dir, etc.). A very worthwhile task would be to create a proper library of string manipulation code (taking care of all the overflow issues properly, etc.) and clean up all the cruft that has accumulated. A suitable test sequence for the ffi looks like this: cd unix ./configure --prefix=$HOME/tmp make install cc -I. ../lib/exts/Storable_aux.c -c -o ../lib/exts/Storable_aux.o $HOME/tmp/bin/hugs +G test.hs < /dev/null $HOME/tmp/bin/hugs test.hs stty sane ToDo: Add some file modification time code to build the .{c,so} files only if needed. Hmmm, but how do we define 'needed'? The right thing to do is a dependency analysis from this module. Revision Changes Path 1.2 +2 -2 hugs98/lib/exts/Storable.hs 1.7 +1 -0 hugs98/src/MkInstal.in 1.37 +7 -4 hugs98/src/connect.h 1.7 +93 -8 hugs98/src/ffi.c 1.52 +21 -7 hugs98/src/machdep.c 1.71 +19 -10 hugs98/src/static.c 1.42 +3 -2 hugs98/src/storage.c 1.38 +3 -2 hugs98/src/storage.h

1 0

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

14 Jun '02

reid 2002/06/14 08:02:39 PDT Added files: lib/exts ForeignObj.hs Log: Missing Commit. Note that Hugs does not implement the ForeignPtr type. I'm leaving that pending some agreement about changing the API so that it can be implemented without adding preemptive concurrency to your Haskell implementation.

1 0

cvs commit: hugs98/docs ffi-notes.txt hugs98/src HsFFI.h
by Alastair Reid 14 Jun '02

14 Jun '02

reid 2002/06/14 07:57:35 PDT Modified files: docs ffi-notes.txt src HsFFI.h Log: Minor cleanup - fix a little breakage Revision Changes Path 1.5 +29 -35 hugs98/docs/ffi-notes.txt 1.2 +19 -1 hugs98/src/HsFFI.h

1 0

cvs commit: hugs98/src HsFFI.h Makefile.in builtin.c connect.h ffi.c input.c iomonad.c machdep.c parser.y plugin.c prelude.h static.c storage.c storage.h type.c
by Alastair Reid 14 Jun '02

14 Jun '02

reid 2002/06/14 07:41:15 PDT Modified files: src Makefile.in builtin.c connect.h ffi.c input.c iomonad.c machdep.c parser.y plugin.c prelude.h static.c storage.c storage.h type.c Added files: src HsFFI.h Log: Last of the ffi commits. Hopefully won't break anything... Here's how to test it on your machine: make && ./hugs -P../lib:../lib/exts: +G test.hs < /dev/null && cc -I. -shared ../lib/exts/MarshalAlloc.c -o ../lib/exts/MarshalAlloc.so && cc -I. -shared ../lib/exts/MarshalUtils.c -o ../lib/exts/MarshalUtils.so && cc -I. -shared ../lib/exts/Storable.c ../lib/exts/Storable_aux.c -o ../lib/exts/Storable.so && cc -I. -shared test.c -o test.so && ./hugs -P../lib:../lib/exts -H test.hs; stty sane after creating hugs98/src/test.hs containing: import Foreign import Exception import Prelude hiding (read) tests = do putStrLn "\nTesting sin==mysin (should return lots of Trues)" print testSin 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 exit" exit 3 foreign import ccall "sin" mysin :: Double -> Double testSin = [ (sin x == mysin x) | x <- [0,0.01 .. 1] ] 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 Here's the changes: HsFFI.h Makefile.in HsFFI.h defines the ffi-mandated types. It really ought to be autoconfed (current settings suits an x86/gcc). Makefile updated to include HsFFI.h machdep.c prelude.h Int64 support static.c type.c parser.y input.c storage.c storage.h connect.h New syntax and related frontend changes. ffi.c Tweak code generator to match changes. Extend with many new ffi-supported types builtin.c iomonad.c plugin.c Runtime support. Big change is addition of HugsAPI4 and associated operations. This extends HugsAPI3 (greencard support) in the usual way. Note: I'd like to eliminate all direct greencard support and do a big cleanup ASAP. There's a lot of accumulated cruft in there. Revision Changes Path 1.13 +16 -16 hugs98/src/Makefile.in 1.24 +186 -37 hugs98/src/builtin.c 1.36 +17 -10 hugs98/src/connect.h 1.6 +281 -177 hugs98/src/ffi.c 1.43 +15 -39 hugs98/src/input.c 1.27 +15 -13 hugs98/src/iomonad.c 1.51 +47 -2 hugs98/src/machdep.c 1.33 +14 -44 hugs98/src/parser.y 1.5 +13 -36 hugs98/src/plugin.c 1.35 +4 -2 hugs98/src/prelude.h 1.70 +283 -225 hugs98/src/static.c 1.41 +16 -4 hugs98/src/storage.c 1.37 +26 -17 hugs98/src/storage.h 1.48 +33 -2 hugs98/src/type.c

1 0

cvs commit: hugs98/lib/exts Storable_aux.c
by Alastair Reid 14 Jun '02

14 Jun '02

reid 2002/06/14 07:25:48 PDT Added files: lib/exts Storable_aux.c Log: Support code for Storable.hs - defines teh read/writeFooOffPtr functions. In writing this code, some attempt was made to make it easier to cut and paste definitions so that it would be easier to generate the missing definitions. It'd probably be easier to use the more obvious technique of using cpp to do the job.

1 0

cvs commit: hugs98/lib/exts Foreign.hs
by Alastair Reid 14 Jun '02

14 Jun '02

reid 2002/06/14 07:22:27 PDT Modified files: lib/exts Foreign.hs Log: Updated to pull in the new ffi libraries. Warning: anyone using this new one will be forced to use the new ffi because it pulls in files which contain foreign imports. Revision Changes Path 1.4 +23 -20 hugs98/lib/exts/Foreign.hs

1 0

cvs commit: hugs98/lib/exts Word.hs
by Alastair Reid 14 Jun '02

14 Jun '02

reid 2002/06/14 07:20:30 PDT Modified files: lib/exts Word.hs Log: Bugfix: Word64 has been defined in the Prelude for over a week now so I'm removing the definition from here. Revision Changes Path 1.7 +11 -11 hugs98/lib/exts/Word.hs

1 0

cvs commit: hugs98/lib/exts CTypes.hs FunPtr.hs MarshalAlloc.hs MarshalArray.hs MarshalError.hs MarshalUtils.hs Ptr.hs StablePtr.hs Storable.hs
by Alastair Reid 14 Jun '02

14 Jun '02

reid 2002/06/14 07:19:29 PDT Added files: lib/exts CTypes.hs FunPtr.hs MarshalAlloc.hs MarshalArray.hs MarshalError.hs MarshalUtils.hs Ptr.hs StablePtr.hs Storable.hs Log: First of a series of commits of the new ffi code. Existing uses of GreenCard-generated code should still work (and seems to do so). These are enough of the libraries to run some tests. Some of them (notably CTypes.hs and Storable.hs) are very incomplete _and_ should (but aren't) be configured with autoconf and should (but isn't) be built from the sources in the hierarchial library archive. I'd love it if someone were to tackle either of these problems before I get to them.

1 0

cvs commit: hugs98/src hugs.c
by Sigbjorn Finne 13 Jun '02

13 Jun '02

sof 2002/06/13 15:56:43 PDT Modified files: src hugs.c Log: Flip default for 'T' toggle (and give it a better doc. string + name.) Revision Changes Path 1.84 +5 -5 hugs98/src/hugs.c

1 0

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

13 Jun '02

sof 2002/06/13 15:01:31 PDT Modified files: src static.c Log: Handle reporting of ambiguous type constructor + class occurrences. Revision Changes Path 1.69 +40 -25 hugs98/src/static.c

1 0

cvs commit: hugs98/src machdep.c
by Alastair Reid 12 Jun '02

12 Jun '02

reid 2002/06/12 11:55:25 PDT Modified files: src machdep.c Log: Fixed dynamic loading implementation for Darwin. Tweaked the code to use a fresh namespace for each loaded module instead of the global namespace. This means that when you lookup _initModule you get a different answer each time. What was happening before was you always got the first _initModule loaded into the namespace which was always the one from StdDIS.so so we kept initializing StdDIS instead of initializing the module we'd just loaded. Someone who knows Darwin better should check this code over. My source of documentation was some random web page instead of a proper manual. My testcase was an X program being run on a machine on which I couldn't run X - so all I know is that it loads successfully but I can't say for sure that it runs ok. Revision Changes Path 1.50 +8 -7 hugs98/src/machdep.c

1 0

cvs commit: hugs98/tests Readme testScript.in
by Alastair Reid 12 Jun '02

12 Jun '02

reid 2002/06/12 09:55:11 PDT Modified files: tests Readme testScript.in Log: Yesterday's fixes to the testScript were scrogged because.... I forgot that you have to commit testScript not testScript.in While I was in there I fixed the header on testScript.in which should read: CONTEXT_DIFF='@CONTEXT_DIFF@' export CONTEXT_DIFF DEV_NULL='@DEV_NULL@' export DEV_NULL HUGSFLAGS=-P../lib:../lib/hugs:../lib/exts export HUGSFLAGS HUGS=../src/hugs Hmmm, maybe the right thing to do is for configure to make a little config script containing nothing but the above and for testScript to source that file. This'd avoid screwups like yesterday. Revision Changes Path 1.5 +3 -0 hugs98/tests/Readme 1.20 +88 -88 hugs98/tests/testScript.in

1 0

cvs commit: hugs98/tests/libs except1.output hugs98/tests/rts ioerror1.output hugs98/tests/tcheck DictHW.output TyErr.output
by Alastair Reid 11 Jun '02

11 Jun '02

reid 2002/06/11 10:55:56 PDT Modified files: tests/libs except1.output tests/rts ioerror1.output tests/tcheck DictHW.output TyErr.output Log: Fixed test suite to match current behaviour. Two changes seem to have happened: 1) The +q flag makes things even quieter. I didn't really look at what was different but it seems like it doesn't report which files it is loading anymore - so the number of lines to ignore got much smaller. 2) When printing IOErrors, an extra carriage return is added to the error message. Revision Changes Path 1.4 +3 -0 hugs98/tests/libs/except1.output 1.3 +2 -0 hugs98/tests/rts/ioerror1.output 1.5 +2 -4 hugs98/tests/tcheck/DictHW.output 1.3 +0 -1 hugs98/tests/tcheck/TyErr.output

1 0

cvs commit: hugs98/lib/exts Int.hs hugs98/src builtin.c prelude.h
by Alastair Reid 11 Jun '02

11 Jun '02

reid 2002/06/11 10:52:57 PDT Modified files: lib/exts Int.hs src builtin.c prelude.h Log: Fixed Int operations. Revision Changes Path 1.4 +74 -67 hugs98/lib/exts/Int.hs 1.23 +41 -25 hugs98/src/builtin.c 1.34 +4 -2 hugs98/src/prelude.h

1 0

cvs commit: hugs98/lib/exts Pretty.lhs
by Alastair Reid 11 Jun '02

11 Jun '02

reid 2002/06/11 10:51:37 PDT Added files: lib/exts Pretty.lhs Log: Looks like Pretty got left out when we added back all the hslib libraries (after the ghc folk so kindly killed them). Added it back in.

1 0

cvs commit: hugs98/tests/libs intTest.hs intTest.input
by Alastair Reid 11 Jun '02

11 Jun '02

reid 2002/06/11 10:49:47 PDT Modified files: tests/libs intTest.hs intTest.input Log: Make tests.libs.intTest.test not be a CAF This used to work. I suspect that this broke when we changed the monad translation. Revision Changes Path 1.3 +2 -1 hugs98/tests/libs/intTest.hs 1.2 +1 -1 hugs98/tests/libs/intTest.input

1 0

cvs commit: hugs98/lib Numeric.hs Prelude.hs
by Sigbjorn Finne 07 Jun '02

07 Jun '02

sof 2002/06/07 07:33:09 PDT Modified files: lib Numeric.hs Prelude.hs Log: Catch up with H98 changes to lexLitChar and readFloat. Revision Changes Path 1.6 +1 -1 hugs98/lib/Numeric.hs 1.26 +22 -16 hugs98/lib/Prelude.hs

1 0

cvs commit: hugs98/src machdep.c
by Sigbjorn Finne 05 Jun '02

05 Jun '02

sof 2002/06/05 07:52:28 PDT Modified files: src machdep.c Log: Little bit of cleanup while passing through. Revision Changes Path 1.49 +27 -32 hugs98/src/machdep.c

1 0

cvs commit: hugs98/lib IO.hs Prelude.hs
by Sigbjorn Finne 03 Jun '02

03 Jun '02

sof 2002/06/03 07:49:12 PDT Modified files: lib IO.hs Prelude.hs Log: Interpret Report wording for Prelude.getLine and IO.hGetLine to mean the Right Thing. If EOF is encountered for a partial line (>= 1 chars), interpret this as '\n'. Revision Changes Path 1.4 +25 -8 hugs98/lib/IO.hs 1.25 +23 -5 hugs98/lib/Prelude.hs

1 0

cvs commit: hugs98/src static.c
by Sigbjorn Finne 30 May '02

30 May '02

sof 2002/05/30 14:23:04 PDT Modified files: src static.c Log: Fixed up reporting of name ambiguities. Revision Changes Path 1.68 +49 -19 hugs98/src/static.c

1 0

cvs commit: hugs98/tests testScript.in
by Sigbjorn Finne 30 May '02

30 May '02

sof 2002/05/30 14:17:38 PDT Modified files: tests testScript.in Log: make 'static' checks go through silently (bar a couple) Revision Changes Path 1.19 +135 -133 hugs98/tests/testScript.in

1 0

cvs commit: hugs98/tests/static mod107.hs mod108.hs mod109.hs mod110.hs mod29.hs mod29.output mod30.hs mod30.output mod31.hs mod31.output mod32.hs mod32.output mod33.hs mod33.output mod34.hs mod34.output mod35.hs mod35.output mod88.hs mod88.output
by Sigbjorn Finne 30 May '02

30 May '02

sof 2002/05/30 14:14:07 PDT Modified files: tests/static mod107.hs mod108.hs mod109.hs mod110.hs mod29.hs mod29.output mod30.hs mod30.output mod31.hs mod31.output mod32.hs mod32.output mod33.hs mod33.output mod34.hs mod34.output mod35.hs mod35.output mod88.hs mod88.output Log: updates to match recent module system impl changes Revision Changes Path 1.2 +1 -0 hugs98/tests/static/mod107.hs 1.2 +1 -0 hugs98/tests/static/mod108.hs 1.2 +7 -7 hugs98/tests/static/mod109.hs 1.2 +1 -1 hugs98/tests/static/mod110.hs 1.4 +5 -3 hugs98/tests/static/mod29.hs 1.3 +1 -1 hugs98/tests/static/mod29.output 1.3 +1 -1 hugs98/tests/static/mod30.hs 1.3 +0 -1 hugs98/tests/static/mod30.output 1.3 +2 -1 hugs98/tests/static/mod31.hs 1.3 +0 -1 hugs98/tests/static/mod31.output 1.3 +2 -1 hugs98/tests/static/mod32.hs 1.3 +0 -1 hugs98/tests/static/mod32.output 1.3 +3 -2 hugs98/tests/static/mod33.hs 1.3 +0 -1 hugs98/tests/static/mod33.output 1.3 +2 -1 hugs98/tests/static/mod34.hs 1.3 +0 -1 hugs98/tests/static/mod34.output 1.3 +2 -1 hugs98/tests/static/mod35.hs 1.3 +0 -1 hugs98/tests/static/mod35.output 1.4 +2 -1 hugs98/tests/static/mod88.hs 1.3 +1 -1 hugs98/tests/static/mod88.output

1 0