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
2adf01e6
Commit
2adf01e6
authored
32 years ago
by
wlott
Browse files
Options
Downloads
Patches
Plain Diff
Added new-assembler in-core compilation support.
parent
40a78d0d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
compiler/generic/core.lisp
+20
-8
20 additions, 8 deletions
compiler/generic/core.lisp
compiler/main.lisp
+3
-2
3 additions, 2 deletions
compiler/main.lisp
with
23 additions
and
10 deletions
compiler/generic/core.lisp
+
20
−
8
View file @
2adf01e6
...
@@ -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/generic/core.lisp,v 1.1
4
1992/0
5/22 15:32:18
wlott Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/core.lisp,v 1.1
5
1992/0
7/11 02:11:49
wlott Exp $"
)
;;;
;;;
;;; **********************************************************************
;;; **********************************************************************
;;;
;;;
...
@@ -131,12 +131,11 @@
...
@@ -131,12 +131,11 @@
;;; Dump a component to core. We pass in the assembler fixups, code vector
;;; Dump a component to core. We pass in the assembler fixups, code vector
;;; and node info.
;;; and node info.
;;;
;;;
(
defun
make-core-component
(
component
segment
length
trace-table
object
)
(
defun
make-core-component
(
component
segment
length
trace-table
fixups
object
)
(
declare
(
type
component
component
)
(
declare
(
type
component
component
)
(
type
index
length
)
(
type
index
length
)
(
list
trace-table
)
(
list
trace-table
fixups
)
(
type
core-object
object
))
(
type
core-object
object
))
(
assert
(
not
(
backend-featurep
:new-assembler
)))
(
without-gcing
(
without-gcing
(
let*
((
2comp
(
component-info
component
))
(
let*
((
2comp
(
component-info
component
))
(
constants
(
ir2-component-constants
2comp
))
(
constants
(
ir2-component-constants
2comp
))
...
@@ -146,8 +145,22 @@
...
@@ -146,8 +145,22 @@
(
total-length
(
+
length
(
ceiling
trace-table-bits
vm:byte-bits
)))
(
total-length
(
+
length
(
ceiling
trace-table-bits
vm:byte-bits
)))
(
box-num
(
-
(
length
constants
)
vm:code-trace-table-offset-slot
))
(
box-num
(
-
(
length
constants
)
vm:code-trace-table-offset-slot
))
(
code-obj
(
%primitive
allocate-code-object
box-num
total-length
))
(
code-obj
(
%primitive
allocate-code-object
box-num
total-length
))
(
inst-stream
(
make-code-instruction-stream
code-obj
))
(
trace-table-sap
(
fixups
(
assem:emit-code-vector
inst-stream
segment
)))
(
cond
((
backend-featurep
:new-assembler
)
(
let
((
fill-ptr
(
code-instructions
code-obj
)))
(
new-assem:segment-map-output
segment
#'
(
lambda
(
sap
amount
)
(
declare
(
type
system-area-pointer
sap
)
(
type
index
amount
))
(
system-area-copy
sap
0
fill-ptr
0
(
*
amount
vm:byte-bits
))
(
setf
fill-ptr
(
sap+
fill-ptr
amount
))))
fill-ptr
))
(
t
(
let
((
inst-stream
(
make-code-instruction-stream
code-obj
)))
(
setf
fixups
(
assem:emit-code-vector
inst-stream
segment
))
(
code-instruction-stream-current
inst-stream
))))))
(
declare
(
type
index
box-num
total-length
))
(
declare
(
type
index
box-num
total-length
))
(
do-core-fixups
code-obj
fixups
)
(
do-core-fixups
code-obj
fixups
)
...
@@ -161,8 +174,7 @@
...
@@ -161,8 +174,7 @@
(
setf
(
code-header-ref
code-obj
vm:code-trace-table-offset-slot
)
length
)
(
setf
(
code-header-ref
code-obj
vm:code-trace-table-offset-slot
)
length
)
(
copy-to-system-area
trace-table
(
*
vm:vector-data-offset
vm:word-bits
)
(
copy-to-system-area
trace-table
(
*
vm:vector-data-offset
vm:word-bits
)
(
code-instruction-stream-current
inst-stream
)
0
trace-table-sap
0
trace-table-bits
)
trace-table-bits
)
(
do
((
index
vm:code-constants-offset
(
1+
index
)))
(
do
((
index
vm:code-constants-offset
(
1+
index
)))
((
>=
index
(
length
constants
)))
((
>=
index
(
length
constants
)))
...
...
This diff is collapsed.
Click to expand it.
compiler/main.lisp
+
3
−
2
View file @
2adf01e6
...
@@ -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/main.lisp,v 1.6
4
1992/0
6
/1
2
0
4:38
:2
5
wlott Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/main.lisp,v 1.6
5
1992/0
7
/1
1
0
2:11
:2
0
wlott Exp $"
)
;;;
;;;
;;; **********************************************************************
;;; **********************************************************************
;;;
;;;
...
@@ -305,7 +305,8 @@
...
@@ -305,7 +305,8 @@
(
core-object
(
core-object
(
maybe-mumble
"Core"
)
(
maybe-mumble
"Core"
)
(
make-core-component
component
*code-segment*
(
make-core-component
component
*code-segment*
length
trace-table
*compile-object*
))
length
trace-table
fixups
*compile-object*
))
(
null
))))
(
null
))))
(
cond
((
backend-featurep
:new-assembler
)
(
cond
((
backend-featurep
:new-assembler
)
...
...
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