update libc to use FUNCTION: and FUNCTION-ALIAS:

release
Joe Groff 2010-04-14 21:50:30 -07:00
parent 37784cd356
commit 1c99d0cae0
1 changed files with 22 additions and 20 deletions

View File

@ -2,15 +2,18 @@
! Copyright (C) 2007, 2010 Slava Pestov ! Copyright (C) 2007, 2010 Slava Pestov
! Copyright (C) 2007, 2008 Doug Coleman ! Copyright (C) 2007, 2008 Doug Coleman
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: alien alien.c-types assocs continuations alien.destructors kernel USING: alien alien.c-types alien.syntax assocs continuations
namespaces accessors sets summary destructors destructors.private ; alien.destructors kernel namespaces accessors sets summary
destructors destructors.private ;
IN: libc IN: libc
: errno ( -- int ) LIBRARY: factor
int "factor" "err_no" { } alien-invoke ;
: set-errno ( int -- ) FUNCTION-ALIAS: errno
void "factor" "set_err_no" { int } alien-invoke ; int err_no ( ) ;
FUNCTION-ALIAS: set-errno
void set_err_no ( int err-no ) ;
: clear-errno ( -- ) : clear-errno ( -- )
0 set-errno ; 0 set-errno ;
@ -18,17 +21,19 @@ IN: libc
: preserve-errno ( quot -- ) : preserve-errno ( quot -- )
errno [ call ] dip set-errno ; inline errno [ call ] dip set-errno ; inline
: (malloc) ( size -- alien ) LIBRARY: libc
void* "libc" "malloc" { ulong } alien-invoke ;
: (calloc) ( count size -- alien ) FUNCTION-ALIAS: (malloc)
void* "libc" "calloc" { ulong ulong } alien-invoke ; void* malloc ( ulong size ) ;
: (free) ( alien -- ) FUNCTION-ALIAS: (calloc)
void "libc" "free" { void* } alien-invoke ; void* calloc ( ulong count, ulong size ) ;
: (realloc) ( alien size -- newalien ) FUNCTION-ALIAS: (free)
void* "libc" "realloc" { void* ulong } alien-invoke ; void free ( void* alien ) ;
FUNCTION-ALIAS: (realloc)
void* realloc ( void* alien, ulong size ) ;
<PRIVATE <PRIVATE
@ -86,17 +91,14 @@ PRIVATE>
: free ( alien -- ) : free ( alien -- )
>c-ptr [ delete-malloc ] [ (free) ] bi ; >c-ptr [ delete-malloc ] [ (free) ] bi ;
: memcpy ( dst src size -- ) FUNCTION: void memcpy ( void* dst, void* src, ulong size ) ;
void "libc" "memcpy" { void* void* ulong } alien-invoke ;
: memcmp ( a b size -- cmp ) FUNCTION: int memcmp ( void* a, void* b, ulong size ) ;
int "libc" "memcmp" { void* void* ulong } alien-invoke ;
: memory= ( a b size -- ? ) : memory= ( a b size -- ? )
memcmp 0 = ; memcmp 0 = ;
: strlen ( alien -- len ) FUNCTION: size_t strlen ( c-string alien ) ;
size_t "libc" "strlen" { c-string } alien-invoke ;
DESTRUCTOR: free DESTRUCTOR: free
DESTRUCTOR: (free) DESTRUCTOR: (free)