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
db560e4d
Commit
db560e4d
authored
33 years ago
by
ram
Browse files
Options
Downloads
Patches
Plain Diff
Fixed FAILED-TO-PACK-LOAD-TN-ERROR to know about conflicts with component
TNs. Also fixed a bug in multi-location load-tn spilling.
parent
0551e893
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
compiler/pack.lisp
+25
-15
25 additions, 15 deletions
compiler/pack.lisp
with
25 additions
and
15 deletions
compiler/pack.lisp
+
25
−
15
View file @
db560e4d
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;;
;;;
(
ext:file-comment
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/pack.lisp,v 1.3
5
1991/04/0
1
1
6:29:22
ram Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/pack.lisp,v 1.3
6
1991/04/0
9
1
9:36:38
ram Exp $"
)
;;;
;;;
;;; **********************************************************************
;;; **********************************************************************
;;;
;;;
...
@@ -368,6 +368,8 @@
...
@@ -368,6 +368,8 @@
(
vop-parse-or-lose
(
vop-parse-or-lose
(
vop-info-name
(
vop-info
vop
))))
(
vop-info-name
(
vop-info
vop
))))
temp
))))
temp
))))
((
eq
(
tn-kind
tn
)
:component
)
`
(
"~2D: ~A (component live)"
,
loc
,
name
))
(
t
(
t
`
(
"~2D: not referenced?"
,
loc
)))))
`
(
"~2D: not referenced?"
,
loc
)))))
...
@@ -381,25 +383,33 @@
...
@@ -381,25 +383,33 @@
(
declare
(
type
sc
sc
)
(
type
tn-ref
op
))
(
declare
(
type
sc
sc
)
(
type
tn-ref
op
))
(
collect
((
used
)
(
collect
((
used
)
(
unused
))
(
unused
))
(
assert
(
eq
(
sb-kind
(
sc-sb
sc
))
:finite
))
(
let*
((
sb
(
sc-sb
sc
))
(
dolist
(
el
(
sc-locations
sc
))
(
confs
(
finite-sb-live-tns
sb
)))
(
let
((
conf
(
load-tn-conflicts-in-sc
op
sc
el
t
)))
(
assert
(
eq
(
sb-kind
sb
)
:finite
))
(
if
conf
(
dolist
(
el
(
sc-locations
sc
))
(
used
(
describe-tn-use
el
conf
op
))
(
let
((
conf
(
load-tn-conflicts-in-sc
op
sc
el
t
)))
(
unused
el
))))
(
if
conf
(
used
(
describe-tn-use
el
conf
op
))
(
loop
for
i
from
el
as
victim
=
(
svref
confs
i
)
repeat
(
sc-element-size
sc
)
do
(
when
(
and
victim
(
eq
(
tn-kind
victim
)
:component
))
(
used
(
describe-tn-use
el
victim
op
))
(
return
t
))
finally
(
unused
el
))))))
(
multiple-value-bind
(
arg-p
n
more-p
costs
load-scs
incon
)
(
multiple-value-bind
(
arg-p
n
more-p
costs
load-scs
incon
)
(
get-operand-info
op
)
(
get-operand-info
op
)
(
declare
(
ignore
costs
load-scs
))
(
declare
(
ignore
costs
load-scs
))
(
assert
(
not
more-p
))
(
assert
(
not
more-p
))
(
error
"Unable to pack a Load-TN in SC ~S for the ~:R ~
(
error
"Unable to pack a Load-TN in SC ~S for the ~:R ~
~:[result~;argument~] to~@
~:[result~;argument~] to~@
the ~S VOP,~@
the ~S VOP,~@
~:[since all SC elements are in use:~:{~%~@?~}~%~;~
~:[since all SC elements are in use:~:{~%~@?~}~%~;~
~:*but these SC elements are not in use:~% ~S~%Bug?~*~]~
~:*but these SC elements are not in use:~% ~S~%Bug?~*~]~
~:[~;~@
~:[~;~@
Current cost info inconsistent with that in effect at compile ~
Current cost info inconsistent with that in effect at compile ~
time. Recompile.~%Compilation order may be incorrect.~]"
time. Recompile.~%Compilation order may be incorrect.~]"
(
sc-name
sc
)
(
sc-name
sc
)
n
arg-p
n
arg-p
(
vop-info-name
(
vop-info
(
tn-ref-vop
op
)))
(
vop-info-name
(
vop-info
(
tn-ref-vop
op
)))
...
@@ -1236,7 +1246,7 @@
...
@@ -1236,7 +1246,7 @@
(
unless
(
load-tn-conflicts-in-sc
op
sc
loc
t
)
(
unless
(
load-tn-conflicts-in-sc
op
sc
loc
t
)
(
let
((
spills
(
delete-duplicates
(
let
((
spills
(
delete-duplicates
(
loop
for
i
from
loc
(
loop
for
i
from
loc
as
victim
=
(
svref
(
finite-sb-live-tns
sb
)
loc
)
as
victim
=
(
svref
(
finite-sb-live-tns
sb
)
i
)
repeat
(
sc-element-size
sc
)
repeat
(
sc-element-size
sc
)
when
victim
when
victim
collect
victim
))))
collect
victim
))))
...
...
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