diff options
-rw-r--r-- | libguile/programs.c | 4 | ||||
-rw-r--r-- | libguile/programs.h | 2 | ||||
-rw-r--r-- | module/ice-9/session.scm | 2 | ||||
-rw-r--r-- | module/language/tree-il/analyze.scm | 2 | ||||
-rw-r--r-- | module/statprof.scm | 4 | ||||
-rw-r--r-- | module/system/repl/command.scm | 2 | ||||
-rw-r--r-- | module/system/repl/debug.scm | 2 | ||||
-rw-r--r-- | module/system/vm/coverage.scm | 4 | ||||
-rw-r--r-- | module/system/vm/disassembler.scm | 2 | ||||
-rw-r--r-- | module/system/vm/frame.scm | 2 | ||||
-rw-r--r-- | module/system/vm/program.scm | 14 | ||||
-rw-r--r-- | module/system/vm/traps.scm | 4 | ||||
-rw-r--r-- | module/system/xref.scm | 9 |
13 files changed, 26 insertions, 27 deletions
diff --git a/libguile/programs.c b/libguile/programs.c index 29132550e..f2293cccc 100644 --- a/libguile/programs.c +++ b/libguile/programs.c @@ -136,10 +136,10 @@ scm_i_program_print (SCM program, SCM port, scm_print_state *pstate) * Scheme interface */ -SCM_DEFINE (scm_rtl_program_p, "rtl-program?", 1, 0, 0, +SCM_DEFINE (scm_program_p, "program?", 1, 0, 0, (SCM obj), "") -#define FUNC_NAME s_scm_rtl_program_p +#define FUNC_NAME s_scm_program_p { return scm_from_bool (SCM_PROGRAM_P (obj)); } diff --git a/libguile/programs.h b/libguile/programs.h index 535d2d665..eff834cb2 100644 --- a/libguile/programs.h +++ b/libguile/programs.h @@ -41,7 +41,7 @@ scm_i_make_program (const scm_t_uint32 *code) } #endif -SCM_INTERNAL SCM scm_rtl_program_p (SCM obj); +SCM_INTERNAL SCM scm_program_p (SCM obj); SCM_INTERNAL SCM scm_rtl_program_code (SCM program); SCM_INTERNAL SCM scm_primitive_p (SCM obj); diff --git a/module/ice-9/session.scm b/module/ice-9/session.scm index 4c2103391..a6ab3ab75 100644 --- a/module/ice-9/session.scm +++ b/module/ice-9/session.scm @@ -522,7 +522,7 @@ The alist keys that are currently defined are `required', `optional', (rest . ,rest))))) ((procedure-source proc) => cadr) - (((@ (system vm program) rtl-program?) proc) + (((@ (system vm program) program?) proc) ((@ (system vm program) program-arguments-alist) proc)) (else #f))) diff --git a/module/language/tree-il/analyze.scm b/module/language/tree-il/analyze.scm index 5a87cd99b..0ce7344e7 100644 --- a/module/language/tree-il/analyze.scm +++ b/module/language/tree-il/analyze.scm @@ -950,7 +950,7 @@ given `tree-il' element." (or (and (or (null? x) (pair? x)) (length x)) 0)) - (cond ((rtl-program? proc) + (cond ((program? proc) (values (procedure-name proc) (map (lambda (a) (list (length (or (assq-ref a 'required) '())) diff --git a/module/statprof.scm b/module/statprof.scm index bb6751b7b..ea3d3910f 100644 --- a/module/statprof.scm +++ b/module/statprof.scm @@ -217,7 +217,7 @@ (define (get-call-data proc) (let ((k (cond - ((rtl-program? proc) (rtl-program-code proc)) + ((program? proc) (rtl-program-code proc)) (else proc)))) (or (hashv-ref procedure-data k) (let ((call-data (make-call-data proc 0 0 0))) @@ -580,7 +580,7 @@ to @code{statprof-reset} is true." (lambda (a b) (cond ((eq? a b)) - ((and (rtl-program? a) (rtl-program? b)) + ((and (program? a) (program? b)) (eq? (rtl-program-code a) (rtl-program-code b))) (else #f)))) diff --git a/module/system/repl/command.scm b/module/system/repl/command.scm index 631957a83..0cd9f121c 100644 --- a/module/system/repl/command.scm +++ b/module/system/repl/command.scm @@ -492,7 +492,7 @@ Run the optimizer on a piece of code and print the result." Disassemble a compiled procedure." (let ((obj (repl-eval repl (repl-parse repl form)))) (cond - ((rtl-program? obj) + ((program? obj) (disassemble-program obj)) ((bytevector? obj) (disassemble-image (load-image obj))) diff --git a/module/system/repl/debug.scm b/module/system/repl/debug.scm index 2ca73648d..77228b469 100644 --- a/module/system/repl/debug.scm +++ b/module/system/repl/debug.scm @@ -95,7 +95,7 @@ (format port "~aRegisters:~%" per-line-prefix) (print "ip = #x~x" (frame-instruction-pointer frame)) - (when (rtl-program? (frame-procedure frame)) + (when (program? (frame-procedure frame)) (let ((code (rtl-program-code (frame-procedure frame)))) (format port " (#x~x~@d)" code (- (frame-instruction-pointer frame) code)))) diff --git a/module/system/vm/coverage.scm b/module/system/vm/coverage.scm index 4c9644e93..13ce9c29d 100644 --- a/module/system/vm/coverage.scm +++ b/module/system/vm/coverage.scm @@ -257,7 +257,7 @@ executed." ((< val* val) (lp (1+ idx) end)) (else elt)))))) - (and (rtl-program? proc) + (and (program? proc) (match (binary-search (data-ip-counts data) car (rtl-program-code proc)) (#f 0) ((ip . code) code)))) @@ -312,7 +312,7 @@ gathered, even if their code was not executed." #; (define (dump-function proc) ;; Dump source location and basic coverage data for PROC. - (and (or (program? proc) (rtl-program? proc)) + (and (or (program? proc)) (let ((sources (program-sources* data proc))) (and (pair? sources) (let* ((line (source:line-for-user (car sources))) diff --git a/module/system/vm/disassembler.scm b/module/system/vm/disassembler.scm index ccdedf808..27b90c3d6 100644 --- a/module/system/vm/disassembler.scm +++ b/module/system/vm/disassembler.scm @@ -416,7 +416,7 @@ address of that offset." (define* (fold-program-code proc seed program-or-addr #:key raw?) (cond - ((find-program-debug-info (if (rtl-program? program-or-addr) + ((find-program-debug-info (if (program? program-or-addr) (rtl-program-code program-or-addr) program-or-addr)) => (lambda (pdi) diff --git a/module/system/vm/frame.scm b/module/system/vm/frame.scm index 3ab3e1ed8..3c0cbb53a 100644 --- a/module/system/vm/frame.scm +++ b/module/system/vm/frame.scm @@ -88,7 +88,7 @@ (cons (or (false-if-exception (procedure-name p)) p) (cond - ((and (rtl-program? p) + ((and (program? p) (program-arguments-alist p (frame-instruction-pointer frame))) ;; case 1 => (lambda (arguments) diff --git a/module/system/vm/program.scm b/module/system/vm/program.scm index 9d1fdb15e..3da7fe963 100644 --- a/module/system/vm/program.scm +++ b/module/system/vm/program.scm @@ -41,7 +41,7 @@ program-arguments-alist program-arguments-alists program-lambda-list - rtl-program? rtl-program-code + program? rtl-program-code program-free-variables program-num-free-variables program-free-variable-ref program-free-variable-set!)) @@ -51,20 +51,20 @@ ;; These procedures are called by programs.c. (define (rtl-program-name program) - (unless (rtl-program? program) + (unless (program? program) (error "shouldn't get here")) (and=> (find-program-debug-info (rtl-program-code program)) program-debug-info-name)) (define (rtl-program-documentation program) - (unless (rtl-program? program) + (unless (program? program) (error "shouldn't get here")) (find-program-docstring (rtl-program-code program))) (define (rtl-program-minimum-arity program) - (unless (rtl-program? program) + (unless (program? program) (error "shouldn't get here")) (program-minimum-arity (rtl-program-code program))) (define (rtl-program-properties program) - (unless (rtl-program? program) + (unless (program? program) (error "shouldn't get here")) (find-program-properties (rtl-program-code program))) @@ -257,7 +257,7 @@ (arity->arguments-alist prog (list 0 0 nreq nopt rest? '(#f . ())))))))) - ((rtl-program? prog) + ((program? prog) (or-map (lambda (arity) (and (or (not ip) (and (<= (arity-low-pc arity) ip) @@ -305,7 +305,7 @@ lists." (list 0 0 nreq nopt rest? '(#f . ()))))))) (cond ((primitive? prog) (fallback)) - ((rtl-program? prog) + ((program? prog) (let ((arities (find-program-arities (rtl-program-code prog)))) (if arities (map arity-arguments-alist arities) diff --git a/module/system/vm/traps.scm b/module/system/vm/traps.scm index f1dcc29b2..805f9f648 100644 --- a/module/system/vm/traps.scm +++ b/module/system/vm/traps.scm @@ -115,7 +115,7 @@ (define (frame-matcher proc match-code?) (if match-code? - (if (rtl-program? proc) + (if (program? proc) (let ((start (rtl-program-code proc)) (end (program-last-ip proc))) (lambda (frame) @@ -317,7 +317,7 @@ (define (program-sources-by-line proc file) (cond - ((rtl-program? proc) + ((program? proc) (let ((code (rtl-program-code proc))) (let lp ((sources (program-sources proc)) (out '())) diff --git a/module/system/xref.scm b/module/system/xref.scm index 65d0fed5f..2b943fdd9 100644 --- a/module/system/xref.scm +++ b/module/system/xref.scm @@ -35,12 +35,12 @@ (define (nested-procedures prog) (define (cons-uniq x y) (if (memq x y) y (cons x y))) - (if (rtl-program? prog) + (if (program? prog) (reverse (fold-program-code (lambda (elt out) (match elt (('static-ref dst proc) - (if (rtl-program? proc) + (if (program? proc) (fold cons-uniq (cons proc out) (nested-procedures prog)) @@ -79,7 +79,7 @@ (define (procedure-callee-rev-vars proc) (cond - ((rtl-program? proc) (program-callee-rev-vars proc)) + ((program? proc) (program-callee-rev-vars proc)) (else '()))) (define (procedure-callees prog) @@ -201,8 +201,7 @@ pair of the form (module-name . variable-name), " ;; ((ip file line . col) ...) (define (procedure-sources proc) (cond - ((or (rtl-program? proc) (program? proc)) - (program-sources proc)) + ((program? proc) (program-sources proc)) (else '()))) ;; file -> line -> (proc ...) |