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
9f9ac396
Commit
9f9ac396
authored
27 years ago
by
dtc
Browse files
Options
Downloads
Patches
Plain Diff
Flush references to the catch and unwind block current-code slot on
the x86 port in preparation for its removal.
parent
bf8d3664
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
compiler/x86/nlx.lisp
+2
-6
2 additions, 6 deletions
compiler/x86/nlx.lisp
lisp/monitor.c
+14
-2
14 additions, 2 deletions
lisp/monitor.c
with
16 additions
and
8 deletions
compiler/x86/nlx.lisp
+
2
−
6
View file @
9f9ac396
...
...
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;;
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/nlx.lisp,v 1.
9
199
7/12/03 15:30:22
dtc Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/nlx.lisp,v 1.
10
199
8/01/17 05:56:38
dtc Exp $"
)
;;;
;;; **********************************************************************
;;;
...
...
@@ -16,7 +16,7 @@
;;; Written by William Lott.
;;;
;;; Debugged by Paul F. Werkowski Spring/Summer 1995.
;;; Enhancements/debugging by Douglas T. Crosher 1996,1997.
;;; Enhancements/debugging by Douglas T. Crosher 1996,1997
,1998
.
;;;
(
in-package
:x86
)
...
...
@@ -107,8 +107,6 @@
(
load-symbol-value
temp
lisp::*current-unwind-protect-block*
)
(
storew
temp
block
unwind-block-current-uwp-slot
)
(
storew
ebp-tn
block
unwind-block-current-cont-slot
)
;; The code slot is unused - fill with 0.
(
storew
0
block
vm:unwind-block-current-code-slot
)
(
storew
(
make-fixup
nil
:code-object
entry-label
)
block
catch-block-entry-pc-slot
)))
...
...
@@ -127,8 +125,6 @@
(
load-symbol-value
temp
lisp::*current-unwind-protect-block*
)
(
storew
temp
block
unwind-block-current-uwp-slot
)
(
storew
ebp-tn
block
unwind-block-current-cont-slot
)
;; The code slot is unused - fill with 0.
(
storew
0
block
vm:catch-block-current-code-slot
)
(
storew
(
make-fixup
nil
:code-object
entry-label
)
block
catch-block-entry-pc-slot
)
(
storew
tag
block
catch-block-tag-slot
)
...
...
This diff is collapsed.
Click to expand it.
lisp/monitor.c
+
14
−
2
View file @
9f9ac396
/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/monitor.c,v 1.
7
199
7/11/23
0
8
:5
2:51
dtc Exp $ */
/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/monitor.c,v 1.
8
199
8/01/17
0
5
:5
6:35
dtc Exp $ */
#include
<stdio.h>
#include
<sys/types.h>
...
...
@@ -399,7 +399,19 @@ static void catchers_cmd(char **ptr)
printf
(
"There are no active catchers!
\n
"
);
else
{
while
(
catch
!=
NULL
)
{
printf
(
"0x%08lX:
\n\t
uwp: 0x%08lX
\n\t
fp: 0x%08lX
\n\t
code: 0x%08lx
\n\t
entry: 0x%08lx
\n\t
tag: "
,
(
unsigned
long
)
catch
,
(
unsigned
long
)(
catch
->
current_uwp
),
(
unsigned
long
)(
catch
->
current_cont
),
catch
->
current_code
,
catch
->
entry_pc
);
#ifndef i386
printf
(
"0x%08lX:
\n\t
uwp: 0x%08lX
\n\t
fp: 0x%08lX
\n\t
code: 0x%08lx
\n\t
entry: 0x%08lx
\n\t
tag: "
,
(
unsigned
long
)
catch
,
(
unsigned
long
)(
catch
->
current_uwp
),
(
unsigned
long
)(
catch
->
current_cont
),
catch
->
current_code
,
catch
->
entry_pc
);
#else
printf
(
"0x%08lX:
\n\t
uwp: 0x%08lX
\n\t
fp: 0x%08lX
\n\t
code: 0x%08lx
\n\t
entry: 0x%08lx
\n\t
tag: "
,
(
unsigned
long
)
catch
,
(
unsigned
long
)(
catch
->
current_uwp
),
(
unsigned
long
)(
catch
->
current_cont
),
component_ptr_from_pc
(
catch
->
entry_pc
)
+
type_OtherPointer
,
catch
->
entry_pc
);
#endif
brief_print
((
lispobj
)
catch
->
tag
);
catch
=
catch
->
previous_catch
;
}
...
...
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