From a068699d26e59aa525033b60145095ab85112277 Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Thu, 2 Nov 2023 20:25:02 -0400 Subject: [PATCH] Get rid of src/runtime/sbcl.h Can't see any value in having a 'make' recipe for it. --- .gitignore | 1 - clean.sh | 7 ------- make-host-1.sh | 2 +- src/compiler/generic/genesis.lisp | 4 +--- src/runtime/GNUmakefile | 10 +++------- src/runtime/arena.c | 2 +- src/runtime/arm-arch.c | 2 +- src/runtime/arm-assem.S | 2 +- src/runtime/arm-bsd-os.c | 2 +- src/runtime/arm-linux-os.c | 2 +- src/runtime/arm64-arch.c | 2 +- src/runtime/arm64-bsd-os.c | 2 +- src/runtime/arm64-linux-os.c | 2 +- src/runtime/backtrace.c | 2 +- src/runtime/breakpoint.c | 2 +- src/runtime/bsd-os.c | 2 +- src/runtime/cheneygc.c | 2 +- src/runtime/coalesce.c | 2 +- src/runtime/core.h | 2 +- src/runtime/coreparse.c | 2 +- src/runtime/darwin-os.c | 2 +- src/runtime/dynbind.c | 2 +- src/runtime/funcall.c | 2 +- src/runtime/gc-common.c | 2 +- src/runtime/gc.h | 2 +- src/runtime/gencgc.c | 2 +- src/runtime/globals.c | 2 +- src/runtime/globals.h | 2 +- src/runtime/interr.c | 2 +- src/runtime/interrupt.c | 2 +- src/runtime/largefile.c | 2 +- src/runtime/linux-mman.c | 3 +-- src/runtime/linux-os.c | 2 +- src/runtime/lispobj.h | 2 +- src/runtime/mips-arch.c | 4 +--- src/runtime/mips-assem.S | 2 +- src/runtime/mips-linux-os.c | 2 +- src/runtime/monitor.c | 3 +-- src/runtime/murmur_hash.c | 2 +- src/runtime/os-common.c | 4 +--- src/runtime/os.h | 2 +- src/runtime/parse.c | 2 +- src/runtime/pmrgc.c | 2 +- src/runtime/ppc-arch.c | 2 +- src/runtime/ppc-assem.S | 2 +- src/runtime/ppc-bsd-os.c | 2 +- src/runtime/ppc-darwin-os.c | 2 +- src/runtime/ppc-linux-os.c | 2 +- src/runtime/ppc64-assem.S | 2 +- src/runtime/print.c | 8 +------- src/runtime/print.h | 2 +- src/runtime/purify.c | 2 +- src/runtime/riscv-arch.c | 2 +- src/runtime/riscv-linux-os.c | 2 +- src/runtime/run-program.c | 2 +- src/runtime/runtime.c | 2 +- src/runtime/safepoint.c | 2 +- src/runtime/save.c | 2 +- src/runtime/search.c | 3 +-- src/runtime/sparc-arch.c | 2 +- src/runtime/sparc-assem.S | 2 +- src/runtime/sparc-bsd-os.c | 2 +- src/runtime/sparc-linux-os.c | 2 +- src/runtime/sparc-sunos-os.c | 2 +- src/runtime/sunos-os.c | 2 +- src/runtime/thread.c | 2 +- src/runtime/thread.h | 2 +- src/runtime/time.c | 2 +- src/runtime/traceroot.c | 3 +-- src/runtime/validate.c | 2 +- src/runtime/vars.c | 2 +- src/runtime/win32-os.c | 2 +- src/runtime/wrap.c | 9 ++------- src/runtime/wrap.h | 2 +- src/runtime/x86-64-arch.c | 2 +- src/runtime/x86-64-assem.S | 3 +-- src/runtime/x86-64-bsd-os.c | 2 +- src/runtime/x86-64-linux-os.c | 2 +- src/runtime/x86-64-sunos-os.c | 2 +- src/runtime/x86-64-win32-os.c | 2 +- src/runtime/x86-arch.c | 2 +- src/runtime/x86-assem.S | 2 +- src/runtime/x86-bsd-os.c | 2 +- src/runtime/x86-linux-os.c | 2 +- src/runtime/x86-sunos-os.c | 2 +- src/runtime/x86-win32-os.c | 2 +- tests/fcb-threads.c | 2 +- tests/fin-call.impure.lisp | 2 +- tests/gc-testlib.c | 2 +- tlsf-bsd/tlsf/tlsf.c | 3 +-- tools-for-build/grovel-headers.c | 2 +- 91 files changed, 92 insertions(+), 127 deletions(-) diff --git a/.gitignore b/.gitignore index 8642810eb..41862570f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,6 @@ src/runtime/openbsd-sigcontext.h src/runtime/sbcl src/runtime/ldb src/runtime/sbcl.exe -src/runtime/sbcl.h src/runtime/sbcl.mk src/runtime/shrinkwrap-sbcl* src/runtime/target-arch-os.h diff --git a/clean.sh b/clean.sh index 6a97a7aa1..6645a2d39 100755 --- a/clean.sh +++ b/clean.sh @@ -5,9 +5,6 @@ set -e # In most cases, we can remove the directories, too. # # Preserving the skeletons of some directories might or might not not be relevant. -# The supposed explanation definitely no longer holds - there is no "src/c-runtime/sbcl.h" -# as a symlink into "output/". The sbcl.h file is a plain file, and it's been that way -# for quite some time. rm -rf obj/* src/runtime/genesis/ src/runtime/sbcl.mk src/runtime/*.dSYM if [ -z "$SBCL_LEAVE_OUTPUT" ] @@ -44,9 +41,6 @@ done # files. Some explanations: # sbcl # the runtime environment, created by compiling C code -# sbcl.h -# information about Lisp code needed to build the runtime environment, -# created by running GENESIS # Config, target # architecture-dependent or OS-dependent symlinks # core @@ -116,7 +110,6 @@ find . \( \ -name 'test.log' -o \ -name 'a.out' -o \ -name 'sbcl' -o \ - -name 'sbcl.h' -o \ -name 'ppc-linux-mcontext.h' -o \ -name 'depend' -o \ -name 'TAGS' -o \ diff --git a/make-host-1.sh b/make-host-1.sh index 66f75120f..bc0602516 100755 --- a/make-host-1.sh +++ b/make-host-1.sh @@ -28,7 +28,7 @@ export LANG LC_ALL # file will be loaded before the following file is compiled.) # # Also take the opportunity to compile and load genesis, to create the -# header file sbcl.h which will be needed to create the C runtime +# header files which will be needed to create the C runtime # environment. echo //building cross-compiler, and doing first genesis echo '(load "loader.lisp") (load-sbcl-file "make-host-1.lisp")' | $SBCL_XC_HOST diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index ed0bb4e25..eed99974e 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -3013,7 +3013,6 @@ Legal values for OFFSET are -4, -8, -12, ..." (format t "/*~%") (dolist (line '("This is a machine-generated file. Please do not edit it by hand." - "(As of sbcl-0.8.14, it came from WRITE-CONFIG-H in genesis.lisp.)" nil "This file contains low-level information about the" "internals of a particular version and configuration" @@ -4324,8 +4323,7 @@ static inline uword_t word_has_stickymark(uword_t word) { (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 "sbcl" (write-config-h stream) (write-constants-h stream)) (out-to "regnames" (write-regnames-h stream)) (out-to "errnames" (write-errnames-h stream)) (out-to "gc-tables" (sb-vm::write-gc-tables stream)) diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile index d53448d37..ab2dacb81 100644 --- a/src/runtime/GNUmakefile +++ b/src/runtime/GNUmakefile @@ -172,10 +172,6 @@ sbcl.mk: Config fi ; \ : ) > $@ -sbcl.h: $(wildcard genesis/*.h) - echo '#include "genesis/config.h"' >sbcl.h - echo '#include "genesis/constants.h"' >>sbcl.h - # || true because we don't want the build to break if etags isn't there. # ...but it's still nice to have it done by default. HEADERS=$(wildcard *.h genesis/*.h) @@ -184,15 +180,15 @@ TAGS tags: $(SRCS) $(HEADERS) $(INC) @etags --language=c $(SRCS) $(HEADERS) $(INC) || true clean: - -rm -f *.[do] ../../tlsf-bsd/tlsf/tlsf.o $(TARGET) *.tmp libsbcl.a sbcl.h \ + -rm -f *.[do] ../../tlsf-bsd/tlsf/tlsf.o $(TARGET) *.tmp libsbcl.a \ ldb unit-tests libsbcl.a shrinkwrap-sbcl* sbcl.mk core -%.d: %.c sbcl.h +%.d: %.c @$(CC) $(DEPEND_FLAGS) $(CPPFLAGS) $< > $@.tmp; \ sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.tmp > $@; \ rm -f $@.tmp -%.d: %.S sbcl.h +%.d: %.S @$(CC) $(DEPEND_FLAGS) $(CPPFLAGS) $< > $@.tmp; \ sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.tmp > $@; \ rm -f $@.tmp diff --git a/src/runtime/arena.c b/src/runtime/arena.c index 0a138512d..482c230db 100644 --- a/src/runtime/arena.c +++ b/src/runtime/arena.c @@ -3,7 +3,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "globals.h" #include "gc.h" diff --git a/src/runtime/arm-arch.c b/src/runtime/arm-arch.c index 2874e59d3..549d17605 100644 --- a/src/runtime/arm-arch.c +++ b/src/runtime/arm-arch.c @@ -10,7 +10,7 @@ */ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/arm-assem.S b/src/runtime/arm-assem.S index 00afd912f..8dbb2ac6e 100644 --- a/src/runtime/arm-assem.S +++ b/src/runtime/arm-assem.S @@ -1,6 +1,6 @@ #include "lispregs.h" #include "globals.h" -#include "sbcl.h" +#include "genesis/sbcl.h" #include "genesis/closure.h" #include "genesis/static-symbols.h" diff --git a/src/runtime/arm-bsd-os.c b/src/runtime/arm-bsd-os.c index 55cc188e8..093c774e3 100644 --- a/src/runtime/arm-bsd-os.c +++ b/src/runtime/arm-bsd-os.c @@ -17,7 +17,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/arm-linux-os.c b/src/runtime/arm-linux-os.c index 1aeae9141..5fd391663 100644 --- a/src/runtime/arm-linux-os.c +++ b/src/runtime/arm-linux-os.c @@ -17,7 +17,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/arm64-arch.c b/src/runtime/arm64-arch.c index b132bad06..effa08706 100644 --- a/src/runtime/arm64-arch.c +++ b/src/runtime/arm64-arch.c @@ -10,7 +10,7 @@ */ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/arm64-bsd-os.c b/src/runtime/arm64-bsd-os.c index 607ba2a26..b1c898d0d 100644 --- a/src/runtime/arm64-bsd-os.c +++ b/src/runtime/arm64-bsd-os.c @@ -17,7 +17,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/arm64-linux-os.c b/src/runtime/arm64-linux-os.c index b69b86c20..d425ffd6b 100644 --- a/src/runtime/arm64-linux-os.c +++ b/src/runtime/arm64-linux-os.c @@ -17,7 +17,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c index 9c0fd82fa..b0f8cedd0 100644 --- a/src/runtime/backtrace.c +++ b/src/runtime/backtrace.c @@ -19,7 +19,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "globals.h" #include "os.h" diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c index 290639b21..c67ddab2e 100644 --- a/src/runtime/breakpoint.c +++ b/src/runtime/breakpoint.c @@ -12,7 +12,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "genesis/sap.h" #include "runtime.h" #include "os.h" diff --git a/src/runtime/bsd-os.c b/src/runtime/bsd-os.c index 76beff1ee..95bdd8481 100644 --- a/src/runtime/bsd-os.c +++ b/src/runtime/bsd-os.c @@ -25,7 +25,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/cheneygc.c b/src/runtime/cheneygc.c index a79ac40ba..a8880f32d 100644 --- a/src/runtime/cheneygc.c +++ b/src/runtime/cheneygc.c @@ -18,7 +18,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "os.h" #include "gc.h" diff --git a/src/runtime/coalesce.c b/src/runtime/coalesce.c index faa605c36..7093f0408 100644 --- a/src/runtime/coalesce.c +++ b/src/runtime/coalesce.c @@ -14,7 +14,7 @@ */ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "gc.h" #include "genesis/vector.h" #include "genesis/gc-tables.h" diff --git a/src/runtime/core.h b/src/runtime/core.h index 9033723c3..83c59504c 100644 --- a/src/runtime/core.h +++ b/src/runtime/core.h @@ -12,7 +12,7 @@ #ifndef _CORE_H_ #define _CORE_H_ -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" typedef sword_t core_entry_elt_t; diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index 797a01aa2..3a9ca1071 100644 --- a/src/runtime/coreparse.c +++ b/src/runtime/coreparse.c @@ -14,7 +14,7 @@ * files for more information. */ -#include "sbcl.h" +#include "genesis/sbcl.h" #ifndef LISP_FEATURE_WIN32 #include diff --git a/src/runtime/darwin-os.c b/src/runtime/darwin-os.c index 804dd9b9f..41d6de9a2 100644 --- a/src/runtime/darwin-os.c +++ b/src/runtime/darwin-os.c @@ -15,7 +15,7 @@ */ #include "thread.h" -#include "sbcl.h" +#include "genesis/sbcl.h" #include "globals.h" #include "runtime.h" #include "interr.h" diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c index d7dc9ea15..e0d7273dd 100644 --- a/src/runtime/dynbind.c +++ b/src/runtime/dynbind.c @@ -17,7 +17,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "globals.h" #include "dynbind.h" diff --git a/src/runtime/funcall.c b/src/runtime/funcall.c index e78037654..167ef1221 100644 --- a/src/runtime/funcall.c +++ b/src/runtime/funcall.c @@ -15,7 +15,7 @@ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "globals.h" #include "interrupt.h" diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c index d65300241..11c273313 100644 --- a/src/runtime/gc-common.c +++ b/src/runtime/gc-common.c @@ -28,7 +28,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "os.h" #include "interr.h" diff --git a/src/runtime/gc.h b/src/runtime/gc.h index b1d30bf04..784ca0ace 100644 --- a/src/runtime/gc.h +++ b/src/runtime/gc.h @@ -16,7 +16,7 @@ #ifndef _GC_H_ #define _GC_H_ -#include "sbcl.h" +#include "genesis/sbcl.h" #include "gc-assert.h" #include "gc-typedefs.h" #include diff --git a/src/runtime/gencgc.c b/src/runtime/gencgc.c index 0577fc591..a8914beb5 100644 --- a/src/runtime/gencgc.c +++ b/src/runtime/gencgc.c @@ -27,7 +27,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "os.h" #include "interr.h" diff --git a/src/runtime/globals.c b/src/runtime/globals.c index fbb726285..512455d21 100644 --- a/src/runtime/globals.c +++ b/src/runtime/globals.c @@ -17,7 +17,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "globals.h" #include "validate.h" diff --git a/src/runtime/globals.h b/src/runtime/globals.h index 9a33a8038..abffa2e53 100644 --- a/src/runtime/globals.h +++ b/src/runtime/globals.h @@ -20,7 +20,7 @@ # include "os.h" #endif -#include "sbcl.h" +#include "genesis/sbcl.h" #ifndef __ASSEMBLER__ diff --git a/src/runtime/interr.c b/src/runtime/interr.c index 921765171..46767267e 100644 --- a/src/runtime/interr.c +++ b/src/runtime/interr.c @@ -17,7 +17,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "arch.h" #include diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 676a0da87..5deaaf61a 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -40,7 +40,7 @@ * * - WHN 20000728, dan 20010128 */ -#include "sbcl.h" +#include "genesis/sbcl.h" #include #include diff --git a/src/runtime/largefile.c b/src/runtime/largefile.c index 015054833..7556b2822 100644 --- a/src/runtime/largefile.c +++ b/src/runtime/largefile.c @@ -16,7 +16,7 @@ * files for more information. */ -#include "genesis/config.h" +#include "genesis/sbcl.h" #ifdef LISP_FEATURE_LARGEFILE diff --git a/src/runtime/linux-mman.c b/src/runtime/linux-mman.c index 3248d469c..f48e863ab 100644 --- a/src/runtime/linux-mman.c +++ b/src/runtime/linux-mman.c @@ -2,8 +2,7 @@ #include #include -#include "genesis/config.h" -#include "genesis/constants.h" +#include "genesis/sbcl.h" #include "globals.h" #include "os.h" #include "interr.h" diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c index 25b0c3fa7..7598b4289 100644 --- a/src/runtime/linux-os.c +++ b/src/runtime/linux-os.c @@ -23,7 +23,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/lispobj.h b/src/runtime/lispobj.h index c60b91a81..f8f75d0fa 100644 --- a/src/runtime/lispobj.h +++ b/src/runtime/lispobj.h @@ -6,7 +6,7 @@ typedef intptr_t sword_t; typedef uintptr_t uword_t; typedef uword_t lispobj; -#include "sbcl.h" +#include "genesis/sbcl.h" static inline int fixnump(lispobj obj) { diff --git a/src/runtime/mips-arch.c b/src/runtime/mips-arch.c index 949cb5d2d..0529d7d0e 100644 --- a/src/runtime/mips-arch.c +++ b/src/runtime/mips-arch.c @@ -7,7 +7,7 @@ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "arch.h" #include "globals.h" @@ -20,8 +20,6 @@ #include "interr.h" #include "breakpoint.h" -#include "genesis/constants.h" - #define INSN_LEN sizeof(unsigned int) os_vm_address_t diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S index a7d604ce4..ebaa57548 100644 --- a/src/runtime/mips-assem.S +++ b/src/runtime/mips-assem.S @@ -18,7 +18,7 @@ .section .note.GNU-stack,"",%progbits #endif -#include "sbcl.h" +#include "genesis/sbcl.h" #include "lispregs.h" #include "genesis/closure.h" #include "genesis/static-symbols.h" diff --git a/src/runtime/mips-linux-os.c b/src/runtime/mips-linux-os.c index 13d391780..dfe3ce001 100644 --- a/src/runtime/mips-linux-os.c +++ b/src/runtime/mips-linux-os.c @@ -20,7 +20,7 @@ /* for cacheflush() */ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c index f7073854f..75dc91508 100644 --- a/src/runtime/monitor.c +++ b/src/runtime/monitor.c @@ -9,7 +9,7 @@ * files for more information. */ -#include "sbcl.h" +#include "genesis/sbcl.h" #include "lispobj.h" #include @@ -35,7 +35,6 @@ #include "lispregs.h" #include "interrupt.h" #include "thread.h" -#include "genesis/constants.h" #include "genesis/instance.h" #include "genesis/static-symbols.h" #include "genesis/primitive-objects.h" diff --git a/src/runtime/murmur_hash.c b/src/runtime/murmur_hash.c index 3340ec6a5..834fcac3a 100644 --- a/src/runtime/murmur_hash.c +++ b/src/runtime/murmur_hash.c @@ -16,7 +16,7 @@ * */ -#include "genesis/config.h" +#include "genesis/sbcl.h" #include "murmur_hash.h" #include diff --git a/src/runtime/os-common.c b/src/runtime/os-common.c index 913133e01..b9322049d 100644 --- a/src/runtime/os-common.c +++ b/src/runtime/os-common.c @@ -14,11 +14,9 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "globals.h" #include "runtime.h" -#include "genesis/config.h" -#include "genesis/constants.h" #include "genesis/cons.h" #include "genesis/vector.h" #include "genesis/symbol.h" diff --git a/src/runtime/os.h b/src/runtime/os.h index 55c5296ca..478258dee 100644 --- a/src/runtime/os.h +++ b/src/runtime/os.h @@ -17,7 +17,7 @@ #define _OS_H_INCLUDED_ -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include diff --git a/src/runtime/parse.c b/src/runtime/parse.c index 41a6b195f..7947f55d4 100644 --- a/src/runtime/parse.c +++ b/src/runtime/parse.c @@ -15,7 +15,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #ifdef LISP_FEATURE_WIN32 #include "pthreads_win32.h" #else diff --git a/src/runtime/pmrgc.c b/src/runtime/pmrgc.c index 17557dd4f..bcc478a03 100644 --- a/src/runtime/pmrgc.c +++ b/src/runtime/pmrgc.c @@ -15,7 +15,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "lispregs.h" #include "gc.h" #include "code.h" diff --git a/src/runtime/ppc-arch.c b/src/runtime/ppc-arch.c index d87149508..1fcc3be9a 100644 --- a/src/runtime/ppc-arch.c +++ b/src/runtime/ppc-arch.c @@ -11,7 +11,7 @@ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "arch.h" #include "globals.h" #include "validate.h" diff --git a/src/runtime/ppc-assem.S b/src/runtime/ppc-assem.S index 187d99ec0..903dd73da 100644 --- a/src/runtime/ppc-assem.S +++ b/src/runtime/ppc-assem.S @@ -3,7 +3,7 @@ .section .note.GNU-stack,"",%progbits #endif -#include "sbcl.h" +#include "genesis/sbcl.h" #include "lispregs.h" #include "genesis/closure.h" #include "genesis/static-symbols.h" diff --git a/src/runtime/ppc-bsd-os.c b/src/runtime/ppc-bsd-os.c index 2be8e515a..4f8dcd941 100644 --- a/src/runtime/ppc-bsd-os.c +++ b/src/runtime/ppc-bsd-os.c @@ -1,7 +1,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "interr.h" #include "runtime.h" #include "thread.h" diff --git a/src/runtime/ppc-darwin-os.c b/src/runtime/ppc-darwin-os.c index 781e65250..42c206f57 100644 --- a/src/runtime/ppc-darwin-os.c +++ b/src/runtime/ppc-darwin-os.c @@ -14,7 +14,7 @@ * files for more information. */ -#include "sbcl.h" +#include "genesis/sbcl.h" #include "globals.h" #include "runtime.h" #include diff --git a/src/runtime/ppc-linux-os.c b/src/runtime/ppc-linux-os.c index b0c5388da..857d299dc 100644 --- a/src/runtime/ppc-linux-os.c +++ b/src/runtime/ppc-linux-os.c @@ -18,7 +18,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/ppc64-assem.S b/src/runtime/ppc64-assem.S index 7600969fb..7deb015ad 100644 --- a/src/runtime/ppc64-assem.S +++ b/src/runtime/ppc64-assem.S @@ -1,4 +1,4 @@ -#include "sbcl.h" +#include "genesis/sbcl.h" #include "lispregs.h" #include "genesis/closure.h" #include "genesis/static-symbols.h" diff --git a/src/runtime/print.c b/src/runtime/print.c index fd82f339a..86efb38eb 100644 --- a/src/runtime/print.c +++ b/src/runtime/print.c @@ -11,16 +11,10 @@ * files for more information. */ -/* - * FIXME: - * Some of the code in here is deeply broken, depending on guessing - * already out-of-date values instead of getting them from sbcl.h. - */ - #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "print.h" #include "runtime.h" #include "code.h" diff --git a/src/runtime/print.h b/src/runtime/print.h index a5bc4365b..1b4346257 100644 --- a/src/runtime/print.h +++ b/src/runtime/print.h @@ -12,7 +12,7 @@ #ifndef _PRINT_H_ #define _PRINT_H_ -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" extern void print(lispobj obj); diff --git a/src/runtime/purify.c b/src/runtime/purify.c index b4ef5dca0..a081f85a5 100644 --- a/src/runtime/purify.c +++ b/src/runtime/purify.c @@ -19,7 +19,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "os.h" #include "globals.h" diff --git a/src/runtime/riscv-arch.c b/src/runtime/riscv-arch.c index afd82749e..6f581bd42 100644 --- a/src/runtime/riscv-arch.c +++ b/src/runtime/riscv-arch.c @@ -10,7 +10,7 @@ */ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/riscv-linux-os.c b/src/runtime/riscv-linux-os.c index 7591d7265..ebf208cd9 100644 --- a/src/runtime/riscv-linux-os.c +++ b/src/runtime/riscv-linux-os.c @@ -18,7 +18,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/run-program.c b/src/runtime/run-program.c index 8324f2d99..8338d07a5 100644 --- a/src/runtime/run-program.c +++ b/src/runtime/run-program.c @@ -18,7 +18,7 @@ #define _GNU_SOURCE #endif -#include "sbcl.h" +#include "genesis/sbcl.h" #include #include #include diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index e462a5aef..05d060dff 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -13,7 +13,7 @@ * files for more information. */ -#include "sbcl.h" +#include "genesis/sbcl.h" #include #include diff --git a/src/runtime/safepoint.c b/src/runtime/safepoint.c index 5a35658de..bd495a9f1 100644 --- a/src/runtime/safepoint.c +++ b/src/runtime/safepoint.c @@ -8,7 +8,7 @@ * provided with absolutely no warranty. See the COPYING and CREDITS * files for more information. */ -#include "sbcl.h" +#include "genesis/sbcl.h" #ifdef LISP_FEATURE_SB_SAFEPOINT /* entire file */ #include diff --git a/src/runtime/save.c b/src/runtime/save.c index 42d5f2d28..9d8f7c405 100644 --- a/src/runtime/save.c +++ b/src/runtime/save.c @@ -18,7 +18,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #ifdef LISP_FEATURE_WIN32 #include "pthreads_win32.h" #else diff --git a/src/runtime/search.c b/src/runtime/search.c index ba0b3108c..122afed88 100644 --- a/src/runtime/search.c +++ b/src/runtime/search.c @@ -13,8 +13,7 @@ #include #include -#include "genesis/config.h" -#include "genesis/constants.h" +#include "genesis/sbcl.h" #include "interr.h" #include "lispobj.h" #include "os.h" diff --git a/src/runtime/sparc-arch.c b/src/runtime/sparc-arch.c index 72c8e0084..97211b68c 100644 --- a/src/runtime/sparc-arch.c +++ b/src/runtime/sparc-arch.c @@ -10,7 +10,7 @@ */ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/sparc-assem.S b/src/runtime/sparc-assem.S index 92f7559a2..2a9745f17 100644 --- a/src/runtime/sparc-assem.S +++ b/src/runtime/sparc-assem.S @@ -6,7 +6,7 @@ #define _ASM #include "lispregs.h" -#include "sbcl.h" +#include "genesis/sbcl.h" #include "genesis/closure.h" #include "genesis/static-symbols.h" #include "genesis/thread.h" diff --git a/src/runtime/sparc-bsd-os.c b/src/runtime/sparc-bsd-os.c index f4c812d22..84216c3d1 100644 --- a/src/runtime/sparc-bsd-os.c +++ b/src/runtime/sparc-bsd-os.c @@ -17,7 +17,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/sparc-linux-os.c b/src/runtime/sparc-linux-os.c index 464b648d1..65a101d66 100644 --- a/src/runtime/sparc-linux-os.c +++ b/src/runtime/sparc-linux-os.c @@ -17,7 +17,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/sparc-sunos-os.c b/src/runtime/sparc-sunos-os.c index a847e80b2..0d9fb2efc 100644 --- a/src/runtime/sparc-sunos-os.c +++ b/src/runtime/sparc-sunos-os.c @@ -17,7 +17,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/sunos-os.c b/src/runtime/sunos-os.c index 83e8590e6..4255a1a96 100644 --- a/src/runtime/sunos-os.c +++ b/src/runtime/sunos-os.c @@ -8,7 +8,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "interr.h" diff --git a/src/runtime/thread.c b/src/runtime/thread.c index e291e1ac1..64753dcb6 100644 --- a/src/runtime/thread.c +++ b/src/runtime/thread.c @@ -12,7 +12,7 @@ #ifdef __linux__ #define _GNU_SOURCE // for pthread_setname_np() #endif -#include "sbcl.h" +#include "genesis/sbcl.h" #include #include diff --git a/src/runtime/thread.h b/src/runtime/thread.h index a90d98966..b8899c1ec 100644 --- a/src/runtime/thread.h +++ b/src/runtime/thread.h @@ -5,7 +5,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "globals.h" #include "runtime.h" #include "os.h" diff --git a/src/runtime/time.c b/src/runtime/time.c index 04e0be86a..95bc1f010 100644 --- a/src/runtime/time.c +++ b/src/runtime/time.c @@ -15,7 +15,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" int get_timezone(time_t when, unsigned int *dst) diff --git a/src/runtime/traceroot.c b/src/runtime/traceroot.c index a9124333c..ef924777d 100644 --- a/src/runtime/traceroot.c +++ b/src/runtime/traceroot.c @@ -1,4 +1,4 @@ -#include "sbcl.h" +#include "genesis/sbcl.h" #include "arch.h" #include "runtime.h" #include "lispregs.h" @@ -6,7 +6,6 @@ #include "code.h" #include "genesis/closure.h" #include "genesis/cons.h" -#include "genesis/constants.h" #include "genesis/fdefn.h" #include "genesis/gc-tables.h" #include "genesis/hash-table.h" diff --git a/src/runtime/validate.c b/src/runtime/validate.c index 55d17e342..ab925bee7 100644 --- a/src/runtime/validate.c +++ b/src/runtime/validate.c @@ -16,7 +16,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "os.h" #include "globals.h" diff --git a/src/runtime/vars.c b/src/runtime/vars.c index bb5281e27..be35c919c 100644 --- a/src/runtime/vars.c +++ b/src/runtime/vars.c @@ -14,7 +14,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "vars.h" #include "os.h" diff --git a/src/runtime/win32-os.c b/src/runtime/win32-os.c index fd7b9696a..344b4f15a 100644 --- a/src/runtime/win32-os.c +++ b/src/runtime/win32-os.c @@ -32,7 +32,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c index ab2efa40d..0341a2a6f 100644 --- a/src/runtime/wrap.c +++ b/src/runtime/wrap.c @@ -5,12 +5,7 @@ * The functions in this file are typically called directly from Lisp. * Thus, when their signature changes, they don't need updates in a .h * file somewhere, but they do need updates in the Lisp code. FIXME: - * It would be nice to enforce this at compile time. It mighn't even - * be all that hard: make the cross-compiler versions of DEFINE-ALIEN-FOO - * macros accumulate strings in a list which then gets written out at - * the end of sbcl2.h at the end of cross-compilation, then rerun - * 'make' in src/runtime/ using the new sbcl2.h as sbcl.h (and make - * sure that all the files in src/runtime/ include sbcl.h). */ + * It would be nice to enforce this at compile time. */ /* * This software is part of the SBCL system. See the README file for @@ -23,7 +18,7 @@ * files for more information. */ -#include "sbcl.h" +#include "genesis/sbcl.h" #include #include diff --git a/src/runtime/wrap.h b/src/runtime/wrap.h index 9a77621c3..af1dce888 100644 --- a/src/runtime/wrap.h +++ b/src/runtime/wrap.h @@ -32,7 +32,7 @@ * shouldn't be used for any purpose for which the real type can be * employed. */ -#include "sbcl.h" +#include "genesis/sbcl.h" /* We use an extra layer of aliasing because Linux/MIPS struct stat doesn't use dev_t. This type is not defined on the Lisp side. */ diff --git a/src/runtime/x86-64-arch.c b/src/runtime/x86-64-arch.c index ebe553dcd..ee5860f47 100644 --- a/src/runtime/x86-64-arch.c +++ b/src/runtime/x86-64-arch.c @@ -13,7 +13,7 @@ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "globals.h" #include "validate.h" diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S index cca912900..b60e9c633 100644 --- a/src/runtime/x86-64-assem.S +++ b/src/runtime/x86-64-assem.S @@ -18,9 +18,8 @@ .section .note.GNU-stack,"",%progbits #endif -#include "genesis/config.h" +#include "genesis/sbcl.h" #include "validate.h" -#include "sbcl.h" #include "genesis/closure.h" #include "genesis/fdefn.h" #include "genesis/static-symbols.h" diff --git a/src/runtime/x86-64-bsd-os.c b/src/runtime/x86-64-bsd-os.c index 06033dc84..4a0c5f7a1 100644 --- a/src/runtime/x86-64-bsd-os.c +++ b/src/runtime/x86-64-bsd-os.c @@ -1,6 +1,6 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "thread.h" #include "interr.h" diff --git a/src/runtime/x86-64-linux-os.c b/src/runtime/x86-64-linux-os.c index 8be12d938..700c84a4d 100644 --- a/src/runtime/x86-64-linux-os.c +++ b/src/runtime/x86-64-linux-os.c @@ -32,7 +32,7 @@ #include "interrupt.h" #include "interr.h" #include "lispregs.h" -#include "sbcl.h" +#include "genesis/sbcl.h" #include #include diff --git a/src/runtime/x86-64-sunos-os.c b/src/runtime/x86-64-sunos-os.c index dbe2f0b8e..a99851306 100644 --- a/src/runtime/x86-64-sunos-os.c +++ b/src/runtime/x86-64-sunos-os.c @@ -1,7 +1,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/x86-64-win32-os.c b/src/runtime/x86-64-win32-os.c index b7a80f036..e8d9da7ca 100644 --- a/src/runtime/x86-64-win32-os.c +++ b/src/runtime/x86-64-win32-os.c @@ -28,7 +28,7 @@ #include "interrupt.h" #include "interr.h" #include "lispregs.h" -#include "sbcl.h" +#include "genesis/sbcl.h" #include #include "runtime.h" diff --git a/src/runtime/x86-arch.c b/src/runtime/x86-arch.c index 64764a272..8ecf40d40 100644 --- a/src/runtime/x86-arch.c +++ b/src/runtime/x86-arch.c @@ -11,7 +11,7 @@ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "runtime.h" #include "globals.h" #include "validate.h" diff --git a/src/runtime/x86-assem.S b/src/runtime/x86-assem.S index 0ae81e321..69cea5708 100644 --- a/src/runtime/x86-assem.S +++ b/src/runtime/x86-assem.S @@ -18,7 +18,7 @@ .section .note.GNU-stack,"",%progbits #endif -#include "sbcl.h" +#include "genesis/sbcl.h" #include "genesis/closure.h" #include "genesis/static-symbols.h" #include "genesis/symbol.h" diff --git a/src/runtime/x86-bsd-os.c b/src/runtime/x86-bsd-os.c index aa51fd0ba..f41480a44 100644 --- a/src/runtime/x86-bsd-os.c +++ b/src/runtime/x86-bsd-os.c @@ -1,7 +1,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "interr.h" #include "runtime.h" #include "thread.h" diff --git a/src/runtime/x86-linux-os.c b/src/runtime/x86-linux-os.c index d6e047c3d..44cafe09b 100644 --- a/src/runtime/x86-linux-os.c +++ b/src/runtime/x86-linux-os.c @@ -22,7 +22,7 @@ #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/x86-sunos-os.c b/src/runtime/x86-sunos-os.c index 68ef8b398..d7349e8ca 100644 --- a/src/runtime/x86-sunos-os.c +++ b/src/runtime/x86-sunos-os.c @@ -1,7 +1,7 @@ #include #include #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "os.h" #include "arch.h" #include "globals.h" diff --git a/src/runtime/x86-win32-os.c b/src/runtime/x86-win32-os.c index 2ac4a00f9..fccd09ae8 100644 --- a/src/runtime/x86-win32-os.c +++ b/src/runtime/x86-win32-os.c @@ -28,7 +28,7 @@ #include "interrupt.h" #include "interr.h" #include "lispregs.h" -#include "sbcl.h" +#include "genesis/sbcl.h" #include #include "runtime.h" diff --git a/tests/fcb-threads.c b/tests/fcb-threads.c index 3b5bc1083..f71e69fa5 100644 --- a/tests/fcb-threads.c +++ b/tests/fcb-threads.c @@ -1,5 +1,5 @@ /* In as much as this file simulates "foreign" code, - * we don't include "sbcl.h" and we use the native thread API + * we don't include "genesis/sbcl.h" and we use the native thread API * for the platform */ #ifdef _WIN32 diff --git a/tests/fin-call.impure.lisp b/tests/fin-call.impure.lisp index 64f34e9d9..7aa764fc0 100644 --- a/tests/fin-call.impure.lisp +++ b/tests/fin-call.impure.lisp @@ -154,7 +154,7 @@ index 400772889..229eea81c 100644 +++ b/src/runtime/interrupt.c @@ -42,6 +42,9 @@ - #include "sbcl.h" + #include "genesis/sbcl.h" +#define _GNU_SOURCE /* for REG_RAX etc. from sys/ucontext */ +#include diff --git a/tests/gc-testlib.c b/tests/gc-testlib.c index 2d8086511..ddbdefaf5 100644 --- a/tests/gc-testlib.c +++ b/tests/gc-testlib.c @@ -3,7 +3,7 @@ * or update_writeprotection() */ #include -#include "sbcl.h" +#include "genesis/sbcl.h" #include "gc.h" #include "genesis/instance.h" #include "thread.h" diff --git a/tlsf-bsd/tlsf/tlsf.c b/tlsf-bsd/tlsf/tlsf.c index 7a569d417..ce628fd3e 100644 --- a/tlsf-bsd/tlsf/tlsf.c +++ b/tlsf-bsd/tlsf/tlsf.c @@ -31,8 +31,7 @@ #define tlsf_assert(expr) (void)(0) #endif -#include "genesis/config.h" -#include "genesis/constants.h" +#include "genesis/sbcl.h" /* Public constants: may be modified. */ enum tlsf_public { diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c index bacc90dc7..9c0c555d0 100644 --- a/tools-for-build/grovel-headers.c +++ b/tools-for-build/grovel-headers.c @@ -18,7 +18,7 @@ * more information. */ -#include "genesis/config.h" +#include "genesis/sbcl.h" #include #include