From d2e48d5a1805e3fb98268473a71aff38d8fd9d0b Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Thu, 27 Feb 2003 15:19:46 +0000 Subject: [PATCH] 0.7.13.6 Generate primitive-objects.h automaticslly, and move it into genesis/ (CSR) Fix typo(!) in gencgc.c that was stopping compilation Remove linux-specific header files in same that were left over from the thread branch Delete some unused variables --- src/compiler/generic/genesis.lisp | 7 ++++++- src/runtime/backtrace.c | 2 ++ src/runtime/gc-common.c | 3 ++- src/runtime/gencgc.c | 4 +--- src/runtime/globals.c | 3 --- src/runtime/monitor.c | 2 +- src/runtime/primitive-objects.h | 1 - src/runtime/print.c | 2 +- src/runtime/purify.c | 3 ++- src/runtime/search.c | 2 +- version.lisp-expr | 2 +- 11 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index f32e88d..0de5f03 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -3290,7 +3290,12 @@ initially undefined function references:~2%") (dolist (obj structs) (out-to (string-downcase (string (sb!vm:primitive-object-name obj))) - (write-primitive-object obj)))) + (write-primitive-object obj))) + (out-to "primitive-objects" + (dolist (obj structs) + (format t "~&#include \"~A.h\"~%" + (string-downcase + (string (sb!vm:primitive-object-name obj))))))) (out-to "static-symbols" (write-static-symbols)) (when core-file-name diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c index 18f93a0..12f954f 100644 --- a/src/runtime/backtrace.c +++ b/src/runtime/backtrace.c @@ -21,6 +21,8 @@ #include "os.h" #include "interrupt.h" #include "lispregs.h" +#include "genesis/static-symbols.h" +#include "genesis/primitive-objects.h" #ifndef __i386__ diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c index 0209fc7..8610294 100644 --- a/src/runtime/gc-common.c +++ b/src/runtime/gc-common.c @@ -52,7 +52,8 @@ #include "lispregs.h" #include "arch.h" #include "gc.h" -#include "primitive-objects.h" +#include "genesis/primitive-objects.h" +#include "genesis/static-symbols.h" #include "gc-internal.h" #ifdef LISP_FEATURE_SPARC diff --git a/src/runtime/gencgc.c b/src/runtime/gencgc.c index 2af538d..5fb17ea 100644 --- a/src/runtime/gencgc.c +++ b/src/runtime/gencgc.c @@ -26,8 +26,6 @@ #include #include -#include -#include #include #include "runtime.h" #include "sbcl.h" @@ -979,7 +977,7 @@ gc_find_freeish_pages(int *restart_page_ptr, int nbytes, int unboxed, struct all if((page_table[first_page].allocated == (unboxed ? UNBOXED_PAGE : BOXED_PAGE)) && (page_table[first_page].large_object == 0) && - (gc_alloc_genration == 0) && + (gc_alloc_generation == 0) && (page_table[first_page].gen == gc_alloc_generation) && (page_table[first_page].bytes_used < (4096-32)) && (page_table[first_page].write_protected == 0) && diff --git a/src/runtime/globals.c b/src/runtime/globals.c index e266ba4..6152e25 100644 --- a/src/runtime/globals.c +++ b/src/runtime/globals.c @@ -46,9 +46,6 @@ lispobj *current_auto_gc_trigger; * is done). For the GENCGC, it always points to DYNAMIC_SPACE_START. */ lispobj *current_dynamic_space; -boolean stop_the_world=0; -pid_t parent_pid; - void globals_init(void) { /* Space, stack, and free pointer vars are initialized by diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c index c37c2d5..89851b0 100644 --- a/src/runtime/monitor.c +++ b/src/runtime/monitor.c @@ -34,7 +34,7 @@ #include "lispregs.h" #include "interrupt.h" #include "genesis/static-symbols.h" -#include "primitive-objects.h" +#include "genesis/primitive-objects.h" diff --git a/src/runtime/primitive-objects.h b/src/runtime/primitive-objects.h index d750b53..e23a156 100644 --- a/src/runtime/primitive-objects.h +++ b/src/runtime/primitive-objects.h @@ -24,7 +24,6 @@ #include "genesis/static-symbols.h" #include "genesis/symbol.h" #include "gencgc-alloc-region.h" -#include "genesis/thread.h" #include "genesis/unwind-block.h" #include "genesis/value-cell.h" #include "genesis/vector.h" diff --git a/src/runtime/print.c b/src/runtime/print.c index 6875c06..60ad9bd 100644 --- a/src/runtime/print.c +++ b/src/runtime/print.c @@ -31,7 +31,7 @@ #include "vars.h" #include "os.h" #include "genesis/static-symbols.h" -#include "primitive-objects.h" +#include "genesis/primitive-objects.h" static int max_lines = 20, cur_lines = 0; static int max_depth = 5, brief_depth = 2, cur_depth = 0; diff --git a/src/runtime/purify.c b/src/runtime/purify.c index a67f338..e93e170 100644 --- a/src/runtime/purify.c +++ b/src/runtime/purify.c @@ -28,7 +28,8 @@ #include "interr.h" #include "gc.h" #include "gc-internal.h" -#include "primitive-objects.h" +#include "genesis/primitive-objects.h" +#include "genesis/static-symbols.h" #define PRINTNOISE diff --git a/src/runtime/search.c b/src/runtime/search.c index 48e9faf..611c77a 100644 --- a/src/runtime/search.c +++ b/src/runtime/search.c @@ -15,7 +15,7 @@ #include "sbcl.h" #include "os.h" #include "search.h" -#include "primitive-objects.h" +#include "genesis/primitive-objects.h" boolean search_for_type(int type, lispobj **start, int *count) { diff --git a/version.lisp-expr b/version.lisp-expr index 7ef41c9..776bb31 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -18,4 +18,4 @@ ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.7.13.5" +"0.7.13.6" -- 1.7.10.4