From 00a72df911b4089d1bce75684d2ee8da9937447d Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Tue, 5 Dec 2006 22:48:11 +0000 Subject: [PATCH] 1.0.0.25: fix win32 build * Memory faults signalled differently on Windows -- and not using a separate condition yet. --- src/code/interr.lisp | 2 ++ src/code/target-exception.lisp | 3 ++- version.lisp-expr | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/code/interr.lisp b/src/code/interr.lisp index 6bfbf65..8614280 100644 --- a/src/code/interr.lisp +++ b/src/code/interr.lisp @@ -474,8 +474,10 @@ (defun undefined-alien-function-error () (error 'undefined-alien-function-error)) +#!-win32 (define-alien-variable current-memory-fault-address long) +#!-win32 (defun memory-fault-error () (error 'memory-fault-error :address current-memory-fault-address)) diff --git a/src/code/target-exception.lisp b/src/code/target-exception.lisp index 4a04e4b..803a758 100644 --- a/src/code/target-exception.lisp +++ b/src/code/target-exception.lisp @@ -58,7 +58,8 @@ (cons +exception-stack-overflow+ 'sb!kernel::control-stack-exhausted) ;; Various (cons-name +exception-single-step+) - (cons-name +exception-access-violation+) + (cons-name +exception-access-violation+) ; FIXME: should turn into MEMORY-FAULT-ERROR + ; plus the faulting address (cons-name +exception-array-bounds-exceeded+) (cons-name +exception-breakpoint+) (cons-name +exception-datatype-misalignment+) diff --git a/version.lisp-expr b/version.lisp-expr index d51690c..7262125 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.0.24" +"1.0.0.25" -- 1.7.10.4