projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce random casting in looks_like_valid_lisp_pointer_p().
[sbcl.git]
/
src
/
runtime
/
bsd-os.c
diff --git
a/src/runtime/bsd-os.c
b/src/runtime/bsd-os.c
index
df486eb
..
3f54aef
100644
(file)
--- a/
src/runtime/bsd-os.c
+++ b/
src/runtime/bsd-os.c
@@
-82,7
+82,7
@@
static void openbsd_init();
void
os_init(char *argv[], char *envp[])
{
void
os_init(char *argv[], char *envp[])
{
- os_vm_page_size = getpagesize();
+ os_vm_page_size = BACKEND_PAGE_BYTES;
#ifdef __NetBSD__
netbsd_init();
#ifdef __NetBSD__
netbsd_init();
@@
-198,19
+198,9
@@
is_valid_lisp_addr(os_vm_address_t addr)
*/
void
*/
void
-memory_fault_handler(int signal, siginfo_t *siginfo, os_context_t *context
-#if defined(LISP_FEATURE_FREEBSD) && defined(LISP_FEATURE_X86_64)
-/* FreeBSD/amd64 stores fault address only in undocumented 4th arg. */
- ,void *fault_addr
-#endif
- )
+memory_fault_handler(int signal, siginfo_t *siginfo, os_context_t *context)
{
{
-#if defined(LISP_FEATURE_FREEBSD) && defined(LISP_FEATURE_X86_64)
- /* KLUDGE: Store fault address into si_addr for compatibilities. */
- siginfo->si_addr = fault_addr;
-#else
void *fault_addr = arch_get_bad_addr(signal, siginfo, context);
void *fault_addr = arch_get_bad_addr(signal, siginfo, context);
-#endif
#if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in memory_fault_handler\n",
#if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in memory_fault_handler\n",
@@
-393,7
+383,8
@@
static void freebsd_init()
#endif /* LISP_FEATURE_X86 */
}
#endif /* LISP_FEATURE_X86 */
}
-#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
+#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_FUTEX) \
+ && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
int
futex_wait(int *lock_word, long oldval, long sec, unsigned long usec)
{
int
futex_wait(int *lock_word, long oldval, long sec, unsigned long usec)
{
@@
-437,7
+428,7
@@
futex_wake(int *lock_word, int n)
#endif
char *
#endif
char *
-os_get_runtime_executable_path()
+os_get_runtime_executable_path(int external)
{
char path[PATH_MAX + 1];
{
char path[PATH_MAX + 1];
@@
-465,20
+456,16
@@
os_get_runtime_executable_path()
}
#elif defined(LISP_FEATURE_NETBSD) || defined(LISP_FEATURE_OPENBSD)
char *
}
#elif defined(LISP_FEATURE_NETBSD) || defined(LISP_FEATURE_OPENBSD)
char *
-os_get_runtime_executable_path()
+os_get_runtime_executable_path(int external)
{
struct stat sb;
{
struct stat sb;
- char *path = strdup("/proc/curproc/file");
- if (path && ((stat(path, &sb)) == 0))
- return path;
- else {
- fprintf(stderr, "Couldn't stat /proc/curproc/file; is /proc mounted?\n");
- return NULL;
- }
+ if (!external && stat("/proc/curproc/file", &sb) == 0)
+ return copied_string("/proc/curproc/file");
+ return NULL;
}
#else /* Not DARWIN or FREEBSD or NETBSD or OPENBSD */
char *
}
#else /* Not DARWIN or FREEBSD or NETBSD or OPENBSD */
char *
-os_get_runtime_executable_path()
+os_get_runtime_executable_path(int external)
{
return NULL;
}
{
return NULL;
}