common-lisp/sbcl.sbcl
1
0
Fork 0
mirror of git://git.code.sf.net/p/sbcl/sbcl synced 2026-09-10 07:26:40 -04:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Make autogenerated headers mostly self-contained

Browse source
This commit is contained in:
Douglas Katzman 2020-09-11 22:31:32 -04:00
parent 8612a821bb
commit 951d3bb565
5 changed files with 95 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/compiler/generic/genesis.lisp
View file

@ -3130,6 +3130,7 @@ Legal values for OFFSET are -4, -8, -12, ..."
(write-string "," out))
(terpri out)))
(write-line "};" out)))
(format out "#include <stddef.h>~%") ; for NULL
(write-tags "static " "-LOWTAG" sb-vm:lowtag-limit 0)
;; this -2 shift depends on every OTHER-IMMEDIATE-?-LOWTAG
;; ending with the same 2 bits. (#b10)
@ -3170,7 +3171,7 @@ Legal values for OFFSET are -4, -8, -12, ..."
(slots (sb-vm:primitive-object-slots obj))
(lowtag (or (symbol-value (sb-vm:primitive-object-lowtag obj)) 0)))
;; writing primitive object layouts
(format t "#ifndef __ASSEMBLER__~2%")
(flet ((output-c ()
(when (eq name 'sb-vm::thread)
(format t "#define THREAD_HEADER_SLOTS ~d~%" sb-vm::thread-header-slots)
(dolist (x sb-vm::*thread-header-slot-names*)
@ -3188,8 +3189,8 @@ Legal values for OFFSET are -4, -8, -12, ..."
(sb-vm:slot-rest-p slot)))
(format t "};~%")
(when (member name '(cons vector symbol fdefn))
(write-cast-operator name c-name lowtag))
(format t "~%#else /* __ASSEMBLER__ */~2%")
(write-cast-operator name c-name lowtag)))
(output-asm ()
(format t "/* These offsets are SLOT-OFFSET * N-WORD-BYTES - LOWTAG~%")
(format t " * so they work directly on tagged addresses. */~2%")
(dolist (slot slots)
@ -3198,12 +3199,18 @@ Legal values for OFFSET are -4, -8, -12, ..."
(c-symbol-name (sb-vm:slot-name slot))
(- (* (sb-vm:slot-offset slot) sb-vm:n-word-bytes) lowtag)))
(format t "#define ~A_SIZE ~d~%"
(string-upcase c-name) (sb-vm:primitive-object-length obj)))
(format t "~%#endif /* __ASSEMBLER__ */~2%"))
(string-upcase c-name) (sb-vm:primitive-object-length obj))))
(format t "#ifdef __ASSEMBLER__~2%")
(output-asm)
(format t "~%#else /* __ASSEMBLER__ */~2%")
(format t "#include \"lispobj.h\"~%")
(output-c)
(format t "~%#endif /* __ASSEMBLER__ */~%"))))
(defun write-structure-object (dd *standard-output* &optional structname)
(flet ((cstring (designator) (c-name (string-downcase designator))))
(format t "#ifndef __ASSEMBLER__~2%")
(format t "#include \"lispobj.h\"~%")
(format t "struct ~A {~%" (or structname (cstring (dd-name dd))))
(format t " lispobj header; // = word_0_~%")
;; "self layout" slots are named '_layout' instead of 'layout' so that
@ -3846,19 +3853,40 @@ III. initially undefined function references (alphabetically):
(ensure-directories-exist filename)
(with-open-file (stream filename :direction :output :if-exists :supersede)
(write-makefile-features stream)))
(write-c-headers c-header-dir-name))))
(defun write-c-headers (c-header-dir-name)
(macrolet ((out-to (name &body body) ; write boilerplate and inclusion guard
(let ((headerp (if (and (stringp name) (position #\. name)) nil ".h")))
`(with-open-file (stream (format nil "~A/~A~@[~A~]"
c-header-dir-name ,name ,headerp)
`(actually-out-to ,name (lambda (stream) ,@body))))
(flet ((actually-out-to (name lambda)
;; A file gets a '.inc' extension, not '.h' for either or both
;; of two reasons:
;; - if it isn't self-contained, meaning that in order to #include it,
;; the consumer of it has to know something about which other headers
;; need to be #included first.
;; - it is not intended to be directly consumed because any use would
;; typically need to wrap each slot in some small calculation
;; such as native_pointer(), but we don't want to embed the wrapper
;; accessors into the autogenerated header. So there would instead be
;; a "src/runtime/foo.h" which includes "src/runtime/genesis/foo.inc"
;; 'thread.h' and 'gc-tables.h' violate the naming convention
;; by being non-self-contained.
(let* ((extension
(cond ((and (stringp name) (position #\. name)) nil)
(t ".h")))
(inclusion-guardp
(string= extension ".h")))
(with-open-file (stream (format nil "~A/~A~@[~A~]"
c-header-dir-name name extension)
:direction :output :if-exists :supersede)
(write-boilerplate stream)
,(when headerp
`(format stream
(when inclusion-guardp
(format stream
"#ifndef SBCL_GENESIS_~A~%#define SBCL_GENESIS_~:*~A~%"
(c-name (string-upcase ,name))))
,@body
,(when headerp `(format stream "#endif~%"))))))
(c-name (string-upcase name))))
(funcall lambda stream)
(when inclusion-guardp
(format stream "#endif~%"))))))
(out-to "config" (write-config-h stream))
(out-to "constants" (write-constants-h stream))
(out-to "regnames" (write-regnames-h stream))
@ -3888,7 +3916,7 @@ III. initially undefined function references (alphabetically):
(write-boilerplate stream) ; no inclusion guard, it's not a ".h" file
(write-thread-init stream))
(out-to "static-symbols" (write-static-symbols stream))
(out-to "sc-offset" (write-sc+offset-coding stream))))))
(out-to "sc-offset" (write-sc+offset-coding stream)))))
;;; Invert the action of HOST-CONSTANT-TO-CORE. If STRICTP is given as NIL,
;;; then we can produce a host object even if it is not a faithful rendition.

5
src/compiler/generic/late-objdef.lisp
View file

@ -127,6 +127,7 @@
#+sb-xc-host
(defun write-gc-tables (stream)
(format stream "#include \"lispobj.h\"~%")
;; Compute a bitmask of all specialized vector types,
;; not including array headers, for maybe_adjust_large_object().
(let ((min #xff) (bits 0))
@ -135,14 +136,14 @@
(let ((widetag (saetp-typecode saetp)))
(setf min (min widetag min)
bits (logior bits (ash 1 (ash widetag -2)))))))
(format stream "static inline boolean specialized_vector_widetag_p(unsigned char widetag) {
(format stream "static inline int specialized_vector_widetag_p(unsigned char widetag) {
return widetag>=0x~X && (0x~8,'0XU >> ((widetag-0x80)>>2)) & 1;~%}~%"
min (ldb (byte 32 32) bits))
;; Union in the bits for other unboxed object types.
(dolist (entry *scav/trans/size*)
(when (string= (second entry) "unboxed")
(setf bits (logior bits (ash 1 (ash (car entry) -2))))))
(format stream "static inline boolean leaf_obj_widetag_p(unsigned char widetag) {~%")
(format stream "static inline int leaf_obj_widetag_p(unsigned char widetag) {~%")
#+64-bit (format stream " return (0x~XLU >> (widetag>>2)) & 1;" bits)
#-64-bit (format stream " int bit = widetag>>2;
return (bit<32 ? 0x~XU >> bit : 0x~XU >> (bit-32)) & 1;"

9
src/runtime/lispobj.h Normal file
View file

@ -0,0 +1,9 @@
#ifndef _RUNTIME_LISPOBJ_H_
#define _RUNTIME_LISPOBJ_H_
#include <stdint.h>
typedef intptr_t sword_t;
typedef uintptr_t uword_t;
typedef uword_t lispobj;
#endif

6
src/runtime/runtime.h
View file

@ -15,6 +15,8 @@
#ifndef _SBCL_RUNTIME_H_
#define _SBCL_RUNTIME_H_
#include "lispobj.h"
#if defined(LISP_FEATURE_WIN32) && defined(LISP_FEATURE_SB_THREAD)
# include "pthreads_win32.h"
#else
@ -192,11 +194,7 @@ void dyndebug_init(void);
#include <sys/types.h>
typedef uintptr_t uword_t;
typedef intptr_t sword_t;
#define OBJ_FMTX PRIxPTR
typedef uintptr_t lispobj;
static inline int
lowtag_of(lispobj obj)

10
verify-header-parsing.sh Executable file
View file

@ -0,0 +1,10 @@
#!/bin/sh
# This script is not part of the build, but running it tells you
# whether each genesis headers can be included without fussing
# around with all sorts of other headers.
for i in src/runtime/genesis/*.h
do
echo '#include "'$i'"' > tmp.c
cc -Isrc/runtime -c tmp.c
done