Mercurial > hg > xemacs-beta
view src/sysdll.c @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 19 Sep 2009 22:53:13 +0100 |
parents | 5989b9bbb612 |
children | b3ea9c582280 |
line wrap: on
line source
/* sysdll.c --- system dependent support for dynamic linked libraries Copyright (C) 1998 Free Software Foundation, Inc. Author: William Perry <wmperry@aventail.com> This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <stdlib.h> #include "lisp.h" #include "sysdll.h" #ifdef DLSYM_NEEDS_UNDERSCORE #define MAYBE_PREPEND_UNDERSCORE(n) do { \ CIbyte *buf = alloca_array (CIbyte, strlen (n) + 2); \ *buf = '_'; \ strcpy (buf + 1, n); \ n = buf; \ } while (0) #else #define MAYBE_PREPEND_UNDERSCORE(n) #endif /* This whole file is conditional upon HAVE_SHLIB */ #ifdef HAVE_SHLIB /* Thankfully, most systems follow the ELFish dlopen() method. */ #if defined(HAVE_DLOPEN) #include <dlfcn.h> #ifndef RTLD_LAZY # ifdef DL_LAZY # define RTLD_LAZY DL_LAZY # else # define RTLD_LAZY 1 # endif #endif /* RTLD_LAZY isn't defined under FreeBSD - ick */ #ifndef RTLD_NOW # ifdef DL_NOW # define RTLD_NOW DL_NOW # else # define RTLD_NOW 2 # endif #endif dll_handle dll_open (Lisp_Object fname) { Extbyte *soname; if (NILP (fname)) { soname = NULL; } else { LISP_STRING_TO_EXTERNAL (fname, soname, Qdll_filename_encoding); } return (dll_handle) dlopen (soname, RTLD_NOW); } int dll_close (dll_handle h) { return dlclose ((void *) h); } dll_func dll_function (dll_handle h, const CIbyte *n) { MAYBE_PREPEND_UNDERSCORE (n); return (dll_func) dlsym ((void *) h, n); } dll_var dll_variable (dll_handle h, const CIbyte *n) { MAYBE_PREPEND_UNDERSCORE (n); return (dll_var)dlsym ((void *)h, n); } Lisp_Object dll_error () { const Extbyte *msg; #if defined(HAVE_DLERROR) || defined(dlerror) msg = (const Extbyte *) dlerror (); #elif defined(HAVE__DLERROR) msg = (const Extbyte *) _dlerror(); #else msg = (const Extbyte *) "Shared library error"; #endif return build_ext_string (msg, Qnative); } #elif defined(HAVE_SHL_LOAD) /* This is the HP/UX version */ #include <dl.h> dll_handle dll_open (Lisp_Object fname) { Extbyte *soname; if (NILP (fname)) { soname = NULL; } else { LISP_STRING_TO_EXTERNAL (fname, soname, Qdll_filename_encoding); } return (dll_handle) shl_load (soname, BIND_DEFERRED, 0L); } int dll_close (dll_handle h) { return shl_unload ((shl_t) h); } dll_func dll_function (dll_handle h, const CIbyte *n) { long handle = 0L; if (shl_findsym ((shl_t *) &h, n, TYPE_PROCEDURE, &handle)) return NULL; return (dll_func) handle; } dll_var dll_variable (dll_handle h, const CIbyte *n) { long handle = 0L; if (shl_findsym ((shl_t *) &h, n, TYPE_DATA, &handle)) return NULL; return (dll_var) handle; } Lisp_Object dll_error () { /* #### WTF?! Shouldn't this at least attempt to get strerror or something? --hniksic */ return build_string ("Generic shared library error", Qnative); } #elif defined (WIN32_NATIVE) || defined (CYGWIN) #include "syswindows.h" #include "sysfile.h" dll_handle dll_open (Lisp_Object fname) { Extbyte *soname; if (NILP (fname)) { soname = NULL; } else { LOCAL_FILE_FORMAT_TO_TSTR (fname, soname); } return (dll_handle) qxeLoadLibrary (soname); } int dll_close (dll_handle h) { return FreeLibrary ((HMODULE) h); } dll_func dll_function (dll_handle h, const CIbyte *n) { return (dll_func) GetProcAddress ((HINSTANCE) h, n); } dll_func dll_variable (dll_handle h, const CIbyte *n) { return (dll_func) GetProcAddress ((HINSTANCE) h, n); } Lisp_Object dll_error () { CIbyte err[32]; snprintf (err, 32, "Windows DLL Error %lu", GetLastError ()); return build_string (err); } #elif defined(HAVE_DYLD) /* This section supports MacOSX dynamic libraries. Dynamically loadable libraries must be compiled as bundles, not dynamiclibs. */ #include <mach-o/dyld.h> dll_handle dll_open (Lisp_Object fname) { Extbyte *soname; NSObjectFileImage file; NSModule out; NSObjectFileImageReturnCode ret; /* * MacOS X dll support is for bundles, not the current executable, so return * NULL is this case. However, dll_function() uses a special hack where a * NULL handle can be used to find executable symbols. This satisfies the * needs of ui-gtk.c but is not a general solution. */ if (NILP (fname)) { return NULL; } else { LISP_STRING_TO_EXTERNAL (fname, soname, Qdll_filename_encoding); } ret = NSCreateObjectFileImageFromFile(soname, &file); if (ret != NSObjectFileImageSuccess) { return NULL; } out = NSLinkModule(file, soname, NSLINKMODULE_OPTION_BINDNOW | NSLINKMODULE_OPTION_PRIVATE | NSLINKMODULE_OPTION_RETURN_ON_ERROR); return (dll_handle)out; } int dll_close (dll_handle h) { return NSUnLinkModule((NSModule)h, NSUNLINKMODULE_OPTION_NONE); } /* Given an address, return the mach_header for the image containing it * or zero if the given address is not contained in any loaded images. * * Note: image_for_address(), my_find_image() and search_linked_libs() are * based on code from the dlcompat library * (http://www.opendarwin.org/projects/dlcompat). */ static const struct mach_header* image_for_address(void *address) { unsigned long i; unsigned long count = _dyld_image_count(); const struct mach_header *mh = 0; for (i = 0; i < count; i++) { unsigned long addr = (unsigned long)address - _dyld_get_image_vmaddr_slide(i); mh = _dyld_get_image_header(i); if (mh) { struct load_command *lc = (struct load_command *)((char *)mh + sizeof(struct mach_header)); unsigned long j; for (j = 0; j < mh->ncmds; j++, lc = (struct load_command *)((char *)lc + lc->cmdsize)) { if (LC_SEGMENT == lc->cmd && addr >= ((struct segment_command *)lc)->vmaddr && addr < ((struct segment_command *)lc)->vmaddr + ((struct segment_command *)lc)->vmsize) { goto image_found; } } } mh = 0; } image_found: return mh; } static const struct mach_header* my_find_image(const char *name) { const struct mach_header *mh = (struct mach_header *) NSAddImage(name, NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED | NSADDIMAGE_OPTION_RETURN_ON_ERROR); if (!mh) { int count = _dyld_image_count(); int j; for (j = 0; j < count; j++) { const char *id = _dyld_get_image_name(j); if (!strcmp(id, name)) { mh = _dyld_get_image_header(j); break; } } } return mh; } /* * dyld adds libraries by first adding the directly dependant libraries in * link order, and then adding the dependencies for those libraries, so we * should do the same... but we don't bother adding the extra dependencies, if * the symbols are neither in the loaded image nor any of it's direct * dependencies, then it probably isn't there. */ static NSSymbol search_linked_libs(const struct mach_header * mh, const char *symbol) { unsigned long n; NSSymbol nssym = 0; struct load_command *lc = (struct load_command *)((char *)mh + sizeof(struct mach_header)); for (n = 0; n < mh->ncmds; n++, lc = (struct load_command *)((char *)lc + lc->cmdsize)) { if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd)) { struct mach_header *wh; if ((wh = (struct mach_header *) my_find_image((char *)(((struct dylib_command *)lc)->dylib.name.offset + (char *)lc)))) { if (NSIsSymbolNameDefinedInImage(wh, symbol)) { nssym = NSLookupSymbolInImage(wh, symbol, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR); break; } } } } return nssym; } dll_func dll_function (dll_handle h, const CIbyte *n) { NSSymbol sym = 0; MAYBE_PREPEND_UNDERSCORE (n); /* NULL means the program image and shared libraries, not bundles. */ if (h == NULL) { /* NOTE: This assumes that this function is included in the main program and not in a shared library. */ const struct mach_header* my_mh = image_for_address((void*) &dll_function); if (NSIsSymbolNameDefinedInImage(my_mh, n)) { sym = NSLookupSymbolInImage(my_mh, n, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR); } if (!sym) { sym = search_linked_libs(my_mh, n); } } else { sym = NSLookupSymbolInModule((NSModule)h, n); } if (sym == 0) return 0; return (dll_func)NSAddressOfSymbol(sym); } dll_var dll_variable (dll_handle h, const CIbyte *n) { NSSymbol sym; MAYBE_PREPEND_UNDERSCORE (n); sym = NSLookupSymbolInModule((NSModule)h, n); if (sym == 0) return 0; return (dll_var)NSAddressOfSymbol(sym); } Lisp_Object dll_error () { NSLinkEditErrors c; int errorNumber; const CIbyte *fileNameWithError, *errorString; NSLinkEditError(&c, &errorNumber, &fileNameWithError, &errorString); return build_ext_string (errorString, Qnative); } #elif HAVE_LTDL /* Libtool's libltdl */ #include <ltdl.h> dll_handle dll_open (Lisp_Object fname) { Extbyte *soname; if (NILP (fname)) { soname = NULL; } else { LISP_STRING_TO_EXTERNAL (fname, soname, Qdll_filename_encoding); } return (dll_handle) lt_dlopen (soname); } int dll_close (dll_handle h) { return lt_dlclose ((lt_dlhandle) h); } dll_func dll_function (dll_handle h, const CIbyte *n) { MAYBE_PREPEND_UNDERSCORE (n); return (dll_func) lt_dlsym ((lt_dlhandle) h, n); } dll_var dll_variable (dll_handle h, const CIbyte *n) { MAYBE_PREPEND_UNDERSCORE (n); return (dll_var) lt_dlsym ((lt_dlhandle) h, n); } Lisp_Object dll_error () { return build_ext_string (lt_dlerror (), Qnative); } #else /* Catchall if we don't know about this system's method of dynamic loading */ dll_handle dll_open (Lisp_Object fname) { return NULL; } int dll_close (dll_handle h) { return 0; } dll_func dll_function (dll_handle h, const CIbyte *n) { return NULL; } dll_func dll_variable (dll_handle h, const CIbyte *n) { return NULL; } Lisp_Object dll_error () { return build_string ("Shared libraries not implemented on this system"); } #endif /* System conditionals */ #endif /* HAVE_SHLIB */