December 2016 - cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl][sparc64-dev] Add stack bias and other 64-bit support
by Raymond Toy 29 Dec '16

29 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 566a6888 by Raymond Toy at 2016-12-29T10:56:24-08:00 Add stack bias and other 64-bit support Use the stack bias with %fp. Use ldn/stn ot do 64-bit loads and stores. Set the frame size appropriately for 64-bit. - - - - - 1 changed file: - src/lisp/sparc64-assem.S Changes: ===================================== src/lisp/sparc64-assem.S ===================================== --- a/src/lisp/sparc64-assem.S +++ b/src/lisp/sparc64-assem.S @@ -12,15 +12,18 @@ #else #endif +/* Sparcv9 ABI has a bias on the stack (including sp and fp!) */ +#define WORD_BYTES 8 + #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 + sethi %hi(sym), reg; ldn [reg+%lo(sym)], reg #define store(reg, sym) \ - sethi %hi(sym), reg_L0; st reg, [reg_L0+%lo(sym)] + sethi %hi(sym), reg_L0; stn reg, [reg_L0+%lo(sym)] /* * Our frame size needs to be large enough to hold our window, @@ -31,11 +34,7 @@ * 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 +#define FRAMESIZE (SA64(MINFRAME64)) /* * Tell assembler we're using %g2 and %g3 here. @@ -53,7 +52,7 @@ call_into_lisp: ta ST_FLUSH_WINDOWS /* Save the return address. */ - st %i7, [%fp-4] + stn %i7, [%fp + STACK_BIAS - WORD_BYTES] /* Clear the descriptor regs. (See sparc/vm.lisp) */ mov reg_ZERO, reg_A0 @@ -92,18 +91,18 @@ call_into_lisp: 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 + ldn [reg_CFP + 0*WORD_BYTES], reg_A0 + ldn [reg_CFP + 1*WORD_BYTES], reg_A1 + ldn [reg_CFP + 2*WORD_BYTES], reg_A2 + ldn [reg_CFP + 3*WORD_BYTES], reg_A3 + ldn [reg_CFP + 4*WORD_BYTES], reg_A4 + ldn [reg_CFP + 5*WORD_BYTES], reg_A5 /* Calculate LRA */ set lra + type_OtherPointer, reg_LRA /* Indirect closure */ - ld [reg_LEXENV+CLOSURE_FUNCTION_OFFSET], reg_CODE + ldn [reg_LEXENV+CLOSURE_FUNCTION_OFFSET], reg_CODE jmp reg_CODE+FUNCTION_CODE_OFFSET nop @@ -138,7 +137,7 @@ lra: tne trap_PseudoAtomic /* Back to C we go. */ - ld [%sp+FRAMESIZE-4], %i7 + ld [%sp + STACK_BIAS +FRAMESIZE-WORD_BYTES], %i7 ret restore %sp, FRAMESIZE, %sp SET_SIZE(call_into_lisp) @@ -149,12 +148,12 @@ lra: 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] + stx %o2, [%fp + STACK_BIAS - 8 - 1*8] + stx %o3, [%fp + STACK_BIAS - 8 - 2*8] + stx %o4, [%fp + STACK_BIAS - 8 - 3*8] + stx %o5, [%fp + STACK_BIAS - 8 - 4*8] + stx %o6, [%fp + STACK_BIAS - 8 - 5*8] + stx %o7, [%fp + STACK_BIAS - 8 - 6*8] #endif /* Build a lisp stack frame */ mov reg_CFP, reg_OCFP @@ -233,12 +232,12 @@ call_into_c: 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 + ldx [%fp + STACK_BIAS - 8 - 1*8], %o2 + ldx [%fp + STACK_BIAS - 8 - 2*8], %o3 + ldx [%fp + STACK_BIAS - 8 - 3*8], %o4 + ldx [%fp + STACK_BIAS - 8 - 4*8], %o5 + ldx [%fp + STACK_BIAS - 8 - 5*8], %o6 + ldx [%fp + STACK_BIAS - 8 - 6*8], %o7 #endif /* And back into lisp. */ ret View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/566a6888220df3f0ae75d2314…

1 0

[Git][cmucl/cmucl][sparc64-dev] Turn off optimization, enable debugging and PRINTNOISE
by Raymond Toy 29 Dec '16

29 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 5bcef7e4 by Raymond Toy at 2016-12-29T10:44:58-08:00 Turn off optimization, enable debugging and PRINTNOISE - - - - - 1 changed file: - src/lisp/Config.sparc64_sunc Changes: ===================================== src/lisp/Config.sparc64_sunc ===================================== --- a/src/lisp/Config.sparc64_sunc +++ b/src/lisp/Config.sparc64_sunc @@ -26,7 +26,7 @@ AS_V8PLUS = -m64 $(MEM_MODEL) endif ASSEM_SRC = sparc64-assem.S -CFLAGS += $(MEM_MODEL) -xlibmieee -O +CFLAGS += $(MEM_MODEL) -xlibmieee -g3 -DPRINTNOISE DEPEND_FLAGS = -xM ASFLAGS = $(AS_V8PLUS) OS_LINK_FLAGS = -m64 $(MEM_MODEL) -M /usr/lib/ld/map.noexstk View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/5bcef7e4503443b459ef153ce…

1 0

[Git][cmucl/cmucl] Pushed new tag sparc64-dev-checkpoint-4
by Raymond Toy 29 Dec '16

29 Dec '16

Raymond Toy pushed new tag sparc64-dev-checkpoint-4 at cmucl / cmucl

1 0

[Git][cmucl/cmucl][sparc64-dev] write-long writes longs
by Raymond Toy 29 Dec '16

29 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: d8c463ea by Raymond Toy at 2016-12-29T09:45:41-08:00 write-long writes longs Make write-long actually write long values. This is 32-bit for 32-bit archs, and 64-bit for 64-bit archs. This will eventually be needed to write 64-bit heap addresses and descriptors eventually. Adjust load_core_file in coreparse.c to read longs as expected. This basically reverts all changes in coreparge.c back to the master version. - - - - - 2 changed files: - src/compiler/generic/new-genesis.lisp - src/lisp/coreparse.c Changes: ===================================== src/compiler/generic/new-genesis.lisp ===================================== --- a/src/compiler/generic/new-genesis.lisp +++ b/src/compiler/generic/new-genesis.lisp @@ -2871,6 +2871,7 @@ (defparameter initial-function-entry-type-code 3863) (defparameter end-entry-type-code 3840) +#+nil (defun write-long (num) (ecase (c:backend-byte-order c:*backend*) (:little-endian @@ -2880,6 +2881,15 @@ (dotimes (i 4) (write-byte (ldb (byte 8 (* (- 3 i) 8)) num) *core-file*))))) +(defun write-long (num) + (ecase (c:backend-byte-order c:*backend*) + (:little-endian + (dotimes (i vm:word-bytes) + (write-byte (ldb (byte 8 (* i 8)) num) *core-file*))) + (:big-endian + (dotimes (i vm:word-bytes) + (write-byte (ldb (byte 8 (* (- vm:word-bytes 1 i) 8)) num) *core-file*))))) + (defun advance-to-page () (force-output *core-file*) ===================================== src/lisp/coreparse.c ===================================== --- a/src/lisp/coreparse.c +++ b/src/lisp/coreparse.c @@ -95,10 +95,10 @@ load_core_file(const char *file, fpu_mode_t* fpu_type) { int fd = open(file, O_RDONLY), count; -#if !(defined(alpha) || defined(__x86_64) || defined(__sparcv9)) +#if !(defined(alpha) || defined(__x86_64)) long header[CORE_PAGESIZE / sizeof(long)], val, len, *ptr; #else - uint32_t header[CORE_PAGESIZE / sizeof(uint32_t)], val, len, *ptr; + u32 header[CORE_PAGESIZE / sizeof(u32)], val, len, *ptr; #endif lispobj initial_function = NIL; @@ -154,10 +154,10 @@ load_core_file(const char *file, fpu_mode_t* fpu_type) case CORE_NDIRECTORY: process_directory(fd, ptr, -#if !(defined(alpha) || defined(__x86_64) || defined(__sparcv9)) +#if !(defined(alpha) || defined(__x86_64)) (len - 2) / (sizeof(struct ndir_entry) / sizeof(long))); #else - (len - 2) / (sizeof(struct ndir_entry) / sizeof(uint32_t))); + (len - 2) / (sizeof(struct ndir_entry) / sizeof(u32))); #endif break; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/d8c463eab4840d1c6a90fcc67…

1 0

[Git][cmucl/cmucl][sparc64-dev] Support sparc64 in load_core_file
by Raymond Toy 28 Dec '16

28 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 6be8c6f7 by Raymond Toy at 2016-12-28T10:48:39-08:00 Support sparc64 in load_core_file Add __sparc64v9 where __x86_64 is to get core parsing. Basically, we want to read 32-bit values to get the core header information. (I think.) - - - - - 1 changed file: - src/lisp/coreparse.c Changes: ===================================== src/lisp/coreparse.c ===================================== --- a/src/lisp/coreparse.c +++ b/src/lisp/coreparse.c @@ -95,10 +95,10 @@ load_core_file(const char *file, fpu_mode_t* fpu_type) { int fd = open(file, O_RDONLY), count; -#if !(defined(alpha) || defined(__x86_64)) +#if !(defined(alpha) || defined(__x86_64) || defined(__sparcv9)) long header[CORE_PAGESIZE / sizeof(long)], val, len, *ptr; #else - u32 header[CORE_PAGESIZE / sizeof(u32)], val, len, *ptr; + uint32_t header[CORE_PAGESIZE / sizeof(uint32_t)], val, len, *ptr; #endif lispobj initial_function = NIL; @@ -154,10 +154,10 @@ load_core_file(const char *file, fpu_mode_t* fpu_type) case CORE_NDIRECTORY: process_directory(fd, ptr, -#if !(defined(alpha) || defined(__x86_64)) +#if !(defined(alpha) || defined(__x86_64) || defined(__sparcv9)) (len - 2) / (sizeof(struct ndir_entry) / sizeof(long))); #else - (len - 2) / (sizeof(struct ndir_entry) / sizeof(u32))); + (len - 2) / (sizeof(struct ndir_entry) / sizeof(uint32_t))); #endif break; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/6be8c6f7767cd79d57f0f9005…

1 0

[Git][cmucl/cmucl] Pushed new tag sparc64-dev-checkpoint-3
by Raymond Toy 28 Dec '16

28 Dec '16

Raymond Toy pushed new tag sparc64-dev-checkpoint-3 at cmucl / cmucl

1 0

[Git][cmucl/cmucl][sparc64-dev] Use correct return type
by Raymond Toy 28 Dec '16

28 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: f90918b8 by Raymond Toy at 2016-12-28T10:33:41-08:00 Use correct return type For sparc64, solaris_register_address returns pointers to longs, not ints. - - - - - 1 changed file: - src/lisp/solaris-os.c Changes: ===================================== src/lisp/solaris-os.c ===================================== --- a/src/lisp/solaris-os.c +++ b/src/lisp/solaris-os.c @@ -311,7 +311,7 @@ os_install_interrupt_handlers(void) /* function definitions for register lvalues */ #ifndef i386 -int * +long * solaris_register_address(struct ucontext *context, int reg) { if (reg == 0) { View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/f90918b84b6afb351c130538e…

1 0

[Git][cmucl/cmucl][sparc64-dev] Refactor xcode settings.
by Raymond Toy 28 Dec '16

28 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 8e7cb94b by Raymond Toy at 2016-12-28T10:29:47-08:00 Refactor xcode settings. Define MEM_MODEL to hold the desired memory model option and use it where it's needed. - - - - - 1 changed file: - src/lisp/Config.sparc64_sunc Changes: ===================================== src/lisp/Config.sparc64_sunc ===================================== --- a/src/lisp/Config.sparc64_sunc +++ b/src/lisp/Config.sparc64_sunc @@ -18,14 +18,15 @@ include Config.sparc_common # instructions, even if we don't use the 64-bit registers. ifdef FEATURE_SPARC_V9 +MEM_MODEL=-xcode=abs32 # For SunStudio 11, use -xarch=v8plus. For SunStudio 12, that is # deprecated; use -m32 -xarch=sparc. CC_V8PLUS = -m64 -AS_V8PLUS = -m64 +AS_V8PLUS = -m64 $(MEM_MODEL) endif ASSEM_SRC = sparc64-assem.S -CFLAGS += -xcode=abs32 -xlibmieee -O +CFLAGS += $(MEM_MODEL) -xlibmieee -O DEPEND_FLAGS = -xM ASFLAGS = $(AS_V8PLUS) -OS_LINK_FLAGS = -m64 -M /usr/lib/ld/map.noexstk +OS_LINK_FLAGS = -m64 $(MEM_MODEL) -M /usr/lib/ld/map.noexstk View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/8e7cb94b3d979c3892341a656…

1 0

[Git][cmucl/cmucl][sparc64-dev] Use abs32 address space
by Raymond Toy 28 Dec '16

28 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: d202e294 by Raymond Toy at 2016-12-28T10:23:42-08:00 Use abs32 address space This generates 32-bit absolute addresses so code+data+bss size is limited to 4GB. Good enough to start with. - - - - - 1 changed file: - src/lisp/Config.sparc64_sunc Changes: ===================================== src/lisp/Config.sparc64_sunc ===================================== --- a/src/lisp/Config.sparc64_sunc +++ b/src/lisp/Config.sparc64_sunc @@ -25,7 +25,7 @@ AS_V8PLUS = -m64 endif ASSEM_SRC = sparc64-assem.S -CFLAGS += -xlibmieee -O +CFLAGS += -xcode=abs32 -xlibmieee -O DEPEND_FLAGS = -xM ASFLAGS = $(AS_V8PLUS) OS_LINK_FLAGS = -m64 -M /usr/lib/ld/map.noexstk View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/d202e294a5895bfc15822c211…

1 0

[Git][cmucl/cmucl][sparc64-dev] Need -m64 for the linker to make 64-bit executables
by Raymond Toy 28 Dec '16

28 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 15d04762 by Raymond Toy at 2016-12-27T22:34:55-08:00 Need -m64 for the linker to make 64-bit executables - - - - - 1 changed file: - src/lisp/Config.sparc64_sunc Changes: ===================================== src/lisp/Config.sparc64_sunc ===================================== --- a/src/lisp/Config.sparc64_sunc +++ b/src/lisp/Config.sparc64_sunc @@ -28,4 +28,4 @@ ASSEM_SRC = sparc64-assem.S CFLAGS += -xlibmieee -O DEPEND_FLAGS = -xM ASFLAGS = $(AS_V8PLUS) -OS_LINK_FLAGS = -M /usr/lib/ld/map.noexstk +OS_LINK_FLAGS = -m64 -M /usr/lib/ld/map.noexstk View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/15d047623964b6850d2899cc7…

1 0