From f815f89eb5b1a7d5e6fefaf5b19321d8870931f9 Mon Sep 17 00:00:00 2001 From: Gabor Melis Date: Mon, 16 Feb 2009 21:18:36 +0000 Subject: [PATCH] 1.0.25.13: 80 chars, trailing space --- src/code/signal.lisp | 37 ++++++++++++++++++++++++------------- src/pcl/methods.lisp | 6 ++++-- src/runtime/alloc.c | 18 ++++++++++++------ src/runtime/interrupt.c | 18 ++++++++++++------ src/runtime/interrupt.h | 3 ++- src/runtime/runtime.c | 10 ++++++---- src/runtime/validate.c | 6 ++++-- src/runtime/validate.h | 6 ++++-- version.lisp-expr | 2 +- 9 files changed, 69 insertions(+), 37 deletions(-) diff --git a/src/code/signal.lisp b/src/code/signal.lisp index d6c7eee..4040857 100644 --- a/src/code/signal.lisp +++ b/src/code/signal.lisp @@ -91,21 +91,30 @@ WITHOUT-INTERRUPTS in: " (with-unique-names (outer-allow-with-interrupts without-interrupts-body) `(flet ((,without-interrupts-body () - (declare (disable-package-locks allow-with-interrupts with-local-interrupts)) - (macrolet ((allow-with-interrupts (&body allow-forms) - `(let ((*allow-with-interrupts* ,',outer-allow-with-interrupts)) - ,@allow-forms)) - (with-local-interrupts (&body with-forms) - `(let ((*allow-with-interrupts* ,',outer-allow-with-interrupts) - (*interrupts-enabled* ,',outer-allow-with-interrupts)) - (when (and ,',outer-allow-with-interrupts *interrupt-pending*) - (receive-pending-interrupt)) - (locally ,@with-forms)))) + (declare (disable-package-locks allow-with-interrupts + with-local-interrupts)) + (macrolet + ((allow-with-interrupts + (&body allow-forms) + `(let ((*allow-with-interrupts* + ,',outer-allow-with-interrupts)) + ,@allow-forms)) + (with-local-interrupts + (&body with-forms) + `(let ((*allow-with-interrupts* + ,',outer-allow-with-interrupts) + (*interrupts-enabled* + ,',outer-allow-with-interrupts)) + (when (and ,',outer-allow-with-interrupts + *interrupt-pending*) + (receive-pending-interrupt)) + (locally ,@with-forms)))) (let ((*interrupts-enabled* nil) (,outer-allow-with-interrupts *allow-with-interrupts*) (*allow-with-interrupts* nil)) (declare (ignorable ,outer-allow-with-interrupts)) - (declare (enable-package-locks allow-with-interrupts with-local-interrupts)) + (declare (enable-package-locks allow-with-interrupts + with-local-interrupts)) ,@body)))) (if *interrupts-enabled* (unwind-protect @@ -146,11 +155,13 @@ by ALLOW-WITH-INTERRUPTS." (defmacro allow-with-interrupts (&body body) (declare (ignore body)) - (error "~S is valid only inside ~S." 'allow-with-interrupts 'without-interrupts)) + (error "~S is valid only inside ~S." + 'allow-with-interrupts 'without-interrupts)) (defmacro with-local-interrupts (&body body) (declare (ignore body)) - (error "~S is valid only inside ~S." 'with-local-interrupts 'without-interrupts)) + (error "~S is valid only inside ~S." + 'with-local-interrupts 'without-interrupts)) ;;; A low-level operation that assumes that *INTERRUPTS-ENABLED* is false, ;;; and *ALLOW-WITH-INTERRUPTS* is true. diff --git a/src/pcl/methods.lisp b/src/pcl/methods.lisp index c316260..e6b08db 100644 --- a/src/pcl/methods.lisp +++ b/src/pcl/methods.lisp @@ -1639,8 +1639,10 @@ (t (multiple-value-bind (dfun cache info) (make-final-dfun-internal gf - (list (list (find-class 'sb-kernel::control-stack-exhausted)) - (list (find-class 'sb-kernel::heap-exhausted-error)) + (list (list (find-class + 'sb-kernel::control-stack-exhausted)) + (list (find-class + 'sb-kernel::heap-exhausted-error)) (list (find-class 'restart)))) (setq po-cache cache) (set-dfun gf dfun cache info)))))) diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c index 7843e0b..fb15c4b 100644 --- a/src/runtime/alloc.c +++ b/src/runtime/alloc.c @@ -99,7 +99,8 @@ alloc_unboxed(int type, int words) { lispobj *result; - result = pa_alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj)), UNBOXED_PAGE_FLAG); + result = pa_alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj)), + UNBOXED_PAGE_FLAG); *result = (lispobj) (words << N_WIDETAG_BITS) | type; return result; } @@ -110,7 +111,8 @@ alloc_vector(int type, int length, int size, int page_type_flag) struct vector *result; result = (struct vector *) - pa_alloc(ALIGNED_SIZE((2 + (length*size + 31) / 32) * sizeof(lispobj)), page_type_flag); + pa_alloc(ALIGNED_SIZE((2 + (length*size + 31) / 32) * sizeof(lispobj)), + page_type_flag); result->header = type; result->length = make_fixnum(length); @@ -122,7 +124,8 @@ lispobj alloc_cons(lispobj car, lispobj cdr) { struct cons *ptr = - (struct cons *)pa_alloc(ALIGNED_SIZE(sizeof(struct cons)), BOXED_PAGE_FLAG); + (struct cons *)pa_alloc(ALIGNED_SIZE(sizeof(struct cons)), + BOXED_PAGE_FLAG); ptr->car = car; ptr->cdr = cdr; @@ -150,7 +153,8 @@ lispobj alloc_base_string(char *str) { int len = strlen(str); - lispobj result = alloc_vector(SIMPLE_BASE_STRING_WIDETAG, len+1, 8, UNBOXED_PAGE_FLAG); + lispobj result = alloc_vector(SIMPLE_BASE_STRING_WIDETAG, len+1, 8, + UNBOXED_PAGE_FLAG); struct vector *vec = (struct vector *)native_pointer(result); vec->length = make_fixnum(len); @@ -172,13 +176,15 @@ alloc_sap(void *ptr) lispobj alloc_code_object (unsigned boxed, unsigned unboxed) { struct code * code; - boxed = make_fixnum(boxed + 1 + 4); /* 4 == trace_table_offset offset in words */ + /* 4 == trace_table_offset offset in words */ + boxed = make_fixnum(boxed + 1 + 4); boxed &= ~LOWTAG_MASK; unboxed += LOWTAG_MASK; unboxed &= ~LOWTAG_MASK; - code = (struct code *) pa_alloc(ALIGNED_SIZE((boxed + unboxed) * sizeof(lispobj)), + code = (struct code *)pa_alloc(ALIGNED_SIZE((boxed + unboxed) * + sizeof(lispobj)), CODE_PAGE_FLAG); boxed = boxed << (N_WIDETAG_BITS - WORD_SHIFT); diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 1e95741..584cee2 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -277,7 +277,8 @@ fake_foreign_function_call(os_context_t *context) dynamic_space_free_pointer = (lispobj *)(unsigned long) (*os_context_register_addr(context, reg_ALLOC)); - /* fprintf(stderr,"dynamic_space_free_pointer: %p\n", dynamic_space_free_pointer); */ +/* fprintf(stderr,"dynamic_space_free_pointer: %p\n", */ +/* dynamic_space_free_pointer); */ #if defined(LISP_FEATURE_ALPHA) || defined(LISP_FEATURE_MIPS) if ((long)dynamic_space_free_pointer & 1) { lose("dead in fake_foreign_function_call, context = %x\n", context); @@ -341,7 +342,8 @@ undo_fake_foreign_function_call(os_context_t *context) | (*os_context_register_addr(context, reg_ALLOC) & LOWTAG_MASK); /* - ((unsigned long)(*os_context_register_addr(context, reg_ALLOC)) & ~LOWTAG_MASK) + ((unsigned long)(*os_context_register_addr(context, reg_ALLOC)) + & ~LOWTAG_MASK) | ((unsigned long) dynamic_space_free_pointer & LOWTAG_MASK); */ #endif @@ -675,7 +677,8 @@ store_signal_data_for_later (struct interrupt_data *data, void *handler, if(info) memcpy(&(data->pending_info), info, sizeof(siginfo_t)); - FSHOW_SIGNAL((stderr, "/store_signal_data_for_later: signal: %d\n", signal)); + FSHOW_SIGNAL((stderr, "/store_signal_data_for_later: signal: %d\n", + signal)); if(context) { /* the signal mask in the context (from before we were @@ -704,7 +707,8 @@ maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) } static void -low_level_interrupt_handle_now(int signal, siginfo_t *info, os_context_t *context) +low_level_interrupt_handle_now(int signal, siginfo_t *info, + os_context_t *context) { /* No FP control fixage needed, caller has done that. */ check_blockables_blocked_or_lose(); @@ -1010,7 +1014,8 @@ interrupt_thread_handler(int num, siginfo_t *info, void *v_context) /* let the handler enable interrupts again when it sees fit */ sigaddset_deferrable(os_context_sigmask_addr(context)); - arrange_return_to_lisp_function(context, StaticSymbolFunction(RUN_INTERRUPTION)); + arrange_return_to_lisp_function(context, + StaticSymbolFunction(RUN_INTERRUPTION)); } #endif @@ -1295,7 +1300,8 @@ lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr) * now -- some address is better then no address in this case. */ current_memory_fault_address = addr; - arrange_return_to_lisp_function(context, StaticSymbolFunction(MEMORY_FAULT_ERROR)); + arrange_return_to_lisp_function(context, + StaticSymbolFunction(MEMORY_FAULT_ERROR)); } #endif diff --git a/src/runtime/interrupt.h b/src/runtime/interrupt.h index ff649ce..fb115e5 100644 --- a/src/runtime/interrupt.h +++ b/src/runtime/interrupt.h @@ -126,7 +126,8 @@ extern void block_blockable_signals(void); extern void handle_trap(os_context_t *context, int trap); #ifndef LISP_FEATURE_WIN32 -extern void lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr); +extern void lisp_memory_fault_error(os_context_t *context, + os_vm_address_t addr); #endif #endif diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index 09e92c8..fba25c0 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -309,8 +309,10 @@ main(int argc, char *argv[], char *envp[]) if (errno) lose("argument to --dynamic-space-size is not a number"); # ifdef MAX_DYNAMIC_SPACE_END - if (!((DYNAMIC_SPACE_START < DYNAMIC_SPACE_START+dynamic_space_size) && - (DYNAMIC_SPACE_START+dynamic_space_size <= MAX_DYNAMIC_SPACE_END))) + if (!((DYNAMIC_SPACE_START < + DYNAMIC_SPACE_START+dynamic_space_size) && + (DYNAMIC_SPACE_START+dynamic_space_size <= + MAX_DYNAMIC_SPACE_END))) lose("specified --dynamic-space-size too large"); # endif } else if (0 == strcmp(arg, "--control-stack-size")) { @@ -433,8 +435,8 @@ main(int argc, char *argv[], char *envp[]) lose("couldn't find initial function\n"); } #ifdef LISP_FEATURE_HPUX - /* -1 = CLOSURE_FUN_OFFSET, 23 = SIMPLE_FUN_CODE_OFFSET, we are not in LANGUAGE_ASSEMBLY - so we cant reach them. */ + /* -1 = CLOSURE_FUN_OFFSET, 23 = SIMPLE_FUN_CODE_OFFSET, we are + * not in LANGUAGE_ASSEMBLY so we cant reach them. */ return_from_lisp_stub = (void *) ((char *)*((unsigned long *) ((char *)initial_function + -1)) + 23); #endif diff --git a/src/runtime/validate.c b/src/runtime/validate.c index 0efa39f..d901625 100644 --- a/src/runtime/validate.c +++ b/src/runtime/validate.c @@ -70,7 +70,8 @@ validate(void) #endif #ifdef LISP_FEATURE_LINKAGE_TABLE - ensure_space( (lispobj *)LINKAGE_TABLE_SPACE_START, LINKAGE_TABLE_SPACE_SIZE); + ensure_space( (lispobj *)LINKAGE_TABLE_SPACE_START, + LINKAGE_TABLE_SPACE_SIZE); #endif #ifdef LISP_FEATURE_OS_PROVIDES_DLOPEN @@ -110,7 +111,8 @@ protect_control_stack_guard_page_thread(int protect_p, struct thread *th) { } void -protect_control_stack_return_guard_page_thread(int protect_p, struct thread* th) { +protect_control_stack_return_guard_page_thread(int protect_p, + struct thread* th) { os_protect(CONTROL_STACK_RETURN_GUARD_PAGE(th), os_vm_page_size,protect_p ? (OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) : OS_VM_PROT_ALL); diff --git a/src/runtime/validate.h b/src/runtime/validate.h index a669ba3..b0f9122 100644 --- a/src/runtime/validate.h +++ b/src/runtime/validate.h @@ -51,8 +51,10 @@ extern void validate(void); extern void protect_control_stack_guard_page(int protect_p); extern void protect_control_stack_return_guard_page(int protect_p); -extern void protect_control_stack_guard_page_thread(int protect_p, struct thread *th); -extern void protect_control_stack_return_guard_page_thread(int protect_p, struct thread* th); +extern void protect_control_stack_guard_page_thread(int protect_p, + struct thread *th); +extern void protect_control_stack_return_guard_page_thread(int protect_p, + struct thread* th); extern os_vm_address_t undefined_alien_address; #endif diff --git a/version.lisp-expr b/version.lisp-expr index f55c62c..daa647a 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.25.12" +"1.0.25.13" -- 1.7.10.4