From 0395b7894e8dbb056262ca59a816963733623c34 Mon Sep 17 00:00:00 2001 From: Brian Downing Date: Thu, 26 Oct 2006 03:22:21 +0000 Subject: [PATCH] 0.9.18.3: Canonicalize whitespace. --- package-data-list.lisp-expr | 6 +-- src/code/float-trap.lisp | 8 ++-- src/code/target-exception.lisp | 2 +- src/runtime/win32-os.c | 80 ++++++++++++++++++++-------------------- version.lisp-expr | 2 +- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr index cad8f2a..ec1aa1f 100644 --- a/package-data-list.lisp-expr +++ b/package-data-list.lisp-expr @@ -1501,7 +1501,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries." "FDEFN-MAKUNBOUND" "OUTER-FDEFN" "%COERCE-CALLABLE-TO-FUN" "FUN-SUBTYPE" "*MAXIMUM-ERROR-DEPTH*" "%SET-SYMBOL-PLIST" - "INFINITE-ERROR-PROTECT" + "INFINITE-ERROR-PROTECT" "FIND-CALLER-NAME-AND-FRAME" "FIND-INTERRUPTED-NAME-AND-FRAME" "%SET-SYMBOL-VALUE" "%SET-SYMBOL-PACKAGE" @@ -1596,9 +1596,9 @@ is a good idea, but see SB-SYS re. blurring of boundaries." "STREAM-COLD-INIT-OR-RESET" ;; Cleanups to run before saving a core - "DEBUG-DEINIT" + "DEBUG-DEINIT" "FLOAT-DEINIT" - "FOREIGN-DEINIT" + "FOREIGN-DEINIT" "PROFILE-DEINIT" ;; Note: These are out of lexicographical order diff --git a/src/code/float-trap.lisp b/src/code/float-trap.lisp index 0211aa7..23c5e76 100644 --- a/src/code/float-trap.lisp +++ b/src/code/float-trap.lisp @@ -55,7 +55,7 @@ (defun (setf floating-point-modes) (new) (setf (floating-point-modes) new))) -(defun set-floating-point-modes (&key +(defun set-floating-point-modes (&key (traps nil traps-p) (rounding-mode nil round-p) (current-exceptions nil current-x-p) @@ -89,12 +89,12 @@ preserved. Possible keywords: have this feature, and some SBCL ports don't implement it anyway -- in such cases the value is always NIL. -:PRECISION (x86 only) +:PRECISION (x86 only) :24-bit, :53-bit and :64-bit, for the internal precision of the mantissa. GET-FLOATING-POINT-MODES may be used to find the floating point modes currently in effect. SAVE-LISP-AND-DIE preserves the floating point modes -in effect." +in effect." (let ((modes (floating-point-modes))) (when traps-p (setf (ldb float-traps-byte modes) (float-trap-mask traps))) @@ -126,7 +126,7 @@ in effect." "This function returns a list representing the state of the floating point modes. The list is in the same format as the &KEY arguments to SET-FLOATING-POINT-MODES, i.e. - + (apply #'set-floating-point-modes (get-floating-point-modes)) sets the floating point modes to their current values (and thus is a no-op)." diff --git a/src/code/target-exception.lisp b/src/code/target-exception.lisp index f01acf7..397bf53 100644 --- a/src/code/target-exception.lisp +++ b/src/code/target-exception.lisp @@ -73,7 +73,7 @@ (sb!debug:*stack-top-hint* (nth-value 1 (sb!kernel:find-interrupted-name-and-frame)))) (if condition-name (error condition-name) - (error "An exception occurred in context ~S: ~S. (Exception code: ~S)" + (error "An exception occurred in context ~S: ~S. (Exception code: ~S)" context-sap exception-record-sap code)))) ;;;; etc. diff --git a/src/runtime/win32-os.c b/src/runtime/win32-os.c index 3689a21..f43af0d 100644 --- a/src/runtime/win32-os.c +++ b/src/runtime/win32-os.c @@ -334,9 +334,9 @@ EXCEPTION_DISPOSITION sigtrap_emulator(CONTEXT *context, memcpy(context, &exception_frame->context, sizeof(CONTEXT)); return ExceptionContinueExecution; - } else { - /* Not a trap_ContextRestore, must be a sigtrap. - * sigtrap_trampoline is defined in x86-assem.S. */ + } else { + /* Not a trap_ContextRestore, must be a sigtrap. + * sigtrap_trampoline is defined in x86-assem.S. */ extern void sigtrap_trampoline; /* @@ -366,13 +366,13 @@ EXCEPTION_DISPOSITION sigtrap_emulator(CONTEXT *context, * that we don't switch stacks for exception processing...) */ memcpy(&exception_frame->context, context, sizeof(CONTEXT)); - /* FIXME: Why do we save the old EIP in EAX? The sigtrap_trampoline - * pushes it into stack, but the sigtrap_wrapper where the trampoline - * goes ignores it, and after the wrapper we hit the trap_ContextRestore, - * which nukes the whole context with the original one? - * - * Am I misreading this, or is the EAX here and in the - * trampoline superfluous? --NS 20061024 */ + /* FIXME: Why do we save the old EIP in EAX? The sigtrap_trampoline + * pushes it into stack, but the sigtrap_wrapper where the trampoline + * goes ignores it, and after the wrapper we hit the trap_ContextRestore, + * which nukes the whole context with the original one? + * + * Am I misreading this, or is the EAX here and in the + * trampoline superfluous? --NS 20061024 */ context->Eax = context->Eip; context->Eip = (unsigned long)&sigtrap_trampoline; @@ -421,30 +421,30 @@ EXCEPTION_DISPOSITION handle_exception(EXCEPTION_RECORD *exception_record, /* For EXCEPTION_ACCESS_VIOLATION only. */ void *fault_address = (void *)exception_record->ExceptionInformation[1]; - + if (exception_record->ExceptionCode == EXCEPTION_BREAKPOINT) { /* Pick off sigtrap case first. */ return sigtrap_emulator(context, exception_frame); - } + } else if (exception_record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && - (is_valid_lisp_addr(fault_address) || - is_linkage_table_addr(fault_address))) { - /* Pick off GC-related memory fault next. */ - MEMORY_BASIC_INFORMATION mem_info; - - if (!VirtualQuery(fault_address, &mem_info, sizeof mem_info)) { - fprintf(stderr, "VirtualQuery: 0x%lx.\n", GetLastError()); - lose("handle_exception: VirtualQuery failure"); - } - - if (mem_info.State == MEM_RESERVE) { - /* First use new page, lets get some memory for it. */ - if (!VirtualAlloc(mem_info.BaseAddress, os_vm_page_size, - MEM_COMMIT, PAGE_EXECUTE_READWRITE)) { - fprintf(stderr, "VirtualAlloc: 0x%lx.\n", GetLastError()); + (is_valid_lisp_addr(fault_address) || + is_linkage_table_addr(fault_address))) { + /* Pick off GC-related memory fault next. */ + MEMORY_BASIC_INFORMATION mem_info; + + if (!VirtualQuery(fault_address, &mem_info, sizeof mem_info)) { + fprintf(stderr, "VirtualQuery: 0x%lx.\n", GetLastError()); + lose("handle_exception: VirtualQuery failure"); + } + + if (mem_info.State == MEM_RESERVE) { + /* First use new page, lets get some memory for it. */ + if (!VirtualAlloc(mem_info.BaseAddress, os_vm_page_size, + MEM_COMMIT, PAGE_EXECUTE_READWRITE)) { + fprintf(stderr, "VirtualAlloc: 0x%lx.\n", GetLastError()); lose("handle_exception: VirtualAlloc failure"); - + } else { /* * Now, if the page is supposedly write-protected and this @@ -469,13 +469,13 @@ EXCEPTION_DISPOSITION handle_exception(EXCEPTION_RECORD *exception_record, /* All else failed, drop through to the lisp-side exception handler. */ } - + /* * If we fall through to here then we need to either forward * the exception to the lisp-side exception handler if it's * set up, or drop to LDB. */ - + if (internal_errors_enabled) { /* exception_trampoline is defined in x86-assem.S. */ extern void exception_trampoline; @@ -485,26 +485,26 @@ EXCEPTION_DISPOSITION handle_exception(EXCEPTION_RECORD *exception_record, * marbles to be able to handle exceptions, but xceptions * aren't supposed to happen during cold init or reinit * anyway. - * + * * We use the same mechanism as the sigtrap emulator above * with just a couple changes. We obviously use a different * trampoline and wrapper function, we kill out any live * floating point exceptions, and we save off the exception * record as well as the context. */ - /* Save off context and exception information */ + /* Save off context and exception information */ memcpy(&exception_frame->context, context, sizeof(CONTEXT)); memcpy(&exception_frame->exception, exception_record, sizeof(EXCEPTION_RECORD)); /* Set up to activate trampoline when we return - * - * FIXME: Why do we save the old EIP in EAX? The - * exception_trampoline pushes it into stack, but the wrapper - * where the trampoline goes ignores it, and then the wrapper - * unwinds from Lisp... WTF? - * - * Am I misreading this, or is the EAX here and in the - * trampoline superfluous? --NS 20061024 */ + * + * FIXME: Why do we save the old EIP in EAX? The + * exception_trampoline pushes it into stack, but the wrapper + * where the trampoline goes ignores it, and then the wrapper + * unwinds from Lisp... WTF? + * + * Am I misreading this, or is the EAX here and in the + * trampoline superfluous? --NS 20061024 */ context->Eax = context->Eip; context->Eip = (unsigned long)&exception_trampoline; diff --git a/version.lisp-expr b/version.lisp-expr index 1499e00..cab40b0 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".) -"0.9.18.2" +"0.9.18.3" -- 1.7.10.4