# HG changeset patch # User Steve Losh # Date 1462838711 0 # Node ID 9becedc43e4d01bc8e4311f5092f4001fcd6ab67 # Parent 6392237bf4171c1d07b79ec8f4dcbe59887800f5 I can't spell diff -r 6392237bf417 -r 9becedc43e4d src/wam/constants.lisp --- a/src/wam/constants.lisp Tue May 10 00:00:53 2016 +0000 +++ b/src/wam/constants.lisp Tue May 10 00:05:11 2016 +0000 @@ -19,9 +19,9 @@ (define-constant +code-limit+ (expt 2 +code-word-size+) :documentation "Maximum size of the WAM code store.") -(define-constant +code-sentinal+ (1- +code-limit+) - ; TODO: Should this sentinal value be 0 like everything else? - :documentation "Sentinal value used in the PC and CP.") +(define-constant +code-sentinel+ (1- +code-limit+) + ; TODO: Should this sentinel value be 0 like everything else? + :documentation "Sentinel value used in the PC and CP.") (define-constant +tag-null+ #b00 diff -r 6392237bf417 -r 9becedc43e4d src/wam/types.lisp --- a/src/wam/types.lisp Tue May 10 00:00:53 2016 +0000 +++ b/src/wam/types.lisp Tue May 10 00:05:11 2016 +0000 @@ -40,7 +40,7 @@ `(unsigned-byte ,+code-word-size+)) (deftype code-index () - ;; either an address or the sentinal + ;; either an address or the sentinel `(integer 0 ,(1- +code-limit+))) diff -r 6392237bf417 -r 9becedc43e4d src/wam/vm.lisp --- a/src/wam/vm.lisp Tue May 10 00:00:53 2016 +0000 +++ b/src/wam/vm.lisp Tue May 10 00:05:11 2016 +0000 @@ -530,7 +530,7 @@ `(instruction-call wam ,inst code pc ,args))) (loop :while (and (not (wam-fail wam)) ; failure - (not (= pc +code-sentinal+))) ; finished + (not (= pc +code-sentinel+))) ; finished :for opcode = (aref code pc) :do (block op @@ -604,7 +604,7 @@ (wam-reset! wam) (wam-load-query-code! wam code) (setf (wam-program-counter wam) 0 - (wam-continuation-pointer wam) +code-sentinal+) + (wam-continuation-pointer wam) +code-sentinel+) (when *step* (format *debug-io* "Built query code:~%") (dump-code-store wam code)) diff -r 6392237bf417 -r 9becedc43e4d src/wam/wam.lisp --- a/src/wam/wam.lisp Tue May 10 00:00:53 2016 +0000 +++ b/src/wam/wam.lisp Tue May 10 00:05:11 2016 +0000 @@ -119,7 +119,7 @@ ;;; and stack have been accounted for. Because the store is adjustable and the ;;; heap lives at the end of it, the heap can grow if necessary. ;;; -;;; We reserve the first address in the heap as a sentinal, as an "unset" value +;;; We reserve the first address in the heap as a sentinel, as an "unset" value ;;; for various pointers into the heap. (defun* wam-heap-pointer-unset-p ((wam wam) (address heap-index)) @@ -201,7 +201,7 @@ ;;; The stack is stored as a fixed-length hunk of the main WAM store array, ;;; between the local register and the heap, with small glitch: we reserve the ;;; first word of the stack (address `+stack-start`) to mean "uninitialized", so -;;; we have a nice sentinal value for the various pointers into the stack. +;;; we have a nice sentinel value for the various pointers into the stack. (declaim (inline wam-stack-word))