Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
cmucl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Carl Shapiro
cmucl
Commits
d31f5d1a
Commit
d31f5d1a
authored
22 years ago
by
moore
Browse files
Options
Downloads
Patches
Plain Diff
Fix foregin object braindamage noted by Pierre Mai.
parent
bf84be07
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
code/foreign.lisp
+4
-4
4 additions, 4 deletions
code/foreign.lisp
lisp/FreeBSD-os.c
+3
-3
3 additions, 3 deletions
lisp/FreeBSD-os.c
lisp/Linux-os.c
+3
-3
3 additions, 3 deletions
lisp/Linux-os.c
with
10 additions
and
10 deletions
code/foreign.lisp
+
4
−
4
View file @
d31f5d1a
...
...
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/foreign.lisp,v 1.4
1
2002/08/2
7 22:18:24
moore Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/foreign.lisp,v 1.4
2
2002/08/2
8 07:16:36
moore Exp $"
)
;;;
;;; **********************************************************************
;;;
...
...
@@ -642,9 +642,9 @@ to skip undefined symbols which don't have an address."
(
defun
ensure-lisp-table-opened
()
(
unless
*global-table*
;; Prevent recursive call if dlopen isn't defined
(
setf
*global-table*
(
int-sap
0
))
(
setf
*global-table*
(
list
(
dlopen
nil
rtld-lazy
)))
(
when
(
zerop
(
system:sap-int
(
car
*global-table*
)))
(
setf
*global-table*
(
acons
(
int-sap
0
)
nil
nil
)
)
(
setf
*global-table*
(
acons
(
dlopen
nil
rtld-lazy
)
nil
nil
))
(
when
(
zerop
(
system:sap-int
(
ca
a
r
*global-table*
)))
(
error
"Can't open global symbol table: ~S"
(
dlerror
)))))
(
defun
load-object-file
(
file
)
...
...
This diff is collapsed.
Click to expand it.
lisp/FreeBSD-os.c
+
3
−
3
View file @
d31f5d1a
...
...
@@ -12,7 +12,7 @@
* Much hacked by Paul Werkowski
* GENCGC support by Douglas Crosher, 1996, 1997.
*
* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.c,v 1.
8
2002/08/2
7 22
:1
8
:3
0
moore Exp $
* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.c,v 1.
9
2002/08/2
8 07
:1
6
:3
8
moore Exp $
*
*/
...
...
@@ -216,8 +216,8 @@ void *os_dlsym(const char *sym_name, lispobj lib_list)
for
(
lib_list_head
=
lib_list
;
lib_list_head
!=
NIL
;
lib_list_head
=
(
CONS
(
lib_list_head
))
->
cdr
)
{
struct
cons
*
lib_cons
=
(
CONS
(
lib_list_head
)
)
->
car
;
struct
sap
*
dlhandle
=
(
CONS
(
lib_cons
))
->
car
;
struct
cons
*
lib_cons
=
CONS
(
CONS
(
lib_list_head
)
->
car
)
;
struct
sap
*
dlhandle
=
(
struct
sap
*
)
PTR
(
lib_cons
->
car
)
;
void
*
sym_addr
=
dlsym
((
void
*
)
dlhandle
->
pointer
,
sym_name
);
if
(
sym_addr
)
...
...
This diff is collapsed.
Click to expand it.
lisp/Linux-os.c
+
3
−
3
View file @
d31f5d1a
...
...
@@ -15,7 +15,7 @@
* GENCGC support by Douglas Crosher, 1996, 1997.
* Alpha support by Julian Dolby, 1999.
*
* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Linux-os.c,v 1.1
3
2002/08/2
7 22
:1
8
:3
1
moore Exp $
* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Linux-os.c,v 1.1
4
2002/08/2
8 07
:1
6
:3
8
moore Exp $
*
*/
...
...
@@ -313,8 +313,8 @@ void *os_dlsym(const char *sym_name, lispobj lib_list)
for
(
lib_list_head
=
lib_list
;
lib_list_head
!=
NIL
;
lib_list_head
=
(
CONS
(
lib_list_head
))
->
cdr
)
{
struct
cons
*
lib_cons
=
(
struct
cons
*
)
(
CONS
(
lib_list_head
)
)
->
car
;
struct
sap
*
dlhandle
=
(
struct
sap
*
)
(
CONS
(
lib_cons
))
->
car
;
struct
cons
*
lib_cons
=
CONS
(
CONS
(
lib_list_head
)
->
car
)
;
struct
sap
*
dlhandle
=
(
struct
sap
*
)
PTR
(
lib_cons
->
car
)
;
sym_addr
=
dlsym
((
void
*
)
dlhandle
->
pointer
,
sym_name
);
if
(
sym_addr
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment