mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-22 20:42:03 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
Yuguo Zhang 2018-09-19 08:47:04 +08:00
commit 81de340982
6 changed files with 93 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -56,6 +56,8 @@
=--with-libgc-incdir= and =--with-libgc-libdir= (these flags work the
same as flags for =libffi= and =libgmp=)
** Issues fixed
- initarg caches are now invalidated when new methods are defined. Problem
found and fixed by Alexander Wood.
- ECL allocated too much space in lisp stack. Instead of the specified size
x in bytes, ECL allocated roughly x^2/p where p is defined in
LISP_PAGESIZE (2048 by default). If you're setting the value of

27
src/doc/new-doc/extensions/ffi.txi
View file

@ -4,7 +4,7 @@
@ftindex FFI
@menu
* What is a FFI?:: FFI introduciton
* What is a FFI?:: FFI introduction
* Two kinds of FFI:: ECL's FFI brief description
* Foreign objects:: Handling the foreign objects
* Higher level interfaces:: Usage examples
@ -50,7 +50,7 @@ sections.
@node Two kinds of FFI
@subsection Two kinds of FFI
@cindex Two kinds of FFI
ECL allows for two different appraoches when building a FFI. Both
ECL allows for two different approaches when building a FFI. Both
approaches have a different implementation philosophy and affect the
places where you can use the FFI and how.
@ -90,7 +90,7 @@ foreign-function interface library.
@image{figures/ffi,,1.5in}
@end float
As you see, the first approach uses rather portable technices based on a
As you see, the first approach uses rather portable techniques based on a
programming language (C, C++) which is strongly supported by the
operating system. The conversion of data is performed by a calling
routines in the ECL library and we need not care about the precise
@ -143,27 +143,28 @@ The most important component of the object is the memory region where
data is stored. By default ECL assumes that the user will perform
automatic management of this memory, deleting the object when it is no
longer needed. The first reason is that this block may have been
allocated by a foreign routine using malloc(), or mmap(), or statically,
by referring to a C constant. The second reason is that foreign
functions may store references to this memory which ECL is not aware of
and, in order to keep these references valid, ECL should not attempt to
automatically destroy the object.
allocated by a foreign routine using @code{malloc()}, or
@code{mmap()}, or statically, by referring to a C constant. The second
reason is that foreign functions may store references to this memory
which ECL is not aware of and, in order to keep these references
valid, ECL should not attempt to automatically destroy the object.
In many cases, however, it is desirable to automatically destroy foreign
objects once they have been used. The higher level interfaces UFFI and
CFFI provide tools for doing this. For instance, in the following
example adapted from the UFFI documentation, the string NAME is
example adapted from the UFFI documentation, the string @var{NAME} is
automatically deallocated
@lisp
(def-function "gethostname"
(ffi:def-function ("gethostname" c-gethostname)
((name (* :unsigned-char))
(len :int))
:returning :int)
(if (zerop (c-gethostname (ffi:char-array-to-pointer name) 256))
(format t "Hostname: ~S" (ffi:convert-from-foreign-string name))
(error "gethostname() failed."))
(ffi:with-foreign-object (name '(:array :unsigned-char 256))
(if (zerop (c-gethostname (ffi:char-array-to-pointer name) 256))
(format t "Hostname: ~S" (ffi:convert-from-foreign-string name))
(error "gethostname() failed.")))
@end lisp
@node Higher level interfaces

34
src/doc/new-doc/extensions/ffi_sffi.txi
View file

@ -29,13 +29,14 @@ statements. All statements from @var{arguments} are grouped at the
beginning of the produced header file.
@code{FFI:CLINES} is a special form that can only be used in lisp
compiled files as a toplevel form. Other uses will lead to an error
being signaled, either at the compilation time or when loading the file.
compiled files as a toplevel form. Other uses will lead to an error
being signaled, either at the compilation time or when loading the
file.
@subsubheading Examples
@exindex @code{ffi:clines} adding c toplevel declarations
In this example the FFI:CLINES statement is required to get access to
the C function @code{cos}:
In this example the @code{FFI:CLINES} statement is required to get
access to the C function @code{cos}:
@lisp
(ffi:clines "#include <math.h>")
(defun cos (x)
@ -60,10 +61,10 @@ Valid FFI type or (VALUES ffi-type*).
String containing valid C code plus some valid escape forms.
@item one-liner
Boolean indicating, if the expression is a valid R-value. Defaults to
NIL.
@code{NIL}.
@item side-effects
Boolean indicating, if the expression causes side effects. Defaults to
T.
@code{T}.
@item returns
One or more lisp values.
@end table
@ -233,9 +234,10 @@ Defined function name.
@end table
@subsubheading Description
The compiler defines a Lisp function named by NAME whose body consists
of the C code of the string C-EXPRESSION. In the C-EXPRESSION one can
reference the arguments of the function as @code{#0}, @code{#1}, etc.
The compiler defines a Lisp function named by @var{NAME} whose body
consists of the C code of the string @var{C-EXPRESSION}. In the
@var{C-EXPRESSION} one can reference the arguments of the function as
@code{#0}, @code{#1}, etc.
The interpreter ignores this form.
@end defmac
@ -248,14 +250,13 @@ The interpreter ignores this form.
Lisp name for the function.
@item arg-types
Argument types of the C function (one of the symbols OBJECT, INT, CHAR,
CHAR*, FLOAT, DOUBLE).
Argument types of the C function.
@item c-name
If @var{C-NAME} is a list, then C function result type is declared as
@code{(CAR C-NAME)} and its name is @code{(STRING (CDR C-NAME))}.
If it's an atom, then the result type is @code{OBJECT}, and function
If it's an atom, then the result type is @code{:OBJECT}, and function
name is @code{(STRING C-NAME)}.
@item returns
@ -263,12 +264,11 @@ Lisp function @code{NAME}.
@end table
@subsubheading Description
The compiler defines a Lisp function named by NAME whose body consists
of a calling sequence to the C language function named by FUNCTION-NAME.
The compiler defines a Lisp function named by @var{NAME} whose body
consists of a calling sequence to the C language function named by
@var{C-NAME}.
The interpreter ignores this form. ARG-TYPES are argument types of the
C function and RESULT-TYPE is its return type. Symbols OBJECT, INT,
CHAR, CHAR*, FLOAT, DOUBLE are allowed for these types.
The interpreter ignores this form.
@end defmac
@c XXX> note sure if this works

80
src/doc/new-doc/extensions/ffi_uffi.txi
View file

@ -75,7 +75,7 @@ Integer types with guaranteed bitness.
Floating point numerals (32-bit and 64-bit).
@item :long-double
Floating point numeral (usually 80-bit, at least 64-bit, exact
bitness is compiler/architecture/platform dependant).
bitness is compiler/architecture/platform dependent).
@item :cstring
A @code{NULL} terminated string used for passing and returning
characters strings with a C function.
@ -121,7 +121,7 @@ compile-time and optionally exports the symbol from the package.
@end lisp
@subsubheading Side Effects
Creats a new special variable.
Creates a new special variable.
@end defmac
@ -146,9 +146,9 @@ Defines a new foreign type
@subsubheading Examples
@exindex @code{ffi:def-foreign-type} examples
@lisp
(def-foreign-type my-generic-pointer :pointer-void)
(def-foreign-type a-double-float :double-float)
(def-foreign-type char-ptr (* :char))
(ffi:def-foreign-type my-generic-pointer :pointer-void)
(ffi:def-foreign-type a-double-float :double-float)
(ffi:def-foreign-type char-ptr (* :char))
@end lisp
@subsubheading Side effects
@ -205,7 +205,7 @@ Defines a C enumeration
@item name
A symbol that names the enumeration.
@item fields
A list of field defintions. Each definition can be a symbol or a list of
A list of field definitions. Each definition can be a symbol or a list of
two elements. Symbols get assigned a value of the current counter which
starts at 0 and increments by 1 for each subsequent symbol. It the field
definition is a list, the first position is the symbol and the second
@ -220,7 +220,7 @@ Declares a C enumeration. It generates constants with integer values for
the elements of the enumeration. The symbols for the these constant
values are created by the concatenation of the enumeration name,
separator-string, and field symbol. Also creates a foreign type with the
name name of type :int.
name name of type @code{:int}.
@subsubheading Examples
@exindex @code{ffi:def-enum} sample enumerations
@ -248,7 +248,7 @@ Defines a C structure
@item name
A symbol that names the structure.
@item fields
A variable number of field defintions. Each definition is a list
A variable number of field definitions. Each definition is a list
consisting of a symbol naming the field followed by its foreign type.
@end table
@ -295,8 +295,8 @@ used with @code{SETF}-able.
@subsubheading Examples
@exindex @code{ffi:get-slot-value} manipulating a struct field
@lisp
(get-slot-value foo-ptr 'foo-structure 'field-name)
(setf (get-slot-value foo-ptr 'foo-structure 'field-name) 10)
(ffi:get-slot-value foo-ptr 'foo-structure 'field-name)
(setf (ffi:get-slot-value foo-ptr 'foo-structure 'field-name) 10)
@end lisp
@end defun
@ -325,7 +325,7 @@ is a pointer type.
@subsubheading Examples
@exindex @code{ffi:get-slot-value} usage
@lisp
(get-slot-pointer foo-ptr 'foo-structure 'my-char-ptr)
(ffi:get-slot-pointer foo-ptr 'foo-structure 'my-char-ptr)
@end lisp
@end defun
@ -349,7 +349,7 @@ Defines a type that is a pointer to an array of @var{type}.
@subsubheading Examples
@exindex @code{ffi:def-array-pointer} usage
@lisp
(def-array-pointer byte-array-pointer :unsigned-char)
(ffi:def-array-pointer byte-array-pointer :unsigned-char)
@end lisp
@subsubheading Side effects
@ -361,7 +361,7 @@ Defines a new foreign type.
@lspindex ffi:deref-array
@defun ffi:deref-array array type position
Deference an array
Dereference an array
@table @var
@item array
@ -557,7 +557,7 @@ Returns the address as an integer of a pointer.
@lspindex ffi:deref-pointer
@defun ffi:deref-pointer ptr ftype
Deferences a pointer
Dereferences a pointer
@table @var
@item ptr
@ -725,7 +725,7 @@ Defines a symbol macro to access a variable in foreign code
@table @var
@item name
A string or list specificying the symbol macro's name. If it is a
A string or list specifying the symbol macro's name. If it is a
string, that names the foreign variable. A Lisp name is created by
translating @code{#\_} to @code{#\-} and by converting to upper-case in
case-insensitive Lisp implementations.
@ -790,13 +790,13 @@ Lisp code defining C structure, function and a variable:
@subsubheading Overview
@cindex @code{cstring} and @code{foreign string} differences
UFFI has functions to two types of C-compatible strings: @code{cstring}
and foreign strings. @code{cstrings} are used only as parameters to and
from functions. In some implementations a @code{cstring} is not a
foreign type but rather the Lisp string itself. On other platforms a
cstring is a newly allocated foreign vector for storing characters. The
following is an example of using cstrings to both send and return a
value.
UFFI has functions to two types of C-compatible strings:
@code{cstring} and foreign strings. @code{cstring}s are used only as
parameters to and from functions. In some implementations a
@code{cstring} is not a foreign type but rather the Lisp string
itself. On other platforms a cstring is a newly allocated foreign
vector for storing characters. The following is an example of using
@code{cstring}s to both send and return a value.
@exindex @code{cstring} used to send and return a value
@lisp
@ -885,8 +885,8 @@ Lisp string
@end table
@subsubheading Description
Converts a Lisp string to a cstring. The cstring should be freed with
free-cstring.
Converts a Lisp string to a @code{cstring}. The @code{cstring} should
be freed with @code{free-cstring}.
@subsubheading Side Effects
This function allocates memory.
@end defmac
@ -900,8 +900,8 @@ Free memory used by @var{cstring}
@code{cstring} to be freed.
@end table
@subsubheading Description
Frees any memory possibly allocated by convert-to-cstring. On ECL, a
cstring is just the Lisp string itself.
Frees any memory possibly allocated by @code{convert-to-cstring}. On ECL, a
@code{cstring} is just the Lisp string itself.
@end defmac
@ -964,13 +964,13 @@ A foreign string.
The length of the foreign string to convert. The default is the length
of the string until a NULL character is reached.
@item null-terminated-p
A boolean flag with a default value of T When true, the string is
A boolean flag with a default value of @code{T}. When true, the string is
converted until the first NULL character is reached.
@item returns
A Lisp string.
@end table
@subsubheading Description
Returns a Lisp string from a foreign string. Can translated ASCII and
Returns a Lisp string from a foreign string. Can translate ASCII and
binary strings.
@end defmac
@ -985,7 +985,7 @@ A foreign string.
@end table
@subsubheading Description
Converts a Lisp string to a foreign string. Memory should be freed with
free-foreign-object.
@code{free-foreign-object}.
@end defmac
@lspindex ffi:allocate-foreign-string
@ -995,14 +995,14 @@ Allocates space for a foreign string
@item size
The size of the space to be allocated in bytes.
@item unsigned
A boolean flag with a default value of T. When true, marks the pointer
as an :unsigned-char.
A boolean flag with a default value of @code{T}. When true, marks the pointer
as an @code{:unsigned-char}.
@item returns
A foreign string which has undefined contents.
@end table
@subsubheading Description
Allocates space for a foreign string. Memory should be freed with
free-foreign-object.
@code{free-foreign-object}.
@end defmac
@lspindex ffi:with-foreign-string
@ -1053,7 +1053,7 @@ works similar to @code{LET*}. Based on @code{with-foreign-string}.
@defmac ffi:def-function name args &key module (returning :void) (call :cdecl)
@table @var
@item name
A string or list specificying the function name. If it is a string, that
A string or list specifying the function name. If it is a string, that
names the foreign function. A Lisp name is created by translating
@code{#\_} to @code{#\-} and by converting to upper-case in
case-insensitive Lisp implementations. If it is a list, the first item
@ -1082,10 +1082,10 @@ Declares a foreign function.
@subsubheading Examples
@exindex @code{ffi:def-function}
@lisp
(def-function "gethostname"
(ffi:def-function "gethostname"
((name (* :unsigned-char))
(len :int))
:returning) :int)
:returning :int)
@end lisp
@end defmac
@ -1111,7 +1111,7 @@ and DFFI are used, but SFFI only during the compilation.
@item returns
A generalized boolean @emph{true} if the library was able to be loaded
successfully or if the library has been previously loaded, otherwise
NIL.
@code{NIL}.
@end table
@subsubheading Description
Loads a foreign library. Ensures that a library is only loaded once
@ -1142,11 +1142,11 @@ A string or list of strings containing the drive letters for the library
file.
@item types
A string or list of strings containing the file type of the library
file. Default is NIL. If NIL, will use a default type based on the
currently running implementation.
file. Default is @code{NIL}. If @code{NIL}, will use a default type
based on the currently running implementation.
@item returns
A path containing the path to the @emph{first} file found, or NIL if the
library file was not found.
A path containing the path to the @emph{first} file found, or
@code{NIL} if the library file was not found.
@end table
@subsubheading Description
Finds a foreign library by searching through a number of possible

24
src/lsp/ffi.lsp
View file

@ -457,7 +457,7 @@ See: WITH-CSTRING. Works similar to LET*."
foreign-string &key length (null-terminated-p t)
Returns a Lisp string from a foreign string FOREIGN-STRING. Can
translated ASCII and binary strings."
translate ASCII and binary strings."
(cond ((and (not length) null-terminated-p)
(setf length (foreign-string-length foreign-string)))
((not (integerp length))
@ -504,11 +504,11 @@ FREE-FOREIGN-OBJECT. Initial contents of the string are undefined."
Binds FOREIGN-STRING to a foreign string created from conversion of a
STRING and evaluated the BODY. Automatically frees the FOREIGN-STRING."
(let ((result (gensym)))
`(let* ((,foreign-string (convert-to-foreign-string ,lisp-string))
(,result (progn ,@body)))
(free-foreign-object ,foreign-string)
,result)))
`(let* ((,foreign-string (convert-to-foreign-string ,lisp-string)))
(mp:without-interrupts
(unwind-protect
(mp:with-restored-interrupts ,@body)
(free-foreign-object ,foreign-string)))))
(defmacro with-foreign-strings (bindings &rest body)
"Syntax: (with-foreign-strings ((foreign-string string)*) &body body)
@ -530,9 +530,10 @@ See: WITH-FOREIGN-STRING. Works similar to LET*."
Wraps the allocation, binding and destruction of a foreign object
around a body of code"
`(let ((,var (allocate-foreign-object ,type)))
(unwind-protect
(progn ,@body)
(free-foreign-object ,var))))
(mp:without-interrupts
(unwind-protect
(mp:with-restored-interrupts ,@body)
(free-foreign-object ,var)))))
(defmacro with-foreign-objects (bindings &rest body)
(if bindings
@ -840,9 +841,8 @@ The compiler defines a Lisp function named by NAME whose body consists
of a calling sequence to the C language function named by
FUNCTION-NAME.
The interpreter ignores this form. ARG-TYPES are argument types of
the C function and RESULT-TYPE is its return type. Symbols OBJECT,
INT, CHAR, CHAR*, FLOAT, DOUBLE are allowed for these types."
The interpreter ignores this form. ARG-TYPES are argument types of
the C function and RESULT-TYPE is its return type."
(let ((output-type :object)
(args (mapcar #'(lambda (x) (gensym)) arg-types)))
(if (consp c-name)

15
src/lsp/mp.lsp
View file

@ -151,10 +151,11 @@ Valid values of argument OP are :READ or :WRITE
'mp:get-rwlock-read
'mp:get-rwlock-write)
,s-lock t)
(unwind-protect
(progn
,@body)
(,(if (eq :read op)
'mp:giveup-rwlock-read
'mp:giveup-rwlock-write)
,s-lock)))))
(mp:without-interrupts
(unwind-protect
(mp:with-restored-interrupts
,@body)
(,(if (eq :read op)
'mp:giveup-rwlock-read
'mp:giveup-rwlock-write)
,s-lock))))))