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

[Git][cmucl/cmucl][master] 2 commits: Fix up headings for issue templates
by Raymond Toy 23 Mar '21

23 Mar '21

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 1b27941a by Raymond Toy at 2021-03-22T20:00:49-07:00 Fix up headings for issue templates The headings used to be `**foo**`, but it's better to use `## foo`. The old headings would cause the following paragraph to be appended to the heading. Thus ``` ## foo Text ``` became ``` foo Text ``` with "foo" in bold. With the new markup, this doesn't happen. - - - - - 5c92c14c by Raymond Toy at 2021-03-23T03:34:19+00:00 Merge branch 'fixup-template-headings' into 'master' Fix up headings for issue templates See merge request cmucl/cmucl!73 - - - - - 2 changed files: - .gitlab/issue_templates/Bug.md - .gitlab/issue_templates/Feature.md Changes: ===================================== .gitlab/issue_templates/Bug.md ===================================== @@ -1,24 +1,24 @@ -**Describe the bug** +## Describe the bug A clear and concise description of what the bug is. -**To Reproduce** +## To Reproduce Steps to reproduce the behavior: 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' 4. See error -**Expected behavior** +## Expected behavior A clear and concise description of what you expected to happen. -**Screenshots** +## Screenshots If applicable, add screenshots to help explain your problem. -**Desktop (please complete the following information):** +## Desktop (please complete the following information): - OS: [e.g. Linux] - Version [e.g. 21c] -**Additional context** +## Additional context Add any other context about the problem here. /label ~bug ===================================== .gitlab/issue_templates/Feature.md ===================================== @@ -1,10 +1,10 @@ -**Describe the feature** +## Describe the feature Briefly describe the feature you would like see. -**Is there a prototype?** +## Is there a prototype? If you have a prototype, provide links to illustrate this addition. This is the best way to propose a new feature. -**Describe the feature in more detail** +## Describe the feature in more detail Provide more information to describe the feature. /label ~feature View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/9b1abca53598f03a5b39de… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/9b1abca53598f03a5b39de… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch fixup-template-headings
by Raymond Toy 23 Mar '21

23 Mar '21

Raymond Toy pushed new branch fixup-template-headings at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/fixup-template-headings You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-97-define-ud2-inst] Add sigtrap handler to handle single-stepping traps
by Raymond Toy 23 Mar '21

23 Mar '21

Raymond Toy pushed to branch issue-97-define-ud2-inst at cmucl / cmucl Commits: 8817798f by Raymond Toy at 2021-03-22T19:57:09-07:00 Add sigtrap handler to handle single-stepping traps Needed to handle single-stepping. There's also a lot of other changes used to debug this. They eventually need to be cleaned up. - - - - - 1 changed file: - src/lisp/x86-arch.c Changes: ===================================== src/lisp/x86-arch.c ===================================== @@ -142,7 +142,7 @@ arch_skip_instruction(os_context_t * context) { int vlen, code; - DPRINTF(0, (stderr, "[arch_skip_inst at %lx>]\n", SC_PC(context))); + DPRINTF(1, (stderr, "[arch_skip_inst at %lx>]\n", SC_PC(context))); /* Get and skip the lisp error code. */ char* pc = (char *) SC_PC(context); @@ -206,8 +206,8 @@ arch_set_pseudo_atomic_interrupted(os_context_t * context) unsigned long arch_install_breakpoint(void *pc) { - char* ptr = (char *) pc; - unsigned long result = *(unsigned long *) pc; + unsigned char* ptr = (unsigned char *) pc; + unsigned long result = ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24); fprintf(stderr, "arch_install_breakpoint at %p, old code = 0x%lx\n", pc, result); @@ -227,8 +227,13 @@ arch_install_breakpoint(void *pc) void arch_remove_breakpoint(void *pc, unsigned long orig_inst) { - *((char *) pc) = orig_inst & 0xff; - *((char *) pc + 1) = (orig_inst & 0xff00) >> 8; + fprintf(stderr, "arch_remove_breakpoint: %p orig %lx\n", + pc, orig_inst); + unsigned char *ptr = (unsigned char *) pc; + ptr[0] = orig_inst & 0xff; + ptr[1] = (orig_inst >> 8) & 0xff; + ptr[2] = (orig_inst >> 16) & 0xff; + ptr[3] = (orig_inst >> 24) & 0xff; } @@ -249,14 +254,23 @@ unsigned int single_step_save3; void arch_do_displaced_inst(os_context_t * context, unsigned long orig_inst) { - unsigned int *pc = (unsigned int *) SC_PC(context); + unsigned char *pc = (unsigned char *) SC_PC(context); + fprintf(stderr, "arch_do_displaced_inst: pc %p orig_inst %lx\n", + pc, orig_inst); + /* * Put the original instruction back. */ +#if 0 *((char *) pc) = orig_inst & 0xff; *((char *) pc + 1) = (orig_inst & 0xff00) >> 8; +#else + pc[0] = orig_inst & 0xff; + pc[1] = (orig_inst >> 8) & 0xff; + pc[2] = (orig_inst >> 16) & 0xff; +#endif #ifdef SC_EFLAGS /* Enable single-stepping */ @@ -319,8 +333,8 @@ sigill_handler(HANDLER_ARGS) fprintf(stderr, "sigtrap(%d %d %p)\n", signal, CODE(code), os_context); #endif - if (single_stepping && (signal == SIGTRAP)) { -#if 0 + if (single_stepping && (signal == SIGILL)) { +#if 1 fprintf(stderr, "* Single step trap %p\n", single_stepping); #endif @@ -338,7 +352,9 @@ sigill_handler(HANDLER_ARGS) /* * Re-install the breakpoint if possible. */ - if ((int) SC_PC(os_context) == (int) single_stepping + 1) + fprintf(stderr, "* Reinstall breakpoint at single_stepping %p\n", single_stepping); + + if ((int) SC_PC(os_context) >= (int) single_stepping + 3) fprintf(stderr, "* Breakpoint not re-install\n"); else { char *ptr = (char *) single_stepping; @@ -460,10 +476,70 @@ sigill_handler(HANDLER_ARGS) } } +void +sigtrap_handler(HANDLER_ARGS) +{ + os_context_t* os_context = (os_context_t *) context; + +#if 1 + fprintf(stderr,"sigtrap: fp=%lx sp=%lx pc=%lx { %x, %x, %x, %x, %x }\n", + SC_REG(context, reg_FP), + SC_REG(context, reg_SP), + SC_PC(context), + *(unsigned char*)(SC_PC(context) + 0), /* 0x0F */ + *(unsigned char*)(SC_PC(context) + 1), /* 0x0B */ + *(unsigned char*)(SC_PC(context) + 2), + *(unsigned char*)(SC_PC(context) + 3), + *(unsigned char*)(SC_PC(context) + 4)); +#endif + if (single_stepping && (signal == SIGTRAP)) { +#if 1 + fprintf(stderr, "* Single step trap %p\n", single_stepping); +#endif + +#ifdef SC_EFLAGS + /* Disable single-stepping */ + SC_EFLAGS(os_context) ^= 0x100; +#else + /* Un-install single step helper instructions. */ + *(single_stepping - 3) = single_step_save1; + *(single_stepping - 2) = single_step_save2; + *(single_stepping - 1) = single_step_save3; + DPRINTF(0, (stderr, "Uninstalling helper instructions\n")); +#endif + + /* + * Re-install the breakpoint if possible. + */ + fprintf(stderr, "* Maybe reinstall breakpoint for pc %p with single_stepping %p\n", + (void*) SC_PC(os_context), single_stepping); + + if ((unsigned long) SC_PC(os_context) <= (unsigned long) single_stepping + 3) + fprintf(stderr, "* Breakpoint not re-install\n"); + else { + char *ptr = (char *) single_stepping; + +#if 0 + ptr[0] = BREAKPOINT_INST; /* x86 INT3 */ + ptr[1] = trap_Breakpoint; +#else + ptr[0] = 0x0f; + ptr[1] = 0x0b; + ptr[2] = trap_Breakpoint; +#endif + } + + single_stepping = NULL; + return; + } +} + + void arch_install_interrupt_handlers(void) { interrupt_install_low_level_handler(SIGILL, sigill_handler); + interrupt_install_low_level_handler(SIGTRAP, sigtrap_handler); } View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/8817798f004ea8e745201c5… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/8817798f004ea8e745201c5… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-97-define-ud2-inst] 2 commits: Add debugging prints
by Raymond Toy 21 Mar '21

21 Mar '21

Raymond Toy pushed to branch issue-97-define-ud2-inst at cmucl / cmucl Commits: 16043a5b by Raymond Toy at 2021-03-21T14:58:19-07:00 Add debugging prints Add some prints to handle-breakpoints so we can see what lisp thinks is the breakpoint. Add some prints to compute_offset and handle_breakpoint so we can see what C thinks is happening with breakpoints. - - - - - 7a5a1513 by Raymond Toy at 2021-03-21T15:02:05-07:00 Add prints and fix issue with breakpoint offset off by one. When handling the breakpoint in `sigill_handler`, we were decrementing the pc by one. I guess that was for the old INT3 where the pc would be at the next instruction. With UD2, the pc is at the beginning of the UD2 instruction. With this change, setting breakpoints appear to work: ``` (break) bp :start :function #'kernel:%srqt 0 (kernel:%sqrt 2d0) *Breakpoint hit* [Condition of type SIMPLE-CONDITION] Restarts: 0: [CONTINUE] Return from BREAK. 1: [ABORT ] Return to Top-Level. Debug (type H for help) (KERNEL:%SQRT 2.0d0) ``` Add some prints so we can see what's happening. But removing breakpoints isn't working. - - - - - 3 changed files: - src/code/debug-int.lisp - src/lisp/breakpoint.c - src/lisp/x86-arch.c Changes: ===================================== src/code/debug-int.lisp ===================================== @@ -4477,6 +4477,9 @@ The result is a symbol or nil if the routine cannot be found." ;;; (defun handle-breakpoint (offset component signal-context) (let ((data (breakpoint-data component offset nil))) + (format t "(handle-breakpoint ~A ~A ~A)~%" + offset component signal-context) + (format t " data = ~A~%" data) (unless data (error (intl:gettext "Unknown breakpoint in ~S at offset ~S.") (debug-function-name (debug-function-from-pc component offset)) ===================================== src/lisp/breakpoint.c ===================================== @@ -192,6 +192,8 @@ compute_offset(os_context_t * scp, lispobj code, boolean function_end) static int compute_offset(os_context_t * scp, lispobj code, boolean function_end) { + fprintf(stderr, "compute_offset: code = 0x%lx\n", code); + if (code == NIL) return 0; else { @@ -206,11 +208,18 @@ compute_offset(os_context_t * scp, lispobj code, boolean function_end) code_start = (unsigned long) codeptr + HeaderValue(codeptr->header) * sizeof(lispobj); + + fprintf(stderr, "compute_offset: pc = 0x%lx, code_start = 0x%lx\n", + pc, code_start); + if (pc < code_start) return 0; else { int offset = pc - code_start; + fprintf(stderr, "compute_offset: offset %d, size = %ld\n", + offset, codeptr->code_size); + if (offset >= codeptr->code_size) { return 0; } else { @@ -250,6 +259,11 @@ handle_breakpoint(int signal, int subcode, os_context_t * scp) code = find_code(scp); +#if 1 + fprintf(stderr, "handle_breakpoint\n"); + fprintf(stderr, " offset = %d\n", compute_offset(scp, code, 0)); +#endif + /* * Don't disallow recursive breakpoint traps. Otherwise, we can't * use debugger breakpoints anywhere in here. ===================================== src/lisp/x86-arch.c ===================================== @@ -209,6 +209,9 @@ arch_install_breakpoint(void *pc) char* ptr = (char *) pc; unsigned long result = *(unsigned long *) pc; + fprintf(stderr, "arch_install_breakpoint at %p, old code = 0x%lx\n", + pc, result); + #if 0 *(char *) pc = BREAKPOINT_INST; /* x86 INT3 */ *((char *) pc + 1) = trap_Breakpoint; /* Lisp trap code */ @@ -216,8 +219,6 @@ arch_install_breakpoint(void *pc) *ptr++ = 0x0f; /* UD2 */ *ptr++ = 0x0b; *ptr++ = trap_Breakpoint; /* Lisp trap code */ - *ptr++ = 1; /* Vector length */ - *ptr++ = 0; /* Junk data */ #endif return result; @@ -300,7 +301,7 @@ sigill_handler(HANDLER_ARGS) { unsigned int trap; os_context_t* os_context = (os_context_t *) context; -#if 0 +#if 1 #if 0 fprintf(stderr, "x86sigtrap: %8x %x\n", SC_PC(os_os_context), *(unsigned char *) (SC_PC(os_context) - 1)); @@ -374,7 +375,7 @@ sigill_handler(HANDLER_ARGS) * arguments to follow. */ -#if 0 +#if 1 fprintf(stderr, "pc %x\n", *(unsigned short *)SC_PC(context)); #endif if (*(unsigned short *) SC_PC(context) == 0x0b0f) { @@ -383,7 +384,7 @@ sigill_handler(HANDLER_ARGS) abort(); } -#if 0 +#if 1 fprintf(stderr, "code = %x\n", trap); #endif @@ -415,19 +416,23 @@ sigill_handler(HANDLER_ARGS) break; case trap_Breakpoint: -#if 0 +#if 1 fprintf(stderr, "*C break\n"); #endif +#if 0 SC_PC(os_context) -= 1; +#endif handle_breakpoint(signal, CODE(code), os_context); -#if 0 +#if 1 fprintf(stderr, "*C break return\n"); #endif break; case trap_FunctionEndBreakpoint: +#if 0 SC_PC(os_context) -= 1; +#endif SC_PC(os_context) = (int) handle_function_end_breakpoint(signal, CODE(code), os_context); break; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d9cbe149b97772150b8d03… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d9cbe149b97772150b8d03… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-97-define-ud2-inst] 4 commits: Remove debugging prints and unused macro
by Raymond Toy 20 Mar '21

20 Mar '21

Raymond Toy pushed to branch issue-97-define-ud2-inst at cmucl / cmucl Commits: 7a5d8ab5 by Raymond Toy at 2021-03-20T09:12:14-07:00 Remove debugging prints and unused macro - - - - - b972a606 by Raymond Toy at 2021-03-20T09:13:12-07:00 Replace INT3 with UD2 - - - - - ba580ebe by Raymond Toy at 2021-03-20T09:22:24-07:00 Disable debugging prints Turn off the debugging prints and #if out the added prints. At a later time we can remove the added prints, once single-stepping is working. - - - - - d9cbe149 by Raymond Toy at 2021-03-20T09:24:56-07:00 Comment out debugging print - - - - - 4 changed files: - src/code/x86-vm.lisp - src/compiler/x86/insts.lisp - src/lisp/x86-arch.c - src/lisp/x86-assem.S Changes: ===================================== src/code/x86-vm.lisp ===================================== @@ -247,13 +247,13 @@ (vector (make-array length :element-type '(unsigned-byte 8)))) (declare (type (unsigned-byte 8) length) (type (simple-array (unsigned-byte 8) (*)) vector)) + #+nil (format t "internal-error-args scp ~A: pc ~X len ~D~%" scp pc length) ;; Grab the bytes after length byte, which (copy-from-system-area pc (* vm:byte-bits 4) vector (* vm:word-bits vm:vector-data-offset) (* length vm:byte-bits)) - (format t " vector ~A~%" vector) (let* ((index 0) (error-number (c::read-var-integer vector index))) (collect ((sc-offsets)) ===================================== src/compiler/x86/insts.lisp ===================================== @@ -2099,20 +2099,9 @@ (sc-offsets) (lengths)))))))) -#+nil -(defmacro break-cases (breaknum &body cases) - (let ((bn-temp (gensym))) - (collect ((clauses)) - (dolist (case cases) - (clauses `((= ,bn-temp ,(car case)) ,@(cdr case)))) - `(let ((,bn-temp ,breaknum)) - (cond ,@(clauses)))))) - (defun break-control (chunk inst stream dstate) - #+nil(declare (ignore inst)) + (declare (ignore inst)) (flet ((nt (x) (if stream (disassem:note x dstate)))) - (format t "break-control: inst = ~A code = ~A~%" inst (break-code chunk dstate)) - (describe inst) (case (break-code chunk dstate) (#.vm:error-trap (nt "Error trap") ===================================== src/lisp/x86-arch.c ===================================== @@ -142,7 +142,7 @@ arch_skip_instruction(os_context_t * context) { int vlen, code; - DPRINTF(1, (stderr, "[arch_skip_inst at %lx>]\n", SC_PC(context))); + DPRINTF(0, (stderr, "[arch_skip_inst at %lx>]\n", SC_PC(context))); /* Get and skip the lisp error code. */ char* pc = (char *) SC_PC(context); @@ -180,7 +180,7 @@ arch_skip_instruction(os_context_t * context) break; } - DPRINTF(1, (stderr, "[arch_skip_inst resuming at %lx>]\n", SC_PC(context))); + DPRINTF(0, (stderr, "[arch_skip_inst resuming at %lx>]\n", SC_PC(context))); } unsigned char * @@ -300,7 +300,7 @@ sigill_handler(HANDLER_ARGS) { unsigned int trap; os_context_t* os_context = (os_context_t *) context; -#if 1 +#if 0 #if 0 fprintf(stderr, "x86sigtrap: %8x %x\n", SC_PC(os_os_context), *(unsigned char *) (SC_PC(os_context) - 1)); @@ -374,14 +374,18 @@ sigill_handler(HANDLER_ARGS) * arguments to follow. */ +#if 0 fprintf(stderr, "pc %x\n", *(unsigned short *)SC_PC(context)); +#endif if (*(unsigned short *) SC_PC(context) == 0x0b0f) { trap = *(((char *)SC_PC(context)) + 2); } else { abort(); } +#if 0 fprintf(stderr, "code = %x\n", trap); +#endif switch (trap) { case trap_PendingInterrupt: ===================================== src/lisp/x86-assem.S ===================================== @@ -302,7 +302,7 @@ ENDFUNC(do_pending_interrupt) #ifdef trap_DynamicSpaceOverflowError FUNCDEF(do_dynamic_space_overflow_error) - INT3 + ud2 .byte trap_DynamicSpaceOverflowError ret ENDFUNC(do_dynamic_space_overflow_error) @@ -310,7 +310,7 @@ ENDFUNC(do_dynamic_space_overflow_error) #ifdef trap_DynamicSpaceOverflowWarning FUNCDEF(do_dynamic_space_overflow_warning) - INT3 + ud2 .byte trap_DynamicSpaceOverflowWarning ret ENDFUNC(do_dynamic_space_overflow_warning) @@ -493,7 +493,7 @@ FUNCDEF(undefined_foreign_symbol_trap) movl 8(%ebp),%eax /* Now trap to Lisp */ - INT3 + ud2 .byte trap_Error /* Number of argument bytes */ .byte 2 View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/73e864e8ddcef408af202f… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/73e864e8ddcef408af202f… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-97-define-ud2-inst] Fix disassembly of break inst
by Raymond Toy 20 Mar '21

20 Mar '21

Raymond Toy pushed to branch issue-97-define-ud2-inst at cmucl / cmucl Commits: 73e864e8 by Raymond Toy at 2021-03-20T09:09:29-07:00 Fix disassembly of break inst The code field for the break instruction had the wrong byte position. It was (byte 8 8), but it should be (byte 8 16). `(disassemble 'lisp::halt)` works now. - - - - - 1 changed file: - src/compiler/x86/insts.lisp Changes: ===================================== src/compiler/x86/insts.lisp ===================================== @@ -2064,7 +2064,7 @@ (disassem:define-instruction-format (break 24 :default-printer '(:name :tab code)) (op :fields (list (byte 8 0) (byte 8 8)) :value '(#xb00001111 #b00001011)) - (code :field (byte 8 8))) + (code :field (byte 8 16))) (define-emitter emit-break-inst 24 (byte 8 0) (byte 8 8) (byte 8 16)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/73e864e8ddcef408af202f9… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/73e864e8ddcef408af202f9… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-97-define-ud2-inst
by Raymond Toy 20 Mar '21

20 Mar '21

Raymond Toy pushed new branch issue-97-define-ud2-inst at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-97-define-ud2-inst You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][native-image] 4 commits: Make all labels global and assign a section name.
by Raymond Toy 14 Feb '21

14 Feb '21

Raymond Toy pushed to branch native-image at cmucl / cmucl Commits: 62f09401 by Raymond Toy at 2021-02-14T10:07:00-08:00 Make all labels global and assign a section name. Every label is now a global symbol. Prepend each output file with a .section to name the section we're creating. - - - - - 916ccc3a by Raymond Toy at 2021-02-14T11:47:16-08:00 Emit addresses of assembler routines to internals.h Create an array that contains the addresses of all the lisp assembler routines so that when writing out the assembly code, we can create symbols for the lisp assembler routines. - - - - - c6791370 by Raymond Toy at 2021-02-14T11:59:02-08:00 Dump the lisp assembly routines. For now, we just write out .equ pseudo op for the address of each lisp assembler routine so that the linker doesn't have any unresolved values. This is a workaround for now. Ideally, these would be real relocatable symbols at the right address in the read-only space so that everything can be relocated. - - - - - 9f3243f4 by Raymond Toy at 2021-02-14T12:39:18-08:00 Print out the initial function addr for reference. - - - - - 2 changed files: - src/compiler/generic/new-genesis.lisp - src/lisp/save.c Changes: ===================================== src/compiler/generic/new-genesis.lisp ===================================== @@ -2448,7 +2448,7 @@ (and (>= (length string) (length head)) (string= string head :end1 (length head)))) -(defun emit-c-header-aux () +(defun emit-c-header-aux (assembler-routines) (format t "/*~% * Machine generated header file. Do not edit.~% */~2%") (format t "#ifndef _INTERNALS_H_~%#define _INTERNALS_H_~2%") ;; Write out various constants @@ -2602,6 +2602,17 @@ (remove-if #'(lambda (char) (member char '(#\% #\* #\.))) (symbol-name feature)))))) + + (format t "~2%#if defined(DEFINE_ASM)~%") + (format t "/* Assembly routines */~%") + (format t "unsigned long lisp_asm_routines[] = {~%") + (dolist (routine (sort (copy-list *cold-assembler-routines*) + #'< :key #'cdr)) + (format t " 0x~8,'0x, /* ~S */~%" + (cdr routine) (car routine))) + (format t " 0x~8,'0x, /* End marker */~%" 0) + (format t "};~%") + (format t "#endif~%") ;; (format t "~%#endif~%")) @@ -2622,14 +2633,14 @@ (string/= line1 line2)) (return t))))))) -(defun emit-c-header (name) +(defun emit-c-header (name assembler-routines) (let* ((new-name (concatenate 'string (namestring name) ".NEW")) (unix-newname (unix-namestring new-name nil))) (with-open-file (*standard-output* new-name :direction :output :if-exists :supersede) - (emit-c-header-aux)) + (emit-c-header-aux assembler-routines)) (cond ((not (probe-file name)) (unix:unix-chmod unix-newname #o444) (rename-file new-name name) @@ -2755,13 +2766,15 @@ :if-exists :supersede) (write-map-file))) (when header-name + (format t "cold-assembler ~S~%" *cold-assembler-routines*) (emit-c-header (merge-pathnames (if (eq header-name t) "internals.h" (merge-pathnames header-name (make-pathname :type "h"))) - core-name)) + core-name) + *cold-assembler-routines*) (emit-makefile-header (merge-pathnames (if (eq header-name t) "internals.inc" ===================================== src/lisp/save.c ===================================== @@ -13,6 +13,8 @@ #include <limits.h> #include <math.h> +/* Get the lisp assembly routines because we need them */ +#define DEFINE_ASM #include "lisp.h" #include "os.h" #include "internals.h" @@ -394,6 +396,8 @@ save_executable(char *filename, lispobj init_function) fflush(stdout); printf("Linking executable...\n"); + printf(" init_function 0x%08lx\n", init_function); + fflush(stdout); rc = obj_run_linker(init_function, filename); printf("done.\n"); @@ -415,7 +419,8 @@ static char* asmtab_types[256]; void asm_label(lispobj* ptr, lispobj object, FILE* f) { - fprintf(f, "L%lx:\n", (unsigned long) ptr); + fprintf(f, "\t.global\tL%08lx\n", (unsigned long) ptr); + fprintf(f, "L%08lx:\n", (unsigned long) ptr); } void @@ -1356,6 +1361,7 @@ write_asm_object(const char *dir, int id, os_vm_address_t start, os_vm_address_t { char asm_file[PATH_MAX]; FILE* f; + int k; printf("write_asm_object space %d start %p end %p\n", id, start, end); @@ -1365,14 +1371,25 @@ write_asm_object(const char *dir, int id, os_vm_address_t start, os_vm_address_t lispobj* ptr = (lispobj*) start; lispobj* end_ptr = (lispobj*) end; + + /* Set the section name */ + fprintf(f, "\t.section\t\"space%d\", \"wx\"\n", id); + /* Print the assembly routines */ + k = 0; + while (lisp_asm_routines[k] != 0) { + fprintf(f, "\t.set\tL%08lx, 0x%08lx\n", + lisp_asm_routines[k], + lisp_asm_routines[k]); + ++k; + } + /* * If the id is the static space, we need special handling for * beginning which has NIL in a funny way to make NIL a symbol and * list. */ if (id == STATIC_SPACE_ID) { - int k; /* Output the first word */ asm_header_word(ptr, *ptr, f, NULL); View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/6072cf3f9f6d5431f24153… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/6072cf3f9f6d5431f24153… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][native-image] 5 commits: Fix #103: Remove random-mt19937-update
by Raymond Toy 14 Feb '21

14 Feb '21

Raymond Toy pushed to branch native-image at cmucl / cmucl Commits: b6a38aa0 by Raymond Toy at 2021-02-13T09:56:15-08:00 Fix #103: Remove random-mt19937-update We don't use the MT19937 RNG anymore, so we can remove this assembly routine. But since the code still exists for mt19937, just use reader-conditionals to disable this. - - - - - 9b1abca5 by Raymond Toy at 2021-02-13T18:20:36+00:00 Merge branch 'issue-103-remove-random-mt19937-update' into 'master' Fix #103: Remove random-mt19937-update Closes #103 See merge request cmucl/cmucl!71 - - - - - 6c4e032d by Raymond Toy at 2021-02-13T15:06:43-08:00 Merge branch 'master' into native-image - - - - - b2d56ebe by Raymond Toy at 2021-02-13T17:24:09-08:00 Add conditionalization in to match gencgc.c - - - - - 6072cf3f by Raymond Toy at 2021-02-13T17:35:39-08:00 Still print out a note for asm_header_word. Replace all calls of asm_header_word with a note of "" with a note of NULL, which means nothing to print in the comment. - - - - - 2 changed files: - src/assembly/x86/arith.lisp - src/lisp/save.c Changes: ===================================== src/assembly/x86/arith.lisp ===================================== @@ -313,7 +313,7 @@ ;;; the state vector with new random numbers. The state vector is ;;; passed in the EAX register. ;;; -#+assembler ; we don't want a vop for this one. +#+(and random-mt19937 assembler) ; we don't want a vop for this one. (define-assembly-routine (random-mt19937-update) ((:temp state unsigned-reg eax-offset) ===================================== src/lisp/save.c ===================================== @@ -462,7 +462,12 @@ asm_header_word(lispobj* ptr, lispobj object, FILE* f, const char* note) unsigned long len = HeaderValue(object); unsigned long type = TypeOf(object); - fprintf(f, "\t.4byte\t0x%lx << 8 + %ld\t# %s\n", len, type, asmtab_types[type]); + fprintf(f, "\t.4byte\t0x%lx << 8 + %ld\t# %s", len, type, asmtab_types[type]); + if (note) { + fprintf(f, ": %s\n", note); + } else { + fprintf(f, "\n"); + } } @@ -487,7 +492,7 @@ asm_boxed(lispobj* ptr, lispobj object, FILE* f) asm_label(ptr, object, f); - asm_header_word(ptr, object, f, ""); + asm_header_word(ptr, object, f, NULL); for (k = 1; k < len; ++k) { asm_lispobj(ptr + k, ptr[k], f); @@ -542,7 +547,7 @@ asm_fdefn(lispobj* ptr, lispobj object, FILE* f) { asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "fdefn"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(ptr + 1, ptr[1], f); asm_lispobj(ptr + 2, ptr[2], f); @@ -576,7 +581,7 @@ asm_simple_vector(lispobj* ptr, lispobj object, FILE* f) lispobj* data = ptr + 2; asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "simple vector"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(ptr + 1, ptr[1], f); for (k = 0; k < len; ++k) { @@ -596,7 +601,7 @@ asm_closure_header(lispobj* ptr, lispobj object, FILE* f) closure = (struct closure *) ptr; asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "closure header"); + asm_header_word(ptr, object, f, NULL); fprintf(f, "\t.4byte\tL%08lx\n", closure->function); nwords -= 2; @@ -614,7 +619,7 @@ asm_symbol_header(lispobj* ptr, lispobj object, FILE* f) struct symbol* sym = (struct symbol*) ptr; asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "symbol header"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(&sym->value, sym->value, f); asm_lispobj(&sym->hash, sym->hash, f); asm_lispobj(&sym->plist, sym->plist, f); @@ -653,7 +658,7 @@ asm_code_header(lispobj* ptr, lispobj object, FILE* f) #endif asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "code header"); + asm_header_word(ptr, object, f, NULL); for (k = 0; k < nheader_words - 1; ++k) { asm_lispobj(ptr + k + 1, ptr[k + 1], f); @@ -677,7 +682,7 @@ asm_code_header(lispobj* ptr, lispobj object, FILE* f) fprintf(f, "# ->code %p\n", &fheaderp->code); #endif asm_label((lispobj*)fheaderp, *((lispobj*)fheaderp), f); - asm_header_word(&fheaderp->header, fheaderp->header, f, "function header"); + asm_header_word(&fheaderp->header, fheaderp->header, f, NULL); fprintf(f, "\t.4byte\tL%lx\n", fheaderp->self); asm_lispobj(&fheaderp->next, fheaderp->next, f); asm_lispobj(&fheaderp->name, fheaderp->name, f); @@ -764,7 +769,7 @@ asm_simple_string(lispobj* where, lispobj object, FILE* f) #endif asm_label(where, object, f); - asm_header_word(where, object, f, "simple string"); + asm_header_word(where, object, f, NULL); asm_lispobj(where + 1, where[1], f); s = (uint16_t*) vector->data; @@ -802,7 +807,7 @@ asm_vector_bit(lispobj* ptr, lispobj object, FILE* f) #endif asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "simple bit-vector"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(ptr + 1, ptr[1], f); data = vector->data; @@ -851,7 +856,7 @@ asm_single_float(lispobj* ptr, lispobj object, FILE* f) struct single_float* obj = (struct single_float*) ptr; asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "single float"); + asm_header_word(ptr, object, f, NULL); print_float(f, obj->value); return 2; @@ -895,7 +900,7 @@ asm_double_float(lispobj* ptr, lispobj object, FILE* f) struct double_float* obj = (struct double_float*) ptr; asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "double float"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(&obj->filler, obj->filler, f); print_double(f, obj->value); @@ -908,7 +913,7 @@ asm_double_double_float(lispobj* ptr, lispobj object, FILE* f) struct double_double_float* obj = (struct double_double_float*) ptr; asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "double double float"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(&obj->filler, obj->filler, f); print_double(f, obj->hi); @@ -923,7 +928,7 @@ asm_complex_single_float(lispobj* ptr, lispobj object, FILE* f) struct complex_single_float* obj = (struct complex_single_float*) ptr; asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "complex single-float"); + asm_header_word(ptr, object, f, NULL); print_float(f, obj->real); print_float(f, obj->imag); /* Force double word boundary */ @@ -938,7 +943,7 @@ asm_complex_double_float(lispobj* ptr, lispobj object, FILE* f) struct complex_double_float* obj = (struct complex_double_float*) ptr; asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "complex double-float"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(&obj->filler, obj->filler, f); print_double(f, obj->real); @@ -953,7 +958,7 @@ asm_complex_double_double_float(lispobj* ptr, lispobj object, FILE* f) struct complex_double_double_float* obj = (struct complex_double_double_float*) ptr; asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "complex double-float"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(&obj->filler, obj->filler, f); print_double(f, obj->real_hi); @@ -981,7 +986,7 @@ asm_vector_unsigned_byte_2(lispobj* ptr, lispobj object, FILE* f) nwords = CEILING(NWORDS(length, 16) + 2, 2); #endif asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "vector unsigned_byte 2"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(ptr + 1, ptr[1], f); data = vector->data; @@ -1012,7 +1017,7 @@ asm_vector_unsigned_byte_4(lispobj* ptr, lispobj object, FILE* f) nwords = CEILING(NWORDS(length, 8) + 2, 2); #endif asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "vector unsigned_byte 4"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(ptr + 1, ptr[1], f); data = vector->data; @@ -1043,7 +1048,7 @@ asm_vector_unsigned_byte_8(lispobj* ptr, lispobj object, FILE* f) nwords = CEILING(NWORDS(length, 4) + 2, 2); #endif asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "vector unsigned_byte 8"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(ptr + 1, ptr[1], f); data = vector->data; @@ -1072,7 +1077,7 @@ asm_vector_unsigned_byte_16(lispobj* ptr, lispobj object, FILE* f) nwords = CEILING(NWORDS(length, 2) + 2, 2); #endif asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "vector unsigned_byte 16"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(ptr + 1, ptr[1], f); data = (uint16_t*) vector->data; @@ -1104,7 +1109,7 @@ asm_vector_unsigned_byte_32(lispobj* ptr, lispobj object, FILE* f) #endif asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "vector unsigned_byte 32"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(ptr + 1, ptr[1], f); data = vector->data; @@ -1134,7 +1139,7 @@ asm_vector_double_float(lispobj* ptr, lispobj object, FILE* f) #endif asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "vector double-float"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(ptr + 1, ptr[1], f); data = (const double*) vector->data; @@ -1160,7 +1165,7 @@ asm_vector_double_double_float(lispobj* ptr, lispobj object, FILE* f) nwords = CEILING(length * 4 + 2, 2); asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "vector double-float"); + asm_header_word(ptr, object, f, NULL); asm_lispobj(ptr + 1, ptr[1], f); data = (const double*) vector->data; @@ -1181,7 +1186,7 @@ asm_bignum(lispobj* ptr, lispobj object, FILE* f) len = CEILING(len, 2); asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "bignum"); + asm_header_word(ptr, object, f, NULL); for (k = 1; k < len; ++k) { fprintf(f, "\t.4byte\t0x%lx\t# %lu\n", ptr[k], ptr[k]); @@ -1194,7 +1199,7 @@ int asm_sap(lispobj* ptr, lispobj object, FILE* f) { asm_label(ptr, object, f); - asm_header_word(ptr, object, f, "sap"); + asm_header_word(ptr, object, f, NULL); /* Just print out the raw value of the address */ fprintf(f, "\t.4byte\t0x%lx\n", ptr[1]); @@ -1215,11 +1220,19 @@ init_asmtab(void) asmtab_types[type_Ratio] = "Ratio"; asmtab_types[type_SingleFloat] = "SingleFloat"; asmtab_types[type_DoubleFloat] = "DoubleFloat"; +#ifdef type_DoubleDoubleFloat asmtab_types[type_DoubleDoubleFloat] = "DoubleDoubleFloat"; +#endif asmtab_types[type_Complex] = "Complex"; +#ifdef type_ComplexSingleFloat asmtab_types[type_ComplexSingleFloat] = "ComplexSingleFloat"; +#endif +#ifdef type_ComplexDoubleFloat asmtab_types[type_ComplexDoubleFloat] = "ComplexDoubleFloat"; +#endif +#ifdef type_ComplexDoubleDoubleFloat asmtab_types[type_ComplexDoubleDoubleFloat] = "ComplexDoubleDoubleFloat"; +#endif asmtab_types[type_SimpleArray] = "SimpleArray"; asmtab_types[type_SimpleString] = "SimpleString"; asmtab_types[type_SimpleBitVector] = "SimpleBitVector"; @@ -1229,16 +1242,32 @@ init_asmtab(void) asmtab_types[type_SimpleArrayUnsignedByte8] = "SimpleArrayUnsignedByte8"; asmtab_types[type_SimpleArrayUnsignedByte16] = "SimpleArrayUnsignedByte16"; asmtab_types[type_SimpleArrayUnsignedByte32] = "SimpleArrayUnsignedByte32"; +#ifdef type_SimpleArraySignedByte8 asmtab_types[type_SimpleArraySignedByte8] = "SimpleArraySignedByte8"; +#endif +#ifdef type_SimpleArraySignedByte16 asmtab_types[type_SimpleArraySignedByte16] = "SimpleArraySignedByte16"; +#endif +#ifdef type_SimpleArraySignedByte30 asmtab_types[type_SimpleArraySignedByte30] = "SimpleArraySignedByte30"; +#endif +#ifdef type_SimpleArraySignedByte32 asmtab_types[type_SimpleArraySignedByte32] = "SimpleArraySignedByte32"; +#endif asmtab_types[type_SimpleArraySingleFloat] = "SimpleArraySingleFloat"; asmtab_types[type_SimpleArrayDoubleFloat] = "SimpleArrayDoubleFloat"; +#ifdef type_SimpleArrayDoubleDoubleFloat asmtab_types[type_SimpleArrayDoubleDoubleFloat] = "SimpleArrayDoubleDoubleFloat"; +#endif +#ifdef type_SimpleArrayComplexSingleFloat asmtab_types[type_SimpleArrayComplexSingleFloat] = "SimpleArrayComplexSingleFloat"; +#endif +#ifdef type_SimpleArrayComplexDoubleFloat asmtab_types[type_SimpleArrayComplexDoubleFloat] = "SimpleArrayComplexDoubleFloat"; +#endif +#ifdef type_SimpleArrayComplexDoubleDoubleFloat asmtab_types[type_SimpleArrayComplexDoubleDoubleFloat] = "SimpleArrayComplexDoubleDoubleFloat"; +#endif asmtab_types[type_ComplexString] = "ComplexString"; asmtab_types[type_ComplexBitVector] = "ComplexBitVector"; asmtab_types[type_ComplexVector] = "ComplexVector"; @@ -1280,11 +1309,19 @@ init_asmtab(void) asmtab[type_Ratio] = asm_boxed; asmtab[type_SingleFloat] = asm_single_float; asmtab[type_DoubleFloat] = asm_double_float; +#ifdef type_DoubleDoubleFloat asmtab[type_DoubleDoubleFloat] = asm_double_double_float; +#endif asmtab[type_Complex] = asm_boxed; +#ifdef type_ComplexSingleFloat asmtab[type_ComplexSingleFloat] = asm_complex_single_float; +#endif +#ifdef type_ComplexDoubleFloat asmtab[type_ComplexDoubleFloat] = asm_complex_double_float; +#endif +#ifdef type_ComplexDoubleDoubleFloat asmtab[type_ComplexDoubleDoubleFloat] = asm_complex_double_double_float; +#endif asmtab[type_SimpleArray] = asm_boxed; asmtab[type_SimpleString] = asm_simple_string; asmtab[type_SimpleBitVector] = asm_vector_bit; @@ -1295,12 +1332,16 @@ init_asmtab(void) asmtab[type_SimpleArrayUnsignedByte16] = asm_vector_unsigned_byte_16; asmtab[type_SimpleArrayUnsignedByte32] = asm_vector_unsigned_byte_32; asmtab[type_SimpleArrayDoubleFloat] = asm_vector_double_float; +#ifdef type_SimpleArrayDoubleDoubleFloat asmtab[type_SimpleArrayDoubleDoubleFloat] = asm_vector_double_double_float; +#endif asmtab[type_ComplexString] = asm_boxed; asmtab[type_ComplexVector] = asm_boxed; asmtab[type_CodeHeader] = asm_code_header; +#if defined(i386) || defined(__x86_64) asmtab[type_ClosureHeader] = asm_closure_header; asmtab[type_FuncallableInstanceHeader] = asm_closure_header; +#endif /* Just use asm_boxed or have a special version for a value cell? */ asmtab[type_ValueCellHeader] = asm_boxed; asmtab[type_SymbolHeader] = asm_symbol_header; @@ -1334,7 +1375,7 @@ write_asm_object(const char *dir, int id, os_vm_address_t start, os_vm_address_t int k; /* Output the first word */ - asm_header_word(ptr, *ptr, f, ""); + asm_header_word(ptr, *ptr, f, NULL); /* Header word for NIL */ asm_header_word(ptr + 1, ptr[1], f, "NIL header"); /* Label for NIL */ View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/2f2f9ba8db53aac8b2ce05… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/2f2f9ba8db53aac8b2ce05… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #103: Remove random-mt19937-update
by Raymond Toy 13 Feb '21

13 Feb '21

Raymond Toy pushed to branch master at cmucl / cmucl Commits: b6a38aa0 by Raymond Toy at 2021-02-13T09:56:15-08:00 Fix #103: Remove random-mt19937-update We don't use the MT19937 RNG anymore, so we can remove this assembly routine. But since the code still exists for mt19937, just use reader-conditionals to disable this. - - - - - 9b1abca5 by Raymond Toy at 2021-02-13T18:20:36+00:00 Merge branch 'issue-103-remove-random-mt19937-update' into 'master' Fix #103: Remove random-mt19937-update Closes #103 See merge request cmucl/cmucl!71 - - - - - 1 changed file: - src/assembly/x86/arith.lisp Changes: ===================================== src/assembly/x86/arith.lisp ===================================== @@ -313,7 +313,7 @@ ;;; the state vector with new random numbers. The state vector is ;;; passed in the EAX register. ;;; -#+assembler ; we don't want a vop for this one. +#+(and random-mt19937 assembler) ; we don't want a vop for this one. (define-assembly-routine (random-mt19937-update) ((:temp state unsigned-reg eax-offset) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/f99321c7080b723a0d0f4f… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/f99321c7080b723a0d0f4f… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0