diff --git a/assembly/x86/array.lisp b/assembly/x86/array.lisp index 49a996f9a674753d5e6f6c34d8f0b7b69fb5340a..01cabe71be51734df14e01b1ebf0210b39f6849f 100644 --- a/assembly/x86/array.lisp +++ b/assembly/x86/array.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/array.lisp,v 1.5 1997/11/19 02:57:17 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/array.lisp,v 1.6 1997/12/05 06:53:13 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -61,10 +61,7 @@ (:temp eax dword-reg eax-offset)) (declare (ignore result esi ecx eax)) (loadw length string vector-length-slot other-pointer-type) - ;; zzzzz this appears to be busted - ;; (inst jmp nil (make-fixup 'sxhash-simple-substring :assembly-routine)) - ;; just fall through??? - ) + (inst jmp (make-fixup 'sxhash-simple-substring :assembly-routine))) (define-assembly-routine (sxhash-simple-substring (:translate %sxhash-simple-substring) @@ -79,10 +76,9 @@ (:temp ecx dword-reg ecx-offset) (:temp eax dword-reg eax-offset)) ;; Compute a pointer to where we are going to be extracting the bits. - (inst lea esi - (make-ea :byte :base string - :disp (- (* vector-data-offset word-bytes) - other-pointer-type))) + (inst lea esi (make-ea :byte :base string + :disp (- (* vector-data-offset word-bytes) + other-pointer-type))) ;; Initialize the result. (inst xor result result) ;; Get the count. If it's zero, blow out. diff --git a/assembly/x86/assem-rtns.lisp b/assembly/x86/assem-rtns.lisp index 556d2210922b373eafb43bfbdb580dbab3ca328e..002c54c143dcee5f0aa0ce9b46f69595df5fed37 100644 --- a/assembly/x86/assem-rtns.lisp +++ b/assembly/x86/assem-rtns.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/assem-rtns.lisp,v 1.3 1997/11/21 12:26:48 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/assem-rtns.lisp,v 1.4 1997/12/05 06:53:14 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -196,10 +196,9 @@ (pushw ebp-tn -2) ;; And away we go. - (inst jmp - (make-ea :byte :base eax :disp (- (* closure-function-slot word-bytes) - function-pointer-type))) - ) + (inst jmp (make-ea :byte :base eax + :disp (- (* closure-function-slot word-bytes) + function-pointer-type)))) @@ -227,13 +226,9 @@ (inst jmp loop) EXIT - - ;; hear eax points to catch block containing symbol pointed to by edx - ;; (inst jmp-near (make-fixup 'unwind :assembly-routine)) -- jrd - ;; - ;; fall into unwind - ) + ;; Hear EAX points to catch block containing symbol pointed to by EDX. + (inst jmp (make-fixup 'unwind :assembly-routine))) ;;;; Non-local exit noise.