Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv11860
Modified Files: debugger.lisp Log Message: Fixed a stupid bug in match-code-pattern.
Date: Thu Jun 10 08:06:52 2004 Author: ffjeld
Index: movitz/losp/x86-pc/debugger.lisp diff -u movitz/losp/x86-pc/debugger.lisp:1.11 movitz/losp/x86-pc/debugger.lisp:1.12 --- movitz/losp/x86-pc/debugger.lisp:1.11 Wed Jun 2 07:31:20 2004 +++ movitz/losp/x86-pc/debugger.lisp Thu Jun 10 08:06:52 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld frodef@acm.org ;;;; Created at: Fri Nov 22 10:09:18 2002 ;;;; -;;;; $Id: debugger.lisp,v 1.11 2004/06/02 14:31:20 ffjeld Exp $ +;;;; $Id: debugger.lisp,v 1.12 2004/06/10 15:06:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------
@@ -177,7 +177,7 @@ (setf result-register (second p) result-position (third p))) (:or - (dolist (sub-pattern (cdr p) (return nil)) + (dolist (sub-pattern (cdr p)) (multiple-value-bind (success-p sub-result-register sub-result-position new-ip) (match-code-pattern sub-pattern code-vector ip register) (when success-p @@ -185,7 +185,8 @@ (setf result-register sub-result-register result-position sub-result-position)) (setf ip new-ip) - (return))))) + (return)))) + (return nil)) (:* (let ((max-times (second p)) ; (:kleene-star <max-times> <sub-pattern>) (sub-pattern (third p))) (dotimes (i max-times) @@ -484,11 +485,11 @@ (function (let ((delta (code-vector-offset (funobj-code-vector funobj) eip))) (if delta - (format t "{Interrupt ~D in ~W at PC offset ~D." + (format t "{Exception ~D in ~W at PC offset ~D." exception (funobj-name funobj) delta) - (format t "{Interrupt ~D in ~W at EIP=#x~X. [#x~X]}" + (format t "{Exception ~D in ~W at EIP=#x~X. [#x~X]}" exception (funobj-name funobj) eip interrupt-frame)))) - (t (format t "{Interrupt ~D with ESI=#x~Z and EIP=#x~X. [#x~X]}" + (t (format t "{Exception ~D with ESI=#x~Z and EIP=#x~X. [#x~X]}" exception funobj eip interrupt-frame)))))))) (function (let ((name (funobj-name funobj)))