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
685dafb8
Commit
685dafb8
authored
25 years ago
by
dtc
Browse files
Options
Downloads
Patches
Plain Diff
Fix for function-end-cookie-valid-p, lra's should be compared via sap=
on the x86 port.
parent
06f81774
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
code/debug-int.lisp
+16
-15
16 additions, 15 deletions
code/debug-int.lisp
with
16 additions
and
15 deletions
code/debug-int.lisp
+
16
−
15
View file @
685dafb8
...
...
@@ -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/debug-int.lisp,v 1.9
3
199
8
/08/
14 07:14:00
dtc Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.9
4
199
9
/08/
03 13:36:29
dtc Exp $"
)
;;;
;;; **********************************************************************
;;;
...
...
@@ -838,6 +838,16 @@
;;;
(
defsetf
kernel:stack-ref
kernel:%set-stack-ref
)
;;; DESCRIPTOR-SAP -- internal
;;;
;;; Convert the descriptor into a SAP. The bits all stay the same, we just
;;; change our notion of what we think they are.
;;;
(
declaim
(
inline
descriptor-sap
))
(
defun
descriptor-sap
(
x
)
(
system:int-sap
(
kernel:get-lisp-obj-address
x
)))
(
declaim
(
inline
cstack-pointer-valid-p
))
(
defun
cstack-pointer-valid-p
(
x
)
(
declare
(
type
system:system-area-pointer
x
))
...
...
@@ -850,9 +860,9 @@
(
zerop
(
logand
(
system:sap-int
x
)
#b11
)))
#+
:x86
;; stack grows to low address values
(
and
(
system:sap>=
x
(
kernel:current-sp
))
(
system:sap>
(
alien:alien-sap
(
alien:extern-alien
"control_stack_end"
(
*
t
)))
x
)
(
system:sap>
(
alien:alien-sap
(
alien:extern-alien
"control_stack_end"
(
*
t
)))
x
)
(
zerop
(
logand
(
system:sap-int
x
)
#b11
))))
#+
(
or
gengc
x86
)
...
...
@@ -972,15 +982,6 @@
)
; end progn x86
;;; DESCRIPTOR-SAP -- internal
;;;
;;; Convert the descriptor into a SAP. The bits all stay the same, we just
;;; change our notion of what we think they are.
;;;
(
declaim
(
inline
descriptor-sap
))
(
defun
descriptor-sap
(
x
)
(
system:int-sap
(
kernel:get-lisp-obj-address
x
)))
;;; TOP-FRAME -- Public.
;;;
(
defun
top-frame
()
...
...
@@ -1337,7 +1338,7 @@
(
component-ptr-from-pc
(
vm:sigcontext-program-counter
scp
)))
(
code
(
if
(
sap=
component-ptr
(
int-sap
#x0
))
nil
(
component-from-component-ptr
component-ptr
))))
(
component-from-component-ptr
component-ptr
))))
(
when
(
null
code
)
(
return
(
values
code
0
scp
)))
(
let*
((
code-header-len
(
*
(
kernel:get-header-data
code
)
...
...
@@ -3920,7 +3921,7 @@
(
do
((
frame
frame
(
frame-down
frame
)))
((
not
frame
)
nil
)
(
when
(
and
(
compiled-frame-p
frame
)
(
eq
lra
(
#-
x86
eq
#+
x86
sys:sap=
lra
(
get-context-value
frame
#-
gengc
vm::lra-save-offset
#+
gengc
vm::ra-save-offset
...
...
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