diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang indenting

Browse Source
This commit is contained in:
vscosta 2016-04-05 02:22:04 +01:00
parent d4a9f97cdd
commit 07f105dd80
1 changed files with 76 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
C/load_dl.c
View File

@ -14,38 +14,33 @@
*************************************************************************/ *************************************************************************/
#include "Yap.h" #include "Yap.h"
#include "Yatom.h"
#include "YapHeap.h" #include "YapHeap.h"
#include "Yatom.h"
#include "yapio.h" #include "yapio.h"
#include "Foreign.h" #include "Foreign.h"
#if LOAD_DL #if LOAD_DL
// use SWI-Prolog code if all else fails // use SWI-Prolog code if all else fails
char * char *findExecutable(const char *av0, char *buffer);
findExecutable(const char *av0, char *buffer);
#include <stdlib.h>
#include <unistd.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#if defined(__APPLE__) #if defined(__APPLE__)
#include <mach-o/dyld.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <mach-o/dyld.h>
#endif #endif
typedef void (*prismf)(void); typedef void (*prismf)(void);
/* only works for dlls */ /* only works for dlls */
int int Yap_CallFunctionByName(const char *thing_string);
Yap_CallFunctionByName(const char *thing_string);
int int Yap_CallFunctionByName(const char *thing_string) {
Yap_CallFunctionByName(const char *thing_string)
{
void *handle = dlopen(NULL, RTLD_LAZY void *handle = dlopen(NULL, RTLD_LAZY
#ifndef __CYGWIN__ #ifndef __CYGWIN__
#ifdef RTLD_NOLOAD #ifdef RTLD_NOLOAD
@ -56,7 +51,8 @@ Yap_CallFunctionByName(const char *thing_string)
// you could do RTLD_NOW as well. shouldn't matter // you could do RTLD_NOW as well. shouldn't matter
if (!handle) { if (!handle) {
CACHE_REGS CACHE_REGS
Yap_Error(SYSTEM_ERROR_INTERNAL, ARG1, "Dynamic linking on main module : %s\n", dlerror()); Yap_Error(SYSTEM_ERROR_INTERNAL, ARG1,
"Dynamic linking on main module : %s\n", dlerror());
} }
prismf *addr = (prismf *)dlsym(handle, thing_string); prismf *addr = (prismf *)dlsym(handle, thing_string);
if (addr) if (addr)
@ -69,9 +65,7 @@ Yap_CallFunctionByName(const char *thing_string)
* YAP_FindExecutable(argv[0]) should be called on yap initialization to * YAP_FindExecutable(argv[0]) should be called on yap initialization to
* locate the executable of Yap * locate the executable of Yap
*/ */
char * char *Yap_FindExecutable(void) {
Yap_FindExecutable(void)
{
#if HAVE_GETEXECNAME #if HAVE_GETEXECNAME
// Solaris // Solaris
return getexecname(); return getexecname();
@ -119,18 +113,14 @@ Yap_FindExecutable(void)
sysctl(mib, 4, buf, &cb, NULL, 0); sysctl(mib, 4, buf, &cb, NULL, 0);
// follow through to standard method // follow through to standard method
#endif #endif
return return NULL;
NULL;
} }
void * void *Yap_LoadForeignFile(char *file, int flags) {
Yap_LoadForeignFile(char *file, int flags)
{
CACHE_REGS CACHE_REGS
int dlflag; int dlflag;
void *out; void *out;
if (flags & EAGER_LOADING) if (flags & EAGER_LOADING)
dlflag = RTLD_NOW; dlflag = RTLD_NOW;
else else
@ -149,9 +139,9 @@ Yap_LoadForeignFile(char *file, int flags)
} }
out = (void *)dlopen(LOCAL_FileNameBuf, flags); out = (void *)dlopen(LOCAL_FileNameBuf, flags);
if (out == NULL) { if (out == NULL) {
char *m_os = dlerror(); const char *m_os = dlerror();
if (m_os) { if (m_os) {
LOCAL_ErrorMessage = dlerror(); strncpy(LOCAL_ErrorSay, m_os, MAX_ERROR_MSG_SIZE - 1);
} else { } else {
LOCAL_ErrorMessage = "dlopen failed"; LOCAL_ErrorMessage = "dlopen failed";
} }
@ -159,9 +149,7 @@ Yap_LoadForeignFile(char *file, int flags)
return out; return out;
} }
int int Yap_CallForeignFile(void *handle, char *f) {
Yap_CallForeignFile(void *handle, char *f)
{
YapInitProc proc = (YapInitProc)dlsym(handle, f); YapInitProc proc = (YapInitProc)dlsym(handle, f);
if (!proc) { if (!proc) {
/* Yap_Error(SYSTEM_ERROR_INTERNAL, ARG1, "dlsym error %s\n", dlerror());*/ /* Yap_Error(SYSTEM_ERROR_INTERNAL, ARG1, "dlsym error %s\n", dlerror());*/
@ -171,9 +159,7 @@ Yap_CallForeignFile(void *handle, char *f)
return TRUE; return TRUE;
} }
int int Yap_CloseForeignFile(void *handle) {
Yap_CloseForeignFile(void *handle)
{
if (dlclose(handle) < 0) { if (dlclose(handle) < 0) {
CACHE_REGS CACHE_REGS
Yap_Error(SYSTEM_ERROR_INTERNAL, ARG1, "dlclose error %s\n", dlerror()); Yap_Error(SYSTEM_ERROR_INTERNAL, ARG1, "dlclose error %s\n", dlerror());
@ -182,27 +168,27 @@ Yap_CloseForeignFile(void *handle)
return 0; return 0;
} }
/* /*
* LoadForeign(ofiles,libs,proc_name,init_proc) dynamically loads foreign * LoadForeign(ofiles,libs,proc_name,init_proc) dynamically loads foreign
* code files and libraries and locates an initialization routine * code files and libraries and locates an initialization routine
*/ */
static Int static Int LoadForeign(StringList ofiles, StringList libs, char *proc_name,
LoadForeign(StringList ofiles, StringList libs, YapInitProc *init_proc) {
char *proc_name, YapInitProc *init_proc)
{
CACHE_REGS CACHE_REGS
while (libs) { while (libs) {
if (!Yap_locateFile((char *)AtomName(libs->name), LOCAL_FileNameBuf, true)) { if (!Yap_locateFile((char *)AtomName(libs->name), LOCAL_FileNameBuf,
true)) {
/* use LD_LIBRARY_PATH */ /* use LD_LIBRARY_PATH */
strncpy(LOCAL_FileNameBuf, (char *)AtomName(libs->name), YAP_FILENAME_MAX); strncpy(LOCAL_FileNameBuf, (char *)AtomName(libs->name),
YAP_FILENAME_MAX);
} }
#ifdef __osf__ #ifdef __osf__
if ((libs->handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY)) == NULL) if ((libs->handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY)) == NULL)
#else #else
if((libs->handle=dlopen(LOCAL_FileNameBuf,RTLD_LAZY|RTLD_GLOBAL)) == NULL) if ((libs->handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY | RTLD_GLOBAL)) ==
NULL)
#endif #endif
{ {
strcpy(LOCAL_ErrorSay, dlerror()); strcpy(LOCAL_ErrorSay, dlerror());
@ -218,8 +204,10 @@ LoadForeign(StringList ofiles, StringList libs,
other routines */ other routines */
/* dlopen wants to follow the LD_CONFIG_PATH */ /* dlopen wants to follow the LD_CONFIG_PATH */
if (!Yap_locateFile((char *)AtomName(ofiles->name), LOCAL_FileNameBuf, TRUE)) { if (!Yap_locateFile((char *)AtomName(ofiles->name), LOCAL_FileNameBuf,
strcpy(LOCAL_ErrorSay, "%% Trying to open unexisting file in LoadForeign"); TRUE)) {
strcpy(LOCAL_ErrorSay,
"%% Trying to open unexisting file in LoadForeign");
return LOAD_FAILLED; return LOAD_FAILLED;
} }
#ifdef __osf__ #ifdef __osf__
@ -228,7 +216,8 @@ LoadForeign(StringList ofiles, StringList libs,
if ((handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY | RTLD_GLOBAL)) == 0) if ((handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY | RTLD_GLOBAL)) == 0)
#endif #endif
{ {
fprintf(stderr,"dlopen of image %s failed: %s\n", LOCAL_FileNameBuf, dlerror()); fprintf(stderr, "dlopen of image %s failed: %s\n", LOCAL_FileNameBuf,
dlerror());
/* strcpy(LOCAL_ErrorSay,dlerror());*/ /* strcpy(LOCAL_ErrorSay,dlerror());*/
return LOAD_FAILLED; return LOAD_FAILLED;
} }
@ -249,16 +238,12 @@ LoadForeign(StringList ofiles, StringList libs,
return LOAD_SUCCEEDED; return LOAD_SUCCEEDED;
} }
Int Int Yap_LoadForeign(StringList ofiles, StringList libs, char *proc_name,
Yap_LoadForeign(StringList ofiles, StringList libs, YapInitProc *init_proc) {
char *proc_name, YapInitProc *init_proc)
{
return LoadForeign(ofiles, libs, proc_name, init_proc); return LoadForeign(ofiles, libs, proc_name, init_proc);
} }
void void Yap_ShutdownLoadForeign(void) {
Yap_ShutdownLoadForeign(void)
{
ForeignObj *f_code; ForeignObj *f_code;
f_code = ForeignCodeLoaded; f_code = ForeignCodeLoaded;
@ -292,10 +277,8 @@ Yap_ShutdownLoadForeign(void)
ForeignCodeLoaded = NULL; ForeignCodeLoaded = NULL;
} }
Int Int Yap_ReLoadForeign(StringList ofiles, StringList libs, char *proc_name,
Yap_ReLoadForeign(StringList ofiles, StringList libs, YapInitProc *init_proc) {
char *proc_name, YapInitProc *init_proc)
{
return (LoadForeign(ofiles, libs, proc_name, init_proc)); return (LoadForeign(ofiles, libs, proc_name, init_proc));
} }
@ -303,19 +286,10 @@ Yap_ReLoadForeign(StringList ofiles, StringList libs,
#if SIMICS #if SIMICS
void dlopen(void) void dlopen(void) {}
{
}
void dlclose(void) void dlclose(void) {}
{
}
void dlsym(void) void dlsym(void) {}
{
}
#endif #endif