cmucl-cvs December 2016

cmucl-cvs@common-lisp.net

1 participants
59 discussions

[Git][cmucl/cmucl][sparc64-dev] Initial sparc64 cross-compiler script
by Raymond Toy 17 Dec '16

17 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 24919d2a by Raymond Toy at 2016-12-17T14:40:53-08:00 Initial sparc64 cross-compiler script o Add :sparc64 feature to indicate this build is for 64-bit sparc. o Set paths to sparc64. - - - - - 1 changed file: - src/tools/cross-scripts/cross-x86-sparc64.lisp Changes: ===================================== src/tools/cross-scripts/cross-x86-sparc64.lisp ===================================== --- a/src/tools/cross-scripts/cross-x86-sparc64.lisp +++ b/src/tools/cross-scripts/cross-x86-sparc64.lisp @@ -10,7 +10,8 @@ (c::new-backend "SPARC" ;; Features to add here - '(:sparc + '(:sparc64 + :sparc :sparc-v9 ; For Ultrasparc processors :complex-fp-vops ; Some slightly faster FP vops on complex numbers :linkage-table @@ -115,9 +116,9 @@ (setf (search-list "c:") '("target:compiler/")) (setf (search-list "vm:") - '("c:sparc/" "c:generic/")) + '("c:sparc64/" "c:generic/")) (setf (search-list "assem:") - '("target:assembly/" "target:assembly/sparc/")) + '("target:assembly/" "target:assembly/sparc64/")) ;; Load the backend of the compiler. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/24919d2af372bf64c4794fc5b…

1 0

[Git][cmucl/cmucl][sparc64-dev] Cross-compile script for x86 to sparc64.
by Raymond Toy 17 Dec '16

17 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 9cfbec22 by Raymond Toy at 2016-12-17T14:38:42-08:00 Cross-compile script for x86 to sparc64. Just a copy of cross-x86-sparc.lisp to initialize the cross script for sparc64. No changes. - - - - - 1 changed file: - + src/tools/cross-scripts/cross-x86-sparc64.lisp Changes: ===================================== src/tools/cross-scripts/cross-x86-sparc64.lisp ===================================== --- /dev/null +++ b/src/tools/cross-scripts/cross-x86-sparc64.lisp @@ -0,0 +1,305 @@ +;;; Cross-compile script to build a sparc core using x86 as the +;;; compiling system. This needs work! + +(in-package :cl-user) + +;;; Rename the X86 package and backend so that new-backend does the +;;; right thing. +(rename-package "X86" "OLD-X86" '("OLD-VM")) +(setf (c:backend-name c:*native-backend*) "OLD-X86") + +(c::new-backend "SPARC" + ;; Features to add here + '(:sparc + :sparc-v9 ; For Ultrasparc processors + :complex-fp-vops ; Some slightly faster FP vops on complex numbers + :linkage-table + :stack-checking ; Throw error if we run out of stack + :heap-overflow-check ; Throw error if we run out of + ; heap (This requires gencgc!) + :gencgc ; Generational GC + :relative-package-names ; Relative package names from Allegro + :conservative-float-type + :hash-new + :random-mt19937 ; MT-19937 generator + :cmu ; Announce this is CMUCL + :cmu20 :cmu20b ; Current version identifier + :modular-arith ; Modular arithmetic + :double-double ; Double-double float support + :executable + + :solaris + :svr4 + :sun4 + :sunos + :unix + ) + ;; Features to remove from current *features* here + '(:sparc-v8 :sparc-v7 ; Choose only one of :sparc-v7, :sparc-v8, :sparc-v9 + ;; Other architectures we aren't using. Particularly important + ;; to get rid of sse2 and x87 so we don't accidentally try to + ;; compile the x87/sse2 float support on sparc, which won't work. + :x86 :x86-bootstrap :sse2 :x87 :i486 + :alpha :osf1 :mips + ;; Really old stuff that should have been removed long ago. + :propagate-fun-type :propagate-float-type :constrain-float-type + ;; Other OSes were not using + :openbsd :freebsd :glibc2 :linux :mach-o :darwin :bsd + + :pentium + :long-float + :new-random + :small + :mp)) + +;;; Changes needed to bootstrap cross-compiling from x86 to sparc + +;; Set up the linkage space stuff appropriately for sparc. +(setf (c::backend-foreign-linkage-space-start c::*target-backend*) + #x0f800000 + (c::backend-foreign-linkage-entry-size c::*target-backend*) + 16) + +;; Get new fops so we can process fasls with big-endian unicode +;; strings on our little-endian compiling system. +#+unicode +(load "target:tools/cross-scripts/cross-unicode-big-endian.lisp") + +;;; End changes needed to bootstrap cross-compiling from x86 to sparc + +;;; Extern-alien-name for the new backend. +(in-package :vm) +(defun extern-alien-name (name) + (declare (type simple-string name)) + ;;(format t "extern-alien-name: ~S~%" name) + ;;(lisp::maybe-swap-string 'extern-alien-name (copy-seq name)) + name) +(export 'extern-alien-name) +#+(or) +(defun fixup-code-object (code offset fixup kind) + (declare (type index offset)) + (unless (zerop (rem offset vm::word-bytes)) + (error (intl:gettext "Unaligned instruction? offset=#x~X.") offset)) + (system:without-gcing + (let ((sap (truly-the system-area-pointer + (%primitive c::code-instructions code)))) + (ecase kind + (:call + (error (intl:gettext "Can't deal with CALL fixups, yet."))) + (:sethi + (setf (ldb (byte 22 0) (sap-ref-32 sap offset)) + (ldb (byte 22 10) fixup))) + (:add + (setf (ldb (byte 10 0) (sap-ref-32 sap offset)) + (ldb (byte 10 0) fixup))))))) +(export 'fixup-code-object) +#+(or) +(defun sanctify-for-execution (component) + (without-gcing + (alien-funcall (extern-alien "os_flush_icache" + (function void + system-area-pointer + unsigned-long)) + (code-instructions component) + (* (code-header-ref component code-code-size-slot) + word-bytes))) + nil) +(export 'sanctify-for-execution) + +;;; Compile the new backend. +(pushnew :bootstrap *features*) +(pushnew :building-cross-compiler *features*) +(load "target:tools/comcom") + +;;; Load the new backend. +(setf (search-list "c:") + '("target:compiler/")) +(setf (search-list "vm:") + '("c:sparc/" "c:generic/")) +(setf (search-list "assem:") + '("target:assembly/" "target:assembly/sparc/")) + +;; Load the backend of the compiler. + +(in-package "C") + +(load "vm:vm-macs") +(load "vm:parms") +(load "vm:objdef") +(load "vm:interr") +(load "assem:support") + +(load "target:compiler/srctran") +(load "vm:vm-typetran") +(load "target:compiler/float-tran") +(load "target:compiler/saptran") + +(load "vm:macros") +(load "vm:utils") + +(load "vm:vm") +(load "vm:insts") +(load "vm:primtype") +(load "vm:move") +(load "vm:sap") +(load "vm:system") +(load "vm:char") +(load "vm:float") + +(load "vm:memory") +(load "vm:static-fn") +(load "vm:arith") +(load "vm:cell") +(load "vm:subprim") +(load "vm:debug") +(load "vm:c-call") +(load "vm:print") +(load "vm:alloc") +(load "vm:call") +(load "vm:nlx") +(load "vm:values") +(load "vm:array") +(load "vm:pred") +(load "vm:type-vops") + +(load "assem:assem-rtns") + +(load "assem:array") +(load "assem:arith") +(load "assem:alloc") + +(load "c:pseudo-vops") + +(check-move-function-consistency) + +(load "vm:new-genesis") + +;;; OK, the cross compiler backend is loaded. + +(setf *features* (remove :building-cross-compiler *features*)) + +;;; Info environment hacks. +(macrolet ((frob (&rest syms) + `(progn ,@(mapcar #'(lambda (sym) + `(defconstant ,sym + (symbol-value + (find-symbol ,(symbol-name sym) + :vm)))) + syms)))) + (frob OLD-VM:BYTE-BITS + OLD-VM:WORD-BITS + OLD-VM:CHAR-BITS + OLD-VM:CHAR-BYTES + OLD-VM:LOWTAG-BITS + #+long-float OLD-VM:SIMPLE-ARRAY-LONG-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-SINGLE-FLOAT-TYPE + #+long-float OLD-VM:SIMPLE-ARRAY-COMPLEX-LONG-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-COMPLEX-DOUBLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-COMPLEX-SINGLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-2-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-4-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-8-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-16-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-32-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-8-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-16-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-30-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-32-TYPE + OLD-VM:SIMPLE-BIT-VECTOR-TYPE + OLD-VM:SIMPLE-STRING-TYPE OLD-VM:SIMPLE-VECTOR-TYPE + OLD-VM:SIMPLE-ARRAY-TYPE OLD-VM:VECTOR-DATA-OFFSET + OLD-VM:DOUBLE-FLOAT-DIGITS + old-vm:single-float-digits + OLD-VM:DOUBLE-FLOAT-EXPONENT-BYTE + OLD-VM:DOUBLE-FLOAT-NORMAL-EXPONENT-MAX + OLD-VM:DOUBLE-FLOAT-SIGNIFICAND-BYTE + OLD-VM:SINGLE-FLOAT-EXPONENT-BYTE + OLD-VM:SINGLE-FLOAT-NORMAL-EXPONENT-MAX + OLD-VM:SINGLE-FLOAT-SIGNIFICAND-BYTE + ) + #+double-double + (frob OLD-VM:SIMPLE-ARRAY-COMPLEX-DOUBLE-DOUBLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-DOUBLE-DOUBLE-FLOAT-TYPE) + ) + +(let ((function (symbol-function 'kernel:error-number-or-lose))) + (let ((*info-environment* (c:backend-info-environment c:*target-backend*))) + (setf (symbol-function 'kernel:error-number-or-lose) function) + (setf (info function kind 'kernel:error-number-or-lose) :function) + (setf (info function where-from 'kernel:error-number-or-lose) :defined))) + +(defun fix-class (name) + (let* ((new-value (find-class name)) + (new-layout (kernel::%class-layout new-value)) + (new-cell (kernel::find-class-cell name)) + (*info-environment* (c:backend-info-environment c:*target-backend*))) + (remhash name kernel::*forward-referenced-layouts*) + (kernel::%note-type-defined name) + (setf (info type kind name) :instance) + (setf (info type class name) new-cell) + (setf (info type compiler-layout name) new-layout) + new-value)) +(fix-class 'c::vop-parse) +(fix-class 'c::operand-parse) + +#+random-mt19937 +(declaim (notinline kernel:random-chunk)) + +(setf c:*backend* c:*target-backend*) + +;;; Extern-alien-name for the new backend. +(in-package :vm) +(defun extern-alien-name (name) + (declare (type simple-string name)) + ;;(format t "extern-alien-name: ~S~%" name) + ;;(lisp::maybe-swap-string 'extern-alien-name (copy-seq name)) + name) +(export 'extern-alien-name) +#+(or) +(defun fixup-code-object (code offset fixup kind) + (declare (type index offset)) + (unless (zerop (rem offset vm::word-bytes)) + (error (intl:gettext "Unaligned instruction? offset=#x~X.") offset)) + (system:without-gcing + (let ((sap (truly-the system-area-pointer + (%primitive c::code-instructions code)))) + (ecase kind + (:call + (error (intl:gettext "Can't deal with CALL fixups, yet."))) + (:sethi + (setf (ldb (byte 22 0) (sap-ref-32 sap offset)) + (ldb (byte 22 10) fixup))) + (:add + (setf (ldb (byte 10 0) (sap-ref-32 sap offset)) + (ldb (byte 10 0) fixup))))))) +(export 'fixup-code-object) +#+(or) +(defun sanctify-for-execution (component) + (without-gcing + (alien-funcall (extern-alien "os_flush_icache" + (function void + system-area-pointer + unsigned-long)) + (code-instructions component) + (* (code-header-ref component code-code-size-slot) + word-bytes))) + nil) +(export 'sanctify-for-execution) + +(in-package :cl-user) + +;;; Don't load compiler parts from the target compilation + +(defparameter *load-stuff* nil) + +;; hack, hack, hack: Make old-x86::any-reg the same as +;; x86::any-reg as an SC. Do this by adding old-x86::any-reg +;; to the hash table with the same value as x86::any-reg. + +(let ((ht (c::backend-sc-names c::*target-backend*))) + (setf (gethash 'old-vm::any-reg ht) + (gethash 'vm::any-reg ht))) + + +;;(pushnew :debug *features*) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/9cfbec22dbdf3fdc1c1d82c49…

1 0

[Git][cmucl/cmucl][sparc64-dev] 4 commits: Revert sparc64 changes.
by Raymond Toy 17 Dec '16

17 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: a3a37628 by Raymond Toy at 2016-12-17T08:45:23-08:00 Revert sparc64 changes. These were committed accidentally. Revert to previous version. - - - - - b6e6372c by Raymond Toy at 2016-12-17T08:46:48-08:00 Revert sparc64 changes. These were committed accidentally. Revert to previous version. - - - - - 934ca7bf by Raymond Toy at 2016-12-17T13:33:22-08:00 Merge branch 'master' into sparc64-dev - - - - - 4352c211 by Raymond Toy at 2016-12-17T13:36:40-08:00 Move ASSEM_SRC to individual configs ASSEM_SRC is no longer common on sparc so move it from Config.sparc_common to Config.sparc_sunc and Config.sparc64_sunc. For sparc64, set it to sparc64-assem.S instead of just sparc-assem.S. (Haven't updated sparc64-assem.S to sparc64 yet.) - - - - - 3 changed files: - src/lisp/Config.sparc64_sunc - src/lisp/Config.sparc_common - src/lisp/Config.sparc_sunc Changes: ===================================== src/lisp/Config.sparc64_sunc ===================================== --- a/src/lisp/Config.sparc64_sunc +++ b/src/lisp/Config.sparc64_sunc @@ -24,7 +24,7 @@ CC_V8PLUS = -xarch=sparc AS_V8PLUS = -xarch=sparc endif -ASSEM_SRC = sparcv9-assem.S +ASSEM_SRC = sparc64-assem.S CFLAGS += -xlibmieee -O DEPEND_FLAGS = -xM ASFLAGS = $(AS_V8PLUS) ===================================== src/lisp/Config.sparc_common ===================================== --- a/src/lisp/Config.sparc_common +++ b/src/lisp/Config.sparc_common @@ -43,7 +43,6 @@ CPPFLAGS += -I. -I$(PATH1) $(CC_V8PLUS) $(CPP_DEFINE_OPTIONS) CFLAGS += -g $(CC_V8PLUS) NM = $(PATH1)/solaris-nm -#ASSEM_SRC = sparc-assem.S ARCH_SRC = sparc-arch.c DEPEND=$(CC) ===================================== src/lisp/Config.sparc_sunc ===================================== --- a/src/lisp/Config.sparc_sunc +++ b/src/lisp/Config.sparc_sunc @@ -20,11 +20,11 @@ include Config.sparc_common ifdef FEATURE_SPARC_V9 # For SunStudio 11, use -xarch=v8plus. For SunStudio 12, that is # deprecated; use -m32 -xarch=sparc. -CC_V8PLUS = -xarch=sparc -AS_V8PLUS = -xarch=sparc +CC_V8PLUS = -m32 -xarch=sparc +AS_V8PLUS = -m32 -xarch=sparc endif -ASSEM_SRC = sparcv9-assem.S +ASSEM_SRC = sparc-assem.S CFLAGS += -xlibmieee -O DEPEND_FLAGS = -xM ASFLAGS = $(AS_V8PLUS) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/fe4f6806960ad5c0cdaab417…

1 0

[Git][cmucl/cmucl][master] Regenerated cmucl-sunos-os.pot
by Raymond Toy 17 Dec '16

17 Dec '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 1e94ce3a by Raymond Toy at 2016-12-17T17:08:45-05:00 Regenerated cmucl-sunos-os.pot - - - - - 1 changed file: - src/i18n/locale/cmucl-sunos-os.pot Changes: ===================================== src/i18n/locale/cmucl-sunos-os.pot ===================================== --- a/src/i18n/locale/cmucl-sunos-os.pot +++ b/src/i18n/locale/cmucl-sunos-os.pot @@ -24,6 +24,10 @@ msgid "Returns a string describing version of the supporting software." msgstr "" #: src/code/sunos-os.lisp +msgid "Unix system call getrusage failed: ~A." +msgstr "" + +#: src/code/sunos-os.lisp msgid "Getpagesize failed: ~A" msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/1e94ce3a8b46ae3dc5afd81a3…

1 0

[Git][cmucl/cmucl][master] Regenerated.
by Raymond Toy 17 Dec '16

17 Dec '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: d01cf9f4 by Raymond Toy at 2016-12-17T14:06:23-08:00 Regenerated. - - - - - 1 changed file: - src/i18n/locale/cmucl.pot Changes: ===================================== src/i18n/locale/cmucl.pot ===================================== --- a/src/i18n/locale/cmucl.pot +++ b/src/i18n/locale/cmucl.pot @@ -13234,10 +13234,6 @@ msgid "Could not open a temporary file in /tmp" msgstr "" #: src/code/run-program.lisp -msgid "Cound not create pipe: ~A" -msgstr "" - -#: src/code/run-program.lisp msgid "Invalid option to run-program: ~S" msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/d01cf9f4f3a7fadf4bdeab457…

1 0

[Git][cmucl/cmucl][master] 2 commits: Revert sparc64 changes.
by Raymond Toy 17 Dec '16

17 Dec '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: a3a37628 by Raymond Toy at 2016-12-17T08:45:23-08:00 Revert sparc64 changes. These were committed accidentally. Revert to previous version. - - - - - b6e6372c by Raymond Toy at 2016-12-17T08:46:48-08:00 Revert sparc64 changes. These were committed accidentally. Revert to previous version. - - - - - 2 changed files: - src/lisp/Config.sparc_common - src/lisp/Config.sparc_sunc Changes: ===================================== src/lisp/Config.sparc_common ===================================== --- a/src/lisp/Config.sparc_common +++ b/src/lisp/Config.sparc_common @@ -43,7 +43,7 @@ CPPFLAGS += -I. -I$(PATH1) $(CC_V8PLUS) $(CPP_DEFINE_OPTIONS) CFLAGS += -g $(CC_V8PLUS) NM = $(PATH1)/solaris-nm -#ASSEM_SRC = sparc-assem.S +ASSEM_SRC = sparc-assem.S ARCH_SRC = sparc-arch.c DEPEND=$(CC) ===================================== src/lisp/Config.sparc_sunc ===================================== --- a/src/lisp/Config.sparc_sunc +++ b/src/lisp/Config.sparc_sunc @@ -20,11 +20,10 @@ include Config.sparc_common ifdef FEATURE_SPARC_V9 # For SunStudio 11, use -xarch=v8plus. For SunStudio 12, that is # deprecated; use -m32 -xarch=sparc. -CC_V8PLUS = -xarch=sparc -AS_V8PLUS = -xarch=sparc +CC_V8PLUS = -m32 -xarch=sparc +AS_V8PLUS = -m32 -xarch=sparc endif -ASSEM_SRC = sparcv9-assem.S CFLAGS += -xlibmieee -O DEPEND_FLAGS = -xM ASFLAGS = $(AS_V8PLUS) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/5c9837fd4bda7cc7349ed53a…

1 0

[Git][cmucl/cmucl][sparc64-dev] Put sparc64 case before sparc
by Raymond Toy 17 Dec '16

17 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: fe4f6806 by Raymond Toy at 2016-12-17T08:40:21-08:00 Put sparc64 case before sparc Currently we still define :sparc so we need :sparc64 to come first to get the correct sparc64 directory instead of sparc. - - - - - 1 changed file: - src/tools/setup.lisp Changes: ===================================== src/tools/setup.lisp ===================================== --- a/src/tools/setup.lisp +++ b/src/tools/setup.lisp @@ -298,13 +298,13 @@ (cond ((c:target-featurep :pmax) "mips/") ((c:target-featurep :rt) "rt/") ((c:target-featurep :hppa) "hppa/") + ((c:target-featurep :sparc64) "sparc64/") ((c:target-featurep :sparc) "sparc/") ((c:target-featurep :x86) "x86/") ((c:target-featurep :alpha) "alpha/") ((c:target-featurep :sgi) "mips/") ((c:target-featurep :ppc) "ppc/") ((c:target-featurep :amd64) "amd64/") - ((c:target-featurep :sparc64) "sparc64/") (t (error "What machine is this?"))) (make-pathname :directory (pathname-directory f))))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/fe4f6806960ad5c0cdaab4176…

1 0

[Git][cmucl/cmucl][sparc64-dev] Add more sparc64 files.
by Raymond Toy 17 Dec '16

17 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 314541e9 by Raymond Toy at 2016-12-16T21:59:14-08:00 Add more sparc64 files. Config.sparc64_sunc and sparc64-assem.S are straight copies of the corresponding sparc files. - - - - - 2 changed files: - + src/lisp/Config.sparc64_sunc - + src/lisp/sparc64-assem.S Changes: ===================================== src/lisp/Config.sparc64_sunc ===================================== --- /dev/null +++ b/src/lisp/Config.sparc64_sunc @@ -0,0 +1,31 @@ +# -*- Mode: makefile -*- + +# Build cmucl using Sun C compiler. We assume cc is Sun's C compiler. +# If you don't have it, why are you using this Config anyway? You're +# on your own if you use this Config without Sun C compiler available. + +include Config.sparc_common + +# For v8plus support (allows 64-bit integer support on V9 +# architectures), uncomment the definitions for CC_V8PLUS and +# AS_V8PLUS. The -Wa,xarch=v8plus option tells the assembler to +# accept v8plus instructions and generate a v8plus object files and +# executable. +# +# However, we should also make sure the binary is marked as v8plus by +# enabling AS_V8PLUS whenever we have the :sparc-v9 *feature* enabled +# because we really are a v8plus application by using some of the v9 +# instructions, even if we don't use the 64-bit registers. + +ifdef FEATURE_SPARC_V9 +# For SunStudio 11, use -xarch=v8plus. For SunStudio 12, that is +# deprecated; use -m32 -xarch=sparc. +CC_V8PLUS = -xarch=sparc +AS_V8PLUS = -xarch=sparc +endif + +ASSEM_SRC = sparcv9-assem.S +CFLAGS += -xlibmieee -O +DEPEND_FLAGS = -xM +ASFLAGS = $(AS_V8PLUS) +OS_LINK_FLAGS = -M /usr/lib/ld/map.noexstk ===================================== src/lisp/sparc64-assem.S ===================================== --- /dev/null +++ b/src/lisp/sparc64-assem.S @@ -0,0 +1,565 @@ + +#ifdef SOLARIS +#define _ASM +#include <sys/asm_linkage.h> +#include <sys/psw.h> +#include <sys/trap.h> +#ifdef __STDC__ +#define FUNCDEF(x) .type x, \#function +#else +#define FUNCDEF(x) .type x, #function +#endif +#else +#endif + +#define LANGUAGE_ASSEMBLY +#include "lispregs.h" +#include "internals.h" +#include "globals.h" + +#define load(sym, reg) \ + sethi %hi(sym), reg; ld [reg+%lo(sym)], reg +#define store(reg, sym) \ + sethi %hi(sym), reg_L0; st reg, [reg_L0+%lo(sym)] + +/* + * Our frame size needs to be large enough to hold our window, + * the structure return pointer, and some temp space. The temp space + * is to hold the 64-bit %o registers that might be converted to %i + * registers. A task switch will will not preserve all 64 bits of the + * %i registers, so we need to save our %o registers before entering C. + * Since %o0 and %o1 contain the return results, we do not have to save + * these. + */ +#ifdef v8plus +#define FRAMESIZE (SA(WINDOWSIZE+4 + 6*8)) +#else +#define FRAMESIZE (SA(MINFRAME)) +#endif + .seg "text" + .global call_into_lisp + FUNCDEF(call_into_lisp) +call_into_lisp: + save %sp, -FRAMESIZE, %sp + /* Flush all of C's register windows to the stack. */ + ta ST_FLUSH_WINDOWS + + /* Save the return address. */ + st %i7, [%fp-4] + + /* Clear the descriptor regs. (See sparc/vm.lisp) */ + mov reg_ZERO, reg_A0 + mov reg_ZERO, reg_A1 + mov reg_ZERO, reg_A2 + mov reg_ZERO, reg_A3 + mov reg_ZERO, reg_A4 + mov reg_ZERO, reg_A5 + mov reg_ZERO, reg_OCFP + mov reg_ZERO, reg_LRA + mov reg_ZERO, reg_CODE + + /* Establish NIL */ + set NIL, reg_NIL + + /* Set the pseudo-atomic flag. */ + set pseudo_atomic_Value, reg_ALLOC + + /* Turn off foreign function call. */ + sethi %hi(foreign_function_call_active), reg_NL0 + st reg_ZERO, [reg_NL0+%lo(foreign_function_call_active)] + + /* Load the rest of lisp state. */ + load(current_dynamic_space_free_pointer, reg_NL0) + add reg_NL0, reg_ALLOC, reg_ALLOC + load(current_binding_stack_pointer, reg_BSP) + load(current_control_stack_pointer, reg_CSP) + load(current_control_frame_pointer, reg_OCFP) + + /* No longer atomic, and check for interrupt. */ + andn reg_ALLOC, pseudo_atomic_Value, reg_ALLOC + andcc reg_ALLOC, pseudo_atomic_InterruptedValue, reg_ZERO + tne trap_PseudoAtomic + + /* Pass in the args. */ + sll %i2, 2, reg_NARGS + mov %i1, reg_CFP + mov %i0, reg_LEXENV + ld [reg_CFP+0], reg_A0 + ld [reg_CFP+4], reg_A1 + ld [reg_CFP+8], reg_A2 + ld [reg_CFP+12], reg_A3 + ld [reg_CFP+16], reg_A4 + ld [reg_CFP+20], reg_A5 + + /* Calculate LRA */ + set lra + type_OtherPointer, reg_LRA + + /* Indirect closure */ + ld [reg_LEXENV+CLOSURE_FUNCTION_OFFSET], reg_CODE + + jmp reg_CODE+FUNCTION_CODE_OFFSET + nop + + .align 8 +lra: + .word type_ReturnPcHeader + + /* Blow off any extra values. */ + mov reg_OCFP, reg_CSP + nop + + /* Return the one value. */ + mov reg_A0, %i0 + + /* Turn on pseudo_atomic */ + or reg_ALLOC, pseudo_atomic_Value, reg_ALLOC + + /* Store LISP state */ + andn reg_ALLOC, lowtag_Mask, reg_NL1 + store(reg_NL1,current_dynamic_space_free_pointer) + store(reg_BSP,current_binding_stack_pointer) + store(reg_CSP,current_control_stack_pointer) + store(reg_CFP,current_control_frame_pointer) + + /* No longer in Lisp. */ + store(reg_NL1,foreign_function_call_active) + + /* Were we interrupted? */ + andn reg_ALLOC, pseudo_atomic_Value, reg_ALLOC + andcc reg_ALLOC, pseudo_atomic_InterruptedValue, reg_ZERO + tne trap_PseudoAtomic + + /* Back to C we go. */ + ld [%sp+FRAMESIZE-4], %i7 + ret + restore %sp, FRAMESIZE, %sp + SET_SIZE(call_into_lisp) + + + + .global call_into_c + FUNCDEF(call_into_c) +call_into_c: +#ifdef v8plus + stx %o2, [%fp - 8 - 1*8] + stx %o3, [%fp - 8 - 2*8] + stx %o4, [%fp - 8 - 3*8] + stx %o5, [%fp - 8 - 4*8] + stx %o6, [%fp - 8 - 5*8] + stx %o7, [%fp - 8 - 6*8] +#endif + /* Build a lisp stack frame */ + mov reg_CFP, reg_OCFP + mov reg_CSP, reg_CFP + add reg_CSP, 32, reg_CSP + st reg_OCFP, [reg_CFP] + st reg_CODE, [reg_CFP+8] + + /* Turn on pseudo-atomic. */ + or reg_ALLOC, pseudo_atomic_Value, reg_ALLOC + + /* Convert the return address to an offset and save it on the stack. */ + sub reg_LIP, reg_CODE, reg_L0 + add reg_L0, type_OtherPointer, reg_L0 + st reg_L0, [reg_CFP+4] + + /* Store LISP state */ + store(reg_BSP,current_binding_stack_pointer) + store(reg_CSP,current_control_stack_pointer) + store(reg_CFP,current_control_frame_pointer) + + /* Use reg_CFP as a work register, and restore it */ + andn reg_ALLOC, lowtag_Mask, reg_CFP + store(reg_CFP,current_dynamic_space_free_pointer) + load(current_control_frame_pointer, reg_CFP) + + /* No longer in Lisp. */ + store(reg_CSP,foreign_function_call_active) + + /* Were we interrupted? */ + andn reg_ALLOC, pseudo_atomic_Value, reg_ALLOC + andcc reg_ALLOC, pseudo_atomic_InterruptedValue, reg_ZERO + tne trap_PseudoAtomic + + /* Into C we go. */ + call reg_CFUNC + nop + + /* + * Note: C calling conventions (32-bit) say that %o0 and %o1 + * are used to return function results. In particular 64-bit + * results are in %o0 (hi) and %o1 (low). + */ + + /* Re-establish NIL */ + set NIL, reg_NIL + + /* Atomic. */ + set pseudo_atomic_Value, reg_ALLOC + + /* No longer in foreign function call. */ + sethi %hi(foreign_function_call_active), reg_NL2 + st reg_ZERO, [reg_NL2+%lo(foreign_function_call_active)] + + /* Load the rest of lisp state. */ + load(current_dynamic_space_free_pointer, reg_NL2) + add reg_NL2, reg_ALLOC, reg_ALLOC + load(current_binding_stack_pointer, reg_BSP) + load(current_control_stack_pointer, reg_CSP) + load(current_control_frame_pointer, reg_CFP) + + /* Get the return address back. */ + ld [reg_CFP+4], reg_LIP + ld [reg_CFP+8], reg_CODE + add reg_LIP, reg_CODE, reg_LIP + sub reg_LIP, type_OtherPointer, reg_LIP + + /* No longer atomic. */ + andn reg_ALLOC, pseudo_atomic_Value, reg_ALLOC + andcc reg_ALLOC, pseudo_atomic_InterruptedValue, reg_ZERO + tne trap_PseudoAtomic + + /* Reset the lisp stack. */ + /* Note: OCFP is in one of the locals, it gets preserved across C. */ + mov reg_CFP, reg_CSP + mov reg_OCFP, reg_CFP + +#ifdef v8plus + ldx [%fp - 8 - 1*8], %o2 + ldx [%fp - 8 - 2*8], %o3 + ldx [%fp - 8 - 3*8], %o4 + ldx [%fp - 8 - 4*8], %o5 + ldx [%fp - 8 - 5*8], %o6 + ldx [%fp - 8 - 6*8], %o7 +#endif + /* And back into lisp. */ + ret + nop + + SET_SIZE(call_into_c) + +#if 0 +/* undefined_tramp and closure_tramp are now Lisp assembly routines. + * so we don't need these anymore. Leave them here for a bit so + * we can look at the "real" versions for a while. But eventually, + * remove these. + */ + .global _undefined_tramp + FUNCDEF(_undefined_tramp) + .align 8 + .byte 0 +_undefined_tramp: + .byte 0, 0, type_FunctionHeader + .word _undefined_tramp + .word NIL + .word NIL + .word NIL + .word NIL + + b 1f + unimp trap_Cerror + /* Number of argument bytes */ + .byte 4 + .byte UNDEFINED_SYMBOL_ERROR + /* Escape to create 16bit number from following two bytes, + in little-endian order */ + .byte 254 + /* SC_OFFSET(sc_DescriptorReg,reg_FDEFN) */ + .byte SC_OFFSET_LO(sc_DescriptorReg,reg_FDEFN_NUM) + .byte SC_OFFSET_HI(sc_DescriptorReg,reg_FDEFN_NUM) + + .align 4 +1: + ld [reg_FDEFN+FDEFN_RAW_ADDR_OFFSET], reg_CODE + jmp reg_CODE+FUNCTION_CODE_OFFSET + nop + SET_SIZE(_undefined_tramp) + + .global _closure_tramp + FUNCDEF(_closure_tramp) + .align 8 + .byte 0 +_closure_tramp: + .byte 0, 0, type_FunctionHeader + .word _closure_tramp + .word NIL + .word NIL + .word NIL + .word NIL + + ld [reg_FDEFN+FDEFN_FUNCTION_OFFSET], reg_LEXENV + ld [reg_LEXENV+CLOSURE_FUNCTION_OFFSET], reg_CODE + jmp reg_CODE+FUNCTION_CODE_OFFSET + nop + SET_SIZE(_closure_tramp) +#endif + + +/* + * Function-end breakpoint magic. + */ + + .text + .align 8 + .global function_end_breakpoint_guts +function_end_breakpoint_guts: + .word type_ReturnPcHeader + b 1f + nop + mov reg_CSP, reg_OCFP + add 4, reg_CSP, reg_CSP + mov 4, reg_NARGS + mov reg_NIL, reg_A1 + mov reg_NIL, reg_A2 + mov reg_NIL, reg_A3 + mov reg_NIL, reg_A4 + mov reg_NIL, reg_A5 +1: + + .global function_end_breakpoint_trap +function_end_breakpoint_trap: + unimp trap_FunctionEndBreakpoint + b 1b + nop + + .global function_end_breakpoint_end +function_end_breakpoint_end: + + .global flush_icache + FUNCDEF(flush_icache) +flush_icache: + add %o0,%o1,%o2 +1: iflush %o0 ! flush instruction cache + add %o0,8,%o0 + cmp %o0,%o2 + blt 1b + nop + retl ! return from leaf routine + nop + SET_SIZE(flush_icache) + + .global do_pending_interrupt + FUNCDEF(do_pending_interrupt) +do_pending_interrupt: + unimp trap_PendingInterrupt + retl + nop + SET_SIZE(do_pending_interrupt) + +#ifdef trap_DynamicSpaceOverflowError + .global do_dynamic_space_overflow_error + FUNCDEF(do_dynamic_space_overflow_error) +do_dynamic_space_overflow_error: + unimp trap_DynamicSpaceOverflowError + retl + nop + SET_SIZE(do_dynamic_space_overflow_error) +#endif + +#ifdef trap_DynamicSpaceOverflowWarning + .global do_dynamic_space_overflow_warning + FUNCDEF(do_dynamic_space_overflow_warning) +do_dynamic_space_overflow_warning: + unimp trap_DynamicSpaceOverflowWarning + retl + nop + SET_SIZE(do_dynamic_space_overflow_warning) +#endif + +#ifdef LINKAGE_TABLE +/* + * Call into C code to resolve a linkage entry. + * + * We get here by Lisp calling call_into_c with an address of the + * desired function which is contained in the register reg_CFUNC (aka + * %i4, aka %r28). This is the address of the entry in the linkage + * table, which is what we need to figure out what function we really + * wanted. + * + * Note that because we get here from call_into_c, all necessary live + * registers have been saved, including FP registers. Hence, no need + * to save them. + */ + .global lazy_resolve_linkage + .global resolve_linkage_tramp + FUNCDEF(resolve_linkage_tramp) +resolve_linkage_tramp: + /* + * At this point, all of the global %g registers have been + * saved by call_into_c, so we can use them as temps. %g2, + * aka reg_NIL, aka null-tn is a good choice. reg_L0 contains + * the address of the jmpl instruction in the linkage jump + * table. (See sparc-arch.c.) + */ + + mov reg_L0, reg_NIL + + /* + * New stack frame so the %o regs become %i. We can't touch + * the original %o because they contain the parameters to the + * function! + */ + save %sp, -FRAMESIZE, %sp + + /* %g2 tells where we came from in the linkage table */ + call lazy_resolve_linkage + mov reg_NIL, %o0 ! in the delay slot + + mov %o0, reg_NIL + restore %sp, FRAMESIZE, %sp + + /* And away we go! */ + jmp reg_NIL + nop + + SET_SIZE(resolve_linkage_tramp) + + .global undefined_foreign_symbol_trap + FUNCDEF(undefined_foreign_symbol_trap) +/* + * When we get called, %o0 contains the address of the data_vector object + * which is a string naming the bad symbol. + */ +undefined_foreign_symbol_trap: + /* + Need to restore all the global registers with the Lisp values that + were saved away in call_into_c. (This routine is only called from + os_link_one_symbol, which is called from resolve_linkage_tramp, which + is called from call_into_c.) + + The global registers are volatile across function calls, so who + knows what values have been they contain now! + + */ + + load(current_dynamic_space_free_pointer, reg_ALLOC) + load(current_binding_stack_pointer, reg_BSP) + load(current_control_stack_pointer, reg_CSP) + load(current_control_frame_pointer, reg_CFP) + + set NIL, reg_NIL + + mov %o0, reg_A0 + unimp trap_Error + .byte 4 /* Number of argument bytes */ + .byte UNDEFINED_FOREIGN_SYMBOL_ERROR + /* Escape to create 16bit number from following two bytes, in + little-endian order */ + .byte 254 + .byte SC_OFFSET_LO(sc_DescriptorReg, reg_A0_NUM) + .byte SC_OFFSET_HI(sc_DescriptorReg, reg_A0_NUM) + .align 4 + +#endif +/* + * Save the FPU state. %o0 contains a pointer to where we can + * store our state. + */ + +/* + * Note we only save the 16 double-float registers (which saves + * the 32 single-float values too, I think). If we're compiling for + * a sparc v9, the Lisp code can actually use all 32 double-float + * registers. For later. + */ + .global fpu_save + FUNCDEF(fpu_save) +fpu_save: + std %f0, [%o0 + 4*0] + std %f2, [%o0 + 4*2] + std %f4, [%o0 + 4*4] + std %f6, [%o0 + 4*6] + std %f8, [%o0 + 4*8] + std %f10, [%o0 + 4*10] + std %f12, [%o0 + 4*12] + std %f14, [%o0 + 4*14] + std %f16, [%o0 + 4*16] + std %f18, [%o0 + 4*18] + std %f20, [%o0 + 4*20] + std %f22, [%o0 + 4*22] + std %f24, [%o0 + 4*24] + std %f26, [%o0 + 4*26] + std %f28, [%o0 + 4*28] + std %f30, [%o0 + 4*30] +#ifdef FEATURE_SPARC_V9 + std %f32, [%o0 + 4*32] + std %f34, [%o0 + 4*34] + std %f36, [%o0 + 4*36] + std %f38, [%o0 + 4*38] + std %f40, [%o0 + 4*40] + std %f42, [%o0 + 4*42] + std %f44, [%o0 + 4*44] + std %f46, [%o0 + 4*46] + std %f48, [%o0 + 4*48] + std %f50, [%o0 + 4*50] + std %f52, [%o0 + 4*52] + std %f54, [%o0 + 4*54] + std %f56, [%o0 + 4*56] + std %f58, [%o0 + 4*58] + std %f60, [%o0 + 4*60] + std %f62, [%o0 + 4*62] + st %fsr, [%o0 + 4*64] +#else + st %fsr, [%o0 + 4*32] +#endif + retl + nop + SET_SIZE(fpu_save) + + .global fpu_restore + FUNCDEF(fpu_restore) +fpu_restore: + ldd [%o0 + 4*0], %f0 + ldd [%o0 + 4*2], %f2 + ldd [%o0 + 4*4], %f4 + ldd [%o0 + 4*6], %f6 + ldd [%o0 + 4*8], %f8 + ldd [%o0 + 4*10], %f10 + ldd [%o0 + 4*12], %f12 + ldd [%o0 + 4*14], %f14 + ldd [%o0 + 4*16], %f16 + ldd [%o0 + 4*18], %f18 + ldd [%o0 + 4*20], %f20 + ldd [%o0 + 4*22], %f22 + ldd [%o0 + 4*24], %f24 + ldd [%o0 + 4*26], %f26 + ldd [%o0 + 4*28], %f28 + ldd [%o0 + 4*30], %f30 +#ifdef FEATURE_SPARC_V9 + ldd [%o0 + 4*32], %f32 + ldd [%o0 + 4*34], %f34 + ldd [%o0 + 4*36], %f36 + ldd [%o0 + 4*38], %f38 + ldd [%o0 + 4*40], %f40 + ldd [%o0 + 4*42], %f42 + ldd [%o0 + 4*44], %f44 + ldd [%o0 + 4*46], %f46 + ldd [%o0 + 4*48], %f48 + ldd [%o0 + 4*50], %f50 + ldd [%o0 + 4*52], %f52 + ldd [%o0 + 4*54], %f54 + ldd [%o0 + 4*56], %f56 + ldd [%o0 + 4*58], %f58 + ldd [%o0 + 4*60], %f60 + ldd [%o0 + 4*62], %f62 + ld [%o0 + 4*64], %fsr +#else + ld [%o0 + 4*32], %fsr +#endif + retl + nop + SET_SIZE(fpu_restore) + + .global save_context + FUNCDEF(save_context) +save_context: + ta ST_FLUSH_WINDOWS ! flush register windows + retl ! return from leaf routine + nop + SET_SIZE(save_context) +/* + * Local variables: + * tab-width: 8 + * End: + */ + View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/314541e9622792aefdecbce2f…

1 0

[Git][cmucl/cmucl] Pushed new branch sparc64-dev
by Raymond Toy 17 Dec '16

17 Dec '16

Raymond Toy pushed new branch sparc64-dev at cmucl / cmucl

1 0

[Git][cmucl/cmucl][master] Remove sparc64 stuff so we can do this on a branch.
by Raymond Toy 17 Dec '16

17 Dec '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 5c9837fd by Raymond Toy at 2016-12-16T21:43:33-08:00 Remove sparc64 stuff so we can do this on a branch. - - - - - 7 changed files: - − src/assembly/sparc64/alloc.lisp - − src/assembly/sparc64/arith.lisp - − src/assembly/sparc64/array.lisp - − src/assembly/sparc64/assem-rtns.lisp - − src/assembly/sparc64/support.lisp - − src/compiler/sparc64/alloc.lisp - − src/compiler/sparc64/arith.lisp The diff was not included because it is too large. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/5c9837fd4bda7cc7349ed53ae…

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs December 2016