cvs commit: hugs98/src HsFFI.h builtin.c connect.h ffi.c static.c

[Simon Marlow]

This is a multi-part message in MIME format.

------_=_NextPart_001_01C21790.CF7D5CE4
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

> reid        2002/06/17 14:46:48 PDT
>=20
>   Modified files:
>     src                  HsFFI.h builtin.c connect.h ffi.c=20
>                          static.c=20
>   Log:
>   Made dynamic and wrapper forms work.
>  =20
>   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

------_=_NextPart_001_01C21790.CF7D5CE4
Content-Type: application/octet-stream;
	name="ffi005.hs"
Content-Transfer-Encoding: base64
Content-Description: ffi005.hs
Content-Disposition: attachment;
	filename="ffi005.hs"

aW1wb3J0IEZvcmVpZ24KaW1wb3J0IEZvcmVpZ24uQwppbXBvcnQgQ29udHJvbC5FeGNlcHRpb24K
aW1wb3J0IFN5c3RlbS5JTy5VbnNhZmUKaW1wb3J0IFByZWx1ZGUgaGlkaW5nIChyZWFkKQppbXBv
cnQgU3lzdGVtLklPIGhpZGluZyAoYnJhY2tldCkKCm1haW4gPSBkbwoKICBwdXRTdHJMbiAiXG5U
ZXN0aW5nIHNpbj09bXlzaW4gKHNob3VsZCByZXR1cm4gbG90cyBvZiBUcnVlcykiCiAgcHJpbnQg
KHRlc3RTaW4gc2luIG15c2luKQoKICBwdXRTdHJMbiAiXG5UZXN0aW5nIGVycm5vIgogIGVyciA8
LSBwZWVrIGVycm5vCiAgcHV0U3RyTG4gJCAiZXJybm8gPT0gIiArKyBzaG93IGVycgoKICBwdXRT
dHJMbiAiXG5UZXN0aW5nIHB1dHMgKGFuZCB3aXRoU3RyaW5nKSIKICB3aXRoQ1N0cmluZyAiVGVz
dCBzdWNjZXNzZnVsIiBwdXRzCgogIHB1dFN0ckxuICJcblRlc3RpbmcgcGVla0FycmF5MCIKICBz
IDwtIHdpdGhDU3RyaW5nICJUZXN0IHN1Y2Nlc3NmdWwiIChwZWVrQXJyYXkwIChjYXN0Q2hhclRv
Q0NoYXIgJ1wwJykpCiAgcHV0U3RyIChtYXAgY2FzdENDaGFyVG9DaGFyIHMpCgogIHB1dFN0ckxu
ICJcblRlc3Rpbmcgb3BlbiwgcmVhZCBhbmQgY2xvc2UiCiAgcyA8LSB0ZXN0UmVhZCAiZmZpMDA1
LmhzIiAyMDAKICBwdXRTdHJMbiAobWFwIGNhc3RDQ2hhclRvQ2hhciBzKQoKICBwdXRTdHJMbiAi
XG5UZXN0aW5nIG9wZW4sIHdyaXRlIGFuZCBjbG9zZSIKICB0ZXN0V3JpdGUgIi90bXAvdGVzdF93
cml0ZSIgIlRlc3Qgc3VjY2Vzc2Z1bCIKCiAgcHV0U3RyTG4gIlxuVGVzdGluZyBzaW49PWR5bmFt
aWNfc2luIChzaG91bGQgcmV0dXJuIGxvdHMgb2YgVHJ1ZXMpIgogIHByaW50ICh0ZXN0U2luIHNp
biAoZHluX3NpbiBzaW5fYWRkcikpCgogIHB1dFN0ckxuICJcblRlc3Rpbmcgc2luPT1JTyB3cmFw
cGVkX3NpbiAoc2hvdWxkIHJldHVybiBsb3RzIG9mIFRydWVzKSIKICBzaW5fYWRkcjIgPC0gd3Jh
cElPIChyZXR1cm4gLiBzaW4pCiAgcHJpbnQgKHRlc3RTaW4gc2luICh1bnNhZmVQZXJmb3JtSU8g
LiAoZHluX3NpbklPIHNpbl9hZGRyMikpKQogIGZyZWVIYXNrZWxsRnVuUHRyIHNpbl9hZGRyMgoK
ICBwdXRTdHJMbiAiXG5UZXN0aW5nIHNpbj09SWQgd3JhcHBlZF9zaW4gKHNob3VsZCByZXR1cm4g
bG90cyBvZiBUcnVlcykiCiAgc2luX2FkZHIzIDwtIHdyYXBJZCBzaW4KICBwcmludCAodGVzdFNp
biBzaW4gKGR5bl9zaW4gc2luX2FkZHIzKSkKICBmcmVlSGFza2VsbEZ1blB0ciBzaW5fYWRkcjMK
CiAgcHV0U3RyTG4gIlxuVGVzdGluZyBleGl0IgogIGhGbHVzaCBzdGRvdXQKICBleGl0IDMKCnRl
c3RTaW4gZiBnID0gWyAoZiB4ID09IGcgeCkgfCB4IDwtIFswLDAuMDEgLi4gMV0gXQoKZm9yZWln
biBpbXBvcnQgY2NhbGwgInNpbiIgbXlzaW4gOjogRG91YmxlIC0+IERvdWJsZQpmb3JlaWduIGlt
cG9ydCBjY2FsbCAiZHluYW1pYyIgZHluX3NpbiA6OiBGdW5QdHIgKERvdWJsZSAtPiBEb3VibGUp
IC0+IChEb3VibGUgLT4gRG91YmxlKQpmb3JlaWduIGltcG9ydCBjY2FsbCAiZHluYW1pYyIgZHlu
X3NpbklPIDo6IEZ1blB0ciAoRG91YmxlIC0+IElPIERvdWJsZSkgLT4gKERvdWJsZSAtPiBJTyBE
b3VibGUpCmZvcmVpZ24gaW1wb3J0IGNjYWxsICImc2luIiBzaW5fYWRkciA6OiBGdW5QdHIgKERv
dWJsZSAtPiBEb3VibGUpCmZvcmVpZ24gaW1wb3J0IGNjYWxsICJ3cmFwcGVyIiB3cmFwSWQgOjog
KERvdWJsZSAtPiBEb3VibGUpIC0+IElPIChGdW5QdHIgKERvdWJsZSAtPiBEb3VibGUpKQpmb3Jl
aWduIGltcG9ydCBjY2FsbCAid3JhcHBlciIgd3JhcElPIDo6IChEb3VibGUgLT4gSU8gRG91Ymxl
KSAtPiBJTyAoRnVuUHRyIChEb3VibGUgLT4gSU8gRG91YmxlKSkKCmZvcmVpZ24gaW1wb3J0IGNj
YWxsIHNhZmUgInN0YXRpYyBzdGRsaWIuaCAmZXJybm8iIGVycm5vIDo6IFB0ciBJbnQKCndpdGhC
dWZmZXIgc3ogbSA9IGRvCiAgYiA8LSBtYWxsb2NBcnJheSBzegogIHN6JyA8LSBtIGIKICBzIDwt
IHBlZWtBcnJheSBzeicgYgogIGZyZWUgYgogIHJldHVybiBzCgpmb3JlaWduIGltcG9ydCBjY2Fs
bCBwdXRzIDo6IENTdHJpbmcgLT4gSU8gSW50Cgpmb3JlaWduIGltcG9ydCBjY2FsbCAib3BlbiIg
b3BlbicgIDo6IENTdHJpbmcgLT4gSW50IC0+IElPIEludApmb3JlaWduIGltcG9ydCBjY2FsbCAi
b3BlbiIgb3BlbjInIDo6IENTdHJpbmcgLT4gSW50IC0+IEludCAtPiBJTyBJbnQKZm9yZWlnbiBp
bXBvcnQgY2NhbGwgImNyZWF0IiBjcmVhdCcgOjogQ1N0cmluZyAtPiBJbnQgLT4gSU8gSW50CmZv
cmVpZ24gaW1wb3J0IGNjYWxsICAgICAgICBjbG9zZSA6OiBJbnQgLT4gSU8gSW50CmZvcmVpZ24g
aW1wb3J0IGNjYWxsICJyZWFkIiByZWFkJyA6OiBJbnQgLT4gQ1N0cmluZyAtPiBJbnQgLT4gSU8g
SW50CmZvcmVpZ24gaW1wb3J0IGNjYWxsICJ3cml0ZSIgd3JpdGUnIDo6IEludCAtPiBDU3RyaW5n
IC0+IEludCAtPiBJTyBJbnQKCmNyZWF0IHMgbSAgID0gd2l0aENTdHJpbmcgcyAkIFxzJyAtPiB1
bml4ICJjcmVhdCIgJCBjcmVhdCcgcycgbQpvcGVuIHMgbSAgICA9IHdpdGhDU3RyaW5nIHMgJCBc
cycgLT4gdW5peCAib3BlbiIgICQgb3BlbicgcycgbQpvcGVuMiBzIG0gbiA9IHdpdGhDU3RyaW5n
IHMgJCBccycgLT4gdW5peCAib3BlbjIiICQgb3BlbjInIHMnIG0gbgp3cml0ZSBmZCBzICA9IHdp
dGhDU3RyaW5nIHMgJCBccycgLT4gdW5peCAid3JpdGUiICQgd3JpdGUnIGZkIHMnIChsZW5ndGgg
cykKcmVhZCAgZmQgc3ogPSB3aXRoQnVmZmVyIHN6ICQgXHMnIC0+IHVuaXggInJlYWQiICAkIHJl
YWQnIGZkIHMnIHN6Cgp1bml4IHMgbSA9IGRvCiAgeCA8LSBtCiAgaWYgeCA8IDAKICAgdGhlbiBk
bwogICAgIGVyciA8LSBwZWVrIGVycm5vCiAgICAgaW9FcnJvciAkIHVzZXJFcnJvciAkIHMgKysg
IjogIiArKyBzaG93ICh4LGVycikKICAgZWxzZSByZXR1cm4geAoKdGVzdFJlYWQgZm4gc3ogPSBi
cmFja2V0IChvcGVuIGZuIDApIGNsb3NlIChmbGlwIHJlYWQgc3opCnRlc3RXcml0ZSBmbiBzID0g
YnJhY2tldCAob3BlbjIgZm4gKDUxMis2NCsxKSA1MTEpIGNsb3NlIChmbGlwIHdyaXRlIHMpCgpm
b3JlaWduIGltcG9ydCBjY2FsbCBleGl0IDo6IEludCAtPiBJTyAoKQoKLS0gVmFyaW91cyBiaXRz
IG9mIHJ1YmJpc2guCi0tIGZvcmVpZ24gaW1wb3J0IGNjYWxsICJzdGF0aWMgc3RkbGliLmggZXhp
dCIgKCoqKikgOjogQ1N0cmluZyAtPiBDU3RyaW5nIC0+IElPIEludAotLQotLSBmb3JlaWduIGlt
cG9ydCBjY2FsbCBzYWZlICJzdGF0aWMgc3RkbGliLmggcHJpbnRmIiAoKysrKSA6OiBDU3RyaW5n
IC0+IENTdHJpbmcgLT4gSU8gSW50Ci0tIGZvcmVpZ24gaW1wb3J0IGNjYWxsIHNhZmUgInN0YXRp
YyBzdGRsaWIuaCAmZXJybm8iIGlsbGVnYWxfZm9vIDo6IFB0ciBJbnQKLS0KLS0gZm9yZWlnbiBp
bXBvcnQgY2NhbGwgc2FmZSAid3JhcHBlciIgaWxsZWdhbF9iYXIgOjogQ2hhciAtPiBJTyAoRnVu
Q1N0cmluZykKLS0gZm9yZWlnbiBpbXBvcnQgY2NhbGwgc2FmZSAiZHluYW1pYyIgaWxsZWdhbF9i
YXogOjogRnVuQ1N0cmluZyAtPiBDaGFyCgotLSBmb3JlaWduIGV4cG9ydCBjY2FsbCAiaWRfY2hh
cnN0YXIiIGlkIDo6IENTdHJpbmcgLT4gQ1N0cmluZwogIAo=

------_=_NextPart_001_01C21790.CF7D5CE4--