[git] CMU Common Lisp branch master updated. snapshot-2014-05-2-ga9839fa

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via a9839fad10044fc37d2ab1b0b6e0c75d951ebc92 (commit) from 18e61a1940ee181a9583ded9044286d8b7983da7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a9839fad10044fc37d2ab1b0b6e0c75d951ebc92 Author: Raymond Toy <toy.raymond@gmail.com> Date: Wed May 7 19:50:55 2014 -0700 Unuse the "UNIX" package from "VM". Only ppc, sparc, and x86 are tested, but I changed the rest anyway. diff --git a/src/code/alpha-vm.lisp b/src/code/alpha-vm.lisp index d239153..48e0275 100644 --- a/src/code/alpha-vm.lisp +++ b/src/code/alpha-vm.lisp @@ -17,7 +17,6 @@ (use-package "SYSTEM") (use-package "ALIEN") (use-package "C-CALL") -(use-package "UNIX") (intl:textdomain "cmucl") @@ -29,7 +28,7 @@  ;;;; The sigcontext structure. -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-onstack unsigned-long) (sc-mask unsigned-long) @@ -114,8 +113,8 @@ ;;; instruction stream. ;;; (defun internal-error-arguments (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((pc (slot scp 'sc-pc))) (declare (type system-area-pointer pc)) (let* ((length (sap-ref-8 pc 4)) @@ -141,8 +140,8 @@ ;;; SIGCONTEXT-PROGRAM-COUNTER -- Interface. ;;; (defun sigcontext-program-counter (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'sc-pc))) ;;; SIGCONTEXT-REGISTER -- Interface. @@ -151,13 +150,13 @@ ;;; interrupts. ;;; (defun sigcontext-register (scp index) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (deref (slot scp 'sc-regs) index))) (defun %set-sigcontext-register (scp index new) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (setf (deref (slot scp 'sc-regs) index) new) new)) @@ -170,16 +169,16 @@ ;;; Format is the type of float to return. ;;; (defun sigcontext-float-register (scp index format) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot scp 'sc-fpregs)))) (ecase format (single-float (system:sap-ref-single sap (* index vm:word-bytes))) (double-float (system:sap-ref-double sap (* index vm:word-bytes))))))) ;;; (defun %set-sigcontext-float-register (scp index format new-value) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot scp 'sc-fpregs)))) (ecase format (single-float @@ -196,8 +195,8 @@ ;;; same format as returned by FLOATING-POINT-MODES. ;;; (defun sigcontext-floating-point-modes (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'sc-fpcr))) diff --git a/src/code/amd64-vm.lisp b/src/code/amd64-vm.lisp index ba40945..df33f85 100644 --- a/src/code/amd64-vm.lisp +++ b/src/code/amd64-vm.lisp @@ -21,7 +21,6 @@ (use-package "SYSTEM") (use-package "ALIEN") (use-package "C-CALL") -(use-package "UNIX") (use-package "KERNEL") (intl:textdomain "cmucl") @@ -58,7 +57,7 @@ (status unsigned-long))) #+freebsd -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-mask (array unsigned-int 4)) (sc-onstack unsigned-int) @@ -84,7 +83,7 @@ ;;; OpenBSD/NetBSD also have sigcontext structs that look more like Linux. #+openbsd -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-gs unsigned-int) (sc-fs unsigned-int) @@ -109,7 +108,7 @@ )) #+netbsd -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-gs unsigned-int) (sc-fs unsigned-int) @@ -138,7 +137,7 @@ ;; For Linux... #+linux -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-r8 unsigned-long) (sc-r9 unsigned-long) @@ -306,8 +305,8 @@ ;;; instruction stream. ;;; (defun internal-error-arguments (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((pc (int-sap (slot scp 'sc-pc)))) (declare (type system-area-pointer pc)) ;; using INT3 the pc is .. INT3 <here> code length bytes... @@ -334,8 +333,8 @@ ;;; SIGCONTEXT-PROGRAM-COUNTER -- Interface. ;;; (defun sigcontext-program-counter (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (int-sap (slot scp 'sc-pc)))) ;;; SIGCONTEXT-REGISTER -- Interface. @@ -345,8 +344,8 @@ ;;; (defun sigcontext-register (scp index) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (case index ; ugly -- I know. (#.eax-offset (slot scp 'sc-eax)) (#.ecx-offset (slot scp 'sc-ecx)) @@ -359,8 +358,8 @@ (defun %set-sigcontext-register (scp index new) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (case index (#.eax-offset (setf (slot scp 'sc-eax) new)) (#.ecx-offset (setf (slot scp 'sc-ecx) new)) @@ -382,8 +381,8 @@ ;;; #+linux (defun sigcontext-float-register (scp index format) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((reg-sap (alien-sap (deref (slot (deref (slot scp 'fpstate) 0) 'fpreg) index)))) @@ -398,8 +397,8 @@ #+linux (defun %set-sigcontext-float-register (scp index format new-value) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((reg-sap (alien-sap (deref (slot (deref (slot scp 'fpstate) 0) 'fpreg) index)))) @@ -425,14 +424,14 @@ #+BSD (defun sigcontext-floating-point-modes (scp) - (declare (type (alien (* sigcontext)) scp) + (declare (type (alien (* unix:sigcontext)) scp) (ignore scp)) ;; This is broken until some future release of FreeBSD/OpenBSD!!! (floating-point-modes)) #+linux (defun sigcontext-floating-point-modes (scp) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (let ((cw (slot (deref (slot scp 'fpstate) 0) 'cw)) (sw (slot (deref (slot scp 'fpstate) 0) 'sw))) ;;(format t "cw = ~4x~%sw = ~4x~%" cw sw) diff --git a/src/code/hppa-vm.lisp b/src/code/hppa-vm.lisp index 59271c3..8b4fa59 100644 --- a/src/code/hppa-vm.lisp +++ b/src/code/hppa-vm.lisp @@ -15,7 +15,6 @@ (use-package "SYSTEM") (use-package "ALIEN") (use-package "C-CALL") -(use-package "UNIX") (intl:textdomain "cmucl") @@ -80,7 +79,7 @@ (sl-ss save-state))) #+hpux -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-sl siglocal) ; the rest of this structure left out (since save-state not complete?) @@ -94,7 +93,7 @@ (fpregs (array unsigned-long 32)))) #+MACH -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-onstack unsigned-long) (sc-mask unsigned-long) @@ -168,8 +167,8 @@ ;;; instruction stream. ;;; (defun internal-error-arguments (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((pc (sigcontext-program-counter scp))) (declare (type system-area-pointer pc)) (let* ((length (sap-ref-8 pc 4)) @@ -195,8 +194,8 @@ ;;; SIGCONTEXT-PROGRAM-COUNTER -- Interface ;;; (defun sigcontext-program-counter (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) #+hpux (int-sap (logandc2 (slot (slot (slot scp 'sc-sl) 'sl-ss) 'ss-pcoq-head) 3)) #+MACH @@ -209,8 +208,8 @@ ;;; interrupts. ;;; (defun sigcontext-register (scp index) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) #+hpux (deref (slot (slot (slot scp 'sc-sl) 'sl-ss) 'regs) index) #+MACH @@ -218,8 +217,8 @@ )) (defun %set-sigcontext-register (scp index new) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) #+hpux (setf (deref (slot (slot (slot scp 'sc-sl) 'sl-ss) 'regs) index) new) #+MACH @@ -235,21 +234,21 @@ ;;; Format is the type of float to return. ;;; (defun sigcontext-float-register (scp index format) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (error "sigcontext-float-register not implemented." scp index format) #+nil - (with-alien ((scp (* sigcontext) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot scp 'sc-fpregs)))) (ecase format (single-float (system:sap-ref-single sap (* index vm:word-bytes))) (double-float (system:sap-ref-double sap (* index vm:word-bytes))))))) ;;; (defun %set-sigcontext-float-register (scp index format new-value) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (error "%set-sigcontext-float-register not implemented." scp index format new-value) #+nil - (with-alien ((scp (* sigcontext) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot scp 'sc-fpregs)))) (ecase format (single-float @@ -266,10 +265,10 @@ ;;; same format as returned by FLOATING-POINT-MODES. ;;; (defun sigcontext-floating-point-modes (scp) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (error "sigcontext-floating-point-modes not implimented." scp) #+nil - (with-alien ((scp (* sigcontext) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'sc-fpc-csr))) diff --git a/src/code/pmax-vm.lisp b/src/code/pmax-vm.lisp index c48988b..8002b1b 100644 --- a/src/code/pmax-vm.lisp +++ b/src/code/pmax-vm.lisp @@ -17,7 +17,6 @@ (use-package "SYSTEM") (use-package "ALIEN") (use-package "C-CALL") -(use-package "UNIX") (intl:textdomain "cmucl") @@ -29,7 +28,7 @@  ;;;; The sigcontext structure. -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-onstack unsigned-long) (sc-mask unsigned-long) @@ -96,8 +95,8 @@ ;;; instruction stream. ;;; (defun internal-error-arguments (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((pc (slot scp 'sc-pc))) (declare (type system-area-pointer pc)) (when (logbitp 31 (slot scp 'sc-cause)) @@ -127,8 +126,8 @@ ;;; SIGCONTEXT-PROGRAM-COUNTER -- Interface. ;;; (defun sigcontext-program-counter (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'sc-pc))) ;;; SIGCONTEXT-REGISTER -- Interface. @@ -137,13 +136,13 @@ ;;; interrupts. ;;; (defun sigcontext-register (scp index) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (deref (slot scp 'sc-regs) index))) (defun %set-sigcontext-register (scp index new) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (setf (deref (slot scp 'sc-regs) index) new) new)) @@ -156,16 +155,16 @@ ;;; Format is the type of float to return. ;;; (defun sigcontext-float-register (scp index format) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot scp 'sc-fpregs)))) (ecase format (single-float (system:sap-ref-single sap (* index vm:word-bytes))) (double-float (system:sap-ref-double sap (* index vm:word-bytes))))))) ;;; (defun %set-sigcontext-float-register (scp index format new-value) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot scp 'sc-fpregs)))) (ecase format (single-float @@ -182,8 +181,8 @@ ;;; same format as returned by FLOATING-POINT-MODES. ;;; (defun sigcontext-floating-point-modes (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'sc-fpc-csr))) diff --git a/src/code/ppc-vm.lisp b/src/code/ppc-vm.lisp index fa6a643..6133533 100644 --- a/src/code/ppc-vm.lisp +++ b/src/code/ppc-vm.lisp @@ -15,7 +15,6 @@ ;;; (in-package "PPC") (use-package "SYSTEM") -(use-package "UNIX") (intl:textdomain "cmucl-ppc-vm") @@ -82,7 +81,7 @@ (pad5 (array unsigned-long 7)))) #-darwin -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-unused (array unsigned-long 4)) (sc-signal int) @@ -92,7 +91,7 @@ ;; Use the ucontext_t structure for Darwin #+darwin -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-onstack int) (sc-mask int) @@ -163,8 +162,8 @@ ;;; instruction stream. ;;; (defun internal-error-arguments (scp) - (declare (type (alien (* sigcontext)) scp)) - (let* ((pc (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (let* ((pc (with-alien ((scp (* unix:sigcontext) scp)) (slot (slot scp 'sc-regs) 'pc))) (bad-inst (sap-ref-32 pc 0)) (op (ldb (byte 16 16) bad-inst))) @@ -188,8 +187,8 @@ (values #.(error-number-or-lose 'unknown-error) nil))))) (defun args-for-unimp-inst (scp) - (declare (type (alien (* sigcontext)) scp)) - (let* ((pc (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (let* ((pc (with-alien ((scp (* unix:sigcontext) scp)) (slot (slot scp 'sc-regs) 'pc))) (length (sap-ref-8 pc 4)) (vector (make-array length :element-type '(unsigned-byte 8)))) @@ -216,8 +215,8 @@ ;;; SIGCONTEXT-PROGRAM-COUNTER -- Interface. ;;; (defun sigcontext-program-counter (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot (slot scp 'sc-regs) 'pc))) ;;; SIGCONTEXT-REGISTER -- Interface. @@ -226,13 +225,13 @@ ;;; interrupts. ;;; (defun sigcontext-register (scp index) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (deref (slot (slot scp 'sc-regs) 'regs) index))) (defun %set-sigcontext-register (scp index new) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (setf (deref (slot (slot scp 'sc-regs) 'regs) index) new) new)) @@ -240,8 +239,8 @@ ;; Extract the LR register from the sigcontext. (defun sigcontext-lr (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot (slot scp 'sc-regs) 'lr))) ;;; SIGCONTEXT-FLOAT-REGISTER -- Interface @@ -250,16 +249,16 @@ ;;; Format is the type of float to return. ;;; (defun sigcontext-float-register (scp index format) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot (slot scp 'sc-regs) 'fpregs)))) (ecase format (single-float (float (system:sap-ref-double sap (* index 2 ppc:word-bytes)) 0.0f0)) (double-float (system:sap-ref-double sap (* index 2 ppc:word-bytes))))))) ;;; (defun %set-sigcontext-float-register (scp index format new-value) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot (slot scp 'sc-regs) 'fpregs)))) (ecase format (single-float @@ -277,13 +276,13 @@ ;;; same format as returned by FLOATING-POINT-MODES. ;;; (defun sigcontext-floating-point-modes (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot (slot scp 'sc-regs) 'fpscr))) (defun %set-sigcontext-floating-point-modes (scp new-value) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (setf (slot (slot scp 'sc-regs) 'fpscr) new-value))) (defsetf sigcontext-floating-point-modes %set-sigcontext-floating-point-modes) diff --git a/src/code/sgi-vm.lisp b/src/code/sgi-vm.lisp index d3daa46..dd19d4e 100644 --- a/src/code/sgi-vm.lisp +++ b/src/code/sgi-vm.lisp @@ -17,7 +17,7 @@ (use-package "SYSTEM") (use-package "ALIEN") (use-package "C-CALL") -(use-package "UNIX") + (intl:textdomain "cmucl") (export '(fixup-code-object internal-error-arguments @@ -28,7 +28,7 @@  ;;;; The sigcontext structure. -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-regmask unsigned-int) (sc-status unsigned-int) @@ -102,8 +102,8 @@ ;;; instruction stream. ;;; (defun internal-error-arguments (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((pc (slot scp 'sc-pc))) (declare (type system-area-pointer pc)) (when (logbitp 31 (slot scp 'sc-cause)) @@ -133,8 +133,8 @@ ;;; SIGCONTEXT-PROGRAM-COUNTER -- Interface. ;;; (defun sigcontext-program-counter (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'sc-pc))) ;;; SIGCONTEXT-REGISTER -- Interface. @@ -143,13 +143,13 @@ ;;; interrupts. ;;; (defun sigcontext-register (scp index) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (deref (slot scp 'sc-regs) (1+ (* index 2))))) (defun %set-sigcontext-register (scp index new) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (setf (deref (slot scp 'sc-regs) (1+ (* index 2))) new) new)) @@ -162,8 +162,8 @@ ;;; Format is the type of float to return. ;;; (defun sigcontext-float-register (scp index format) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot scp 'sc-fpregs)))) (ecase format (single-float (system:sap-ref-single sap (+ 4 (* index vm:word-bytes @@ -172,8 +172,8 @@ 2)))))))) ;;; (defun %set-sigcontext-float-register (scp index format new-value) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot scp 'sc-fpregs)))) (ecase format (single-float @@ -191,8 +191,8 @@ ;;; same format as returned by FLOATING-POINT-MODES. ;;; (defun sigcontext-floating-point-modes (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'sc-fpc-csr))) diff --git a/src/code/sparc-svr4-vm.lisp b/src/code/sparc-svr4-vm.lisp index 646dbd4..5c92b96 100644 --- a/src/code/sparc-svr4-vm.lisp +++ b/src/code/sparc-svr4-vm.lisp @@ -13,7 +13,6 @@ ;;; (in-package "SPARC") (use-package "SYSTEM") -(use-package "UNIX") (intl:textdomain "cmucl-sparc-vm") @@ -80,7 +79,7 @@ ; includes; struct fpu. Because the fpu structure contains doubles, it ; must be aligned on 8 byte bounderies, consequently so must struct ; mcontext and struct ucontext. -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (uc-flags unsigned-long) (uc-link system-area-pointer) @@ -185,10 +184,10 @@ ;;; instruction stream. ;;; (defun internal-error-arguments (scp) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) ;(write "SCP = ") (write scp) ;(write "slot = ") (write (slot scp 'uc-pc)) - (let* ((pc (with-alien ((scp (* sigcontext) scp)) + (let* ((pc (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'uc-pc))) (bad-inst (sap-ref-32 pc 0)) (op (ldb (byte 2 30) bad-inst)) @@ -206,8 +205,8 @@ (values #.(error-number-or-lose 'unknown-error) nil))))) (defun args-for-unimp-inst (scp) - (declare (type (alien (* sigcontext)) scp)) - (let* ((pc (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (let* ((pc (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'uc-pc))) (length (sap-ref-8 pc 4)) (vector (make-array length :element-type '(unsigned-byte 8)))) @@ -228,7 +227,7 @@ (values error-number (sc-offsets)))))) (defun args-for-tagged-add-inst (scp bad-inst) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (let* ((rs1 (ldb (byte 5 14) bad-inst)) (op1 (di::make-lisp-obj (sigcontext-register scp rs1)))) (if (fixnump op1) @@ -264,8 +263,8 @@ ;;; sigcontext-PROGRAM-COUNTER -- Interface. ;;; (defun sigcontext-program-counter (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'uc-pc) )) @@ -275,8 +274,8 @@ ;;; interrupts. ;;; (defun sigcontext-register (scp index) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (if (zerop index) 0 (if (< index 16) @@ -289,8 +288,8 @@ (deref (slot (slot (slot scp 'uc-regs) 'regs2) 'uc-sp) (- index 16)))))) (defun %set-sigcontext-register (scp index new) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (if (zerop index) 0 (if (< index 16) @@ -316,8 +315,8 @@ ;;; (defun sigcontext-float-register (scp index format) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot scp 'fpregs)))) (ecase format (single-float @@ -342,8 +341,8 @@ (system:sap-ref-double fp-sap (* (- index 32) vm:word-bytes)))))))))) ;;; (defun %set-sigcontext-float-register (scp index format new-value) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot scp 'fpregs)))) (ecase format (single-float @@ -367,8 +366,8 @@ ;;; same format as returned by FLOATING-POINT-MODES. ;;; (defun sigcontext-floating-point-modes (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'fsr))) @@ -425,11 +424,11 @@ (defvar *scavenge-read-only-space* nil) (defun get-fp-fault-info (scp) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) ;; The FPQ structure in the context has the faulting FP address and ;; the faulting FP instruction. Return both. (let ((fpq (alien:sap-alien - (with-alien ((scp (* sigcontext) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'fpq)) (* fpq)))) (with-alien ((fpq (* fpq) fpq)) @@ -437,7 +436,7 @@ (slot fpq 'fpq-inst))))) (defun get-fp-operation (scp) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) ;; Get the offending FP instruction from the context. We return the ;; operation associated with the FP instruction, the precision of ;; the operation, and the operands of the instruction. @@ -480,7 +479,7 @@ (values fop format (fix-up-reg-index rs1) (fix-up-reg-index rs2))))))) (defun get-fp-operands (scp modes) - (declare (type (alien (* sigcontext)) scp) + (declare (type (alien (* unix:sigcontext)) scp) (ignore modes)) ;; From the offending FP instruction, get the operation and ;; operands, if we can. diff --git a/src/code/sparc-vm.lisp b/src/code/sparc-vm.lisp index 0c23e4b..68489fa 100644 --- a/src/code/sparc-vm.lisp +++ b/src/code/sparc-vm.lisp @@ -13,7 +13,6 @@ ;;; (in-package "SPARC") (use-package "SYSTEM") -(use-package "UNIX") (intl:textdomain "cmucl-sparc-vm") @@ -32,7 +31,7 @@ (y unsigned-long) (fsr unsigned-long))) -(def-alien-type sigcontext +(def-alien-type unix:sigcontext (struct nil (sc-onstack unsigned-long) (sc-mask unsigned-long) @@ -93,8 +92,8 @@ ;;; instruction stream. ;;; (defun internal-error-arguments (scp) - (declare (type (alien (* sigcontext)) scp)) - (let* ((pc (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (let* ((pc (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'sc-pc))) (bad-inst (sap-ref-32 pc 0)) (op (ldb (byte 2 30) bad-inst)) @@ -111,8 +110,8 @@ (values #.(error-number-or-lose 'unknown-error) nil))))) (defun args-for-unimp-inst (scp) - (declare (type (alien (* sigcontext)) scp)) - (let* ((pc (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (let* ((pc (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'sc-pc))) (length (sap-ref-8 pc 4)) (vector (make-array length :element-type '(unsigned-byte 8)))) @@ -133,7 +132,7 @@ (values error-number (sc-offsets)))))) (defun args-for-tagged-add-inst (scp bad-inst) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (let* ((rs1 (ldb (byte 5 14) bad-inst)) (op1 (di::make-lisp-obj (sigcontext-register scp rs1)))) (if (fixnump op1) @@ -169,8 +168,8 @@ ;;; SIGCONTEXT-PROGRAM-COUNTER -- Interface. ;;; (defun sigcontext-program-counter (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot scp 'sc-pc))) ;;; SIGCONTEXT-REGISTER -- Interface. @@ -179,13 +178,13 @@ ;;; interrupts. ;;; (defun sigcontext-register (scp index) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (deref (slot (slot scp 'sc-g1) 'regs) index))) (defun %set-sigcontext-register (scp index new) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (setf (deref (slot (slot scp 'sc-g1) 'regs) index) new) new)) @@ -198,8 +197,8 @@ ;;; Format is the type of float to return. ;;; (defun sigcontext-float-register (scp index format) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot (slot scp 'sc-g1) 'fpregs)))) (ecase format (single-float (system:sap-ref-single sap (* index vm:word-bytes))) @@ -208,8 +207,8 @@ (long-float (system:sap-ref-long sap (* index vm:word-bytes))))))) ;;; (defun %set-sigcontext-float-register (scp index format new-value) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((sap (alien-sap (slot (slot scp 'sc-g1) 'fpregs)))) (ecase format (single-float @@ -229,8 +228,8 @@ ;;; same format as returned by FLOATING-POINT-MODES. ;;; (defun sigcontext-floating-point-modes (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (slot (slot scp 'sc-g1) 'fsr))) diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp index 6b7c881..2171d60 100644 --- a/src/code/x86-vm.lisp +++ b/src/code/x86-vm.lisp @@ -21,7 +21,6 @@ (use-package "SYSTEM") (use-package "ALIEN") (use-package "C-CALL") -(use-package "UNIX") (use-package "KERNEL") (intl:textdomain "cmucl-x86-vm") @@ -46,7 +45,7 @@  ;;;; The sigcontext structure. -(def-alien-type sigcontext system-area-pointer) +(def-alien-type unix:sigcontext system-area-pointer) ;;;; Add machine specific features to *features* @@ -189,8 +188,8 @@ ;;; instruction stream. ;;; (defun internal-error-arguments (scp) - (declare (type (alien (* sigcontext)) scp)) - (with-alien ((scp (* sigcontext) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) + (with-alien ((scp (* unix:sigcontext) scp)) (let ((pc (sigcontext-program-counter scp))) (declare (type system-area-pointer pc)) ;; using INT3 the pc is .. INT3 <here> code length bytes... @@ -217,10 +216,10 @@ ;;; SIGCONTEXT-PROGRAM-COUNTER -- Interface. ;;; (defun sigcontext-program-counter (scp) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (let ((fn (extern-alien "os_sigcontext_pc" (function system-area-pointer - (* sigcontext))))) + (* unix:sigcontext))))) (sap-ref-sap (alien-funcall fn scp) 0))) ;;; SIGCONTEXT-REGISTER -- Interface. @@ -229,18 +228,18 @@ ;;; interrupts. ;;; (defun sigcontext-register (scp index) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (let ((fn (extern-alien "os_sigcontext_reg" (function system-area-pointer - (* sigcontext) + (* unix:sigcontext) (integer 32))))) (sap-ref-32 (alien-funcall fn scp index) 0))) (defun %set-sigcontext-register (scp index new) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (let ((fn (extern-alien "os_sigcontext_reg" (function system-area-pointer - (* sigcontext) + (* unix:sigcontext) (integer 32))))) (setf (sap-ref-32 (alien-funcall fn scp index) 0) new))) @@ -255,10 +254,10 @@ ;;; complex-single-float and complex-double-float. ;;; (defun sigcontext-float-register (scp index format) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (let ((fn (extern-alien "os_sigcontext_fpu_reg" (function system-area-pointer - (* sigcontext) + (* unix:sigcontext) (integer 32))))) #+x87 (coerce (sap-ref-long (alien-funcall fn scp index) 0) format) @@ -282,10 +281,10 @@ ;;; (defun %set-sigcontext-float-register (scp index format new) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (let ((fn (extern-alien "os_sigcontext_fpu_reg" (function system-area-pointer - (* sigcontext) + (* unix:sigcontext) (integer 32))))) (let* ((sap (alien-funcall fn scp index))) (if (< index 8) @@ -312,17 +311,17 @@ ;;; same format as returned by FLOATING-POINT-MODES. ;;; (defun sigcontext-floating-point-modes (scp) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (let ((fn (extern-alien "os_sigcontext_fpu_modes" (function (integer 32) - (* sigcontext))))) + (* unix:sigcontext))))) (alien-funcall fn scp))) (defun %set-sigcontext-floating-point-modes (scp new-mode) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) (let ((fn (extern-alien "os_set_sigcontext_fpu_modes" (function (integer 32) - (* sigcontext) + (* unix:sigcontext) c-call:unsigned-int)))) (alien-funcall fn scp new-mode) new-mode)) @@ -540,7 +539,7 @@ (in-package "X86") (defun get-fp-operation (scp) - (declare (type (alien (* sigcontext)) scp)) + (declare (type (alien (* unix:sigcontext)) scp)) ;; Get the instruction that caused the SIGFPE from the context. The ;; SIGFPE can be caused by either a floating-point operation or an ;; integer division (overflow). We return the operation associated @@ -683,7 +682,7 @@ (values nil nil nil)))))) (defun get-fp-operands (scp modes) - (declare (type (alien (* sigcontext)) scp) + (declare (type (alien (* unix:sigcontext)) scp) (ignore modes)) ;; From the offending FP instruction, get the operation and ;; operands, if we can. ----------------------------------------------------------------------- Summary of changes: src/code/alpha-vm.lisp | 31 +++++++++++++++-------------- src/code/amd64-vm.lisp | 37 +++++++++++++++++------------------ src/code/hppa-vm.lisp | 33 +++++++++++++++---------------- src/code/pmax-vm.lisp | 31 +++++++++++++++-------------- src/code/ppc-vm.lisp | 45 +++++++++++++++++++++---------------------- src/code/sgi-vm.lisp | 32 +++++++++++++++--------------- src/code/sparc-svr4-vm.lisp | 45 +++++++++++++++++++++---------------------- src/code/sparc-vm.lisp | 37 +++++++++++++++++------------------ src/code/x86-vm.lisp | 39 ++++++++++++++++++------------------- 9 files changed, 161 insertions(+), 169 deletions(-) hooks/post-receive -- CMU Common Lisp