mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-11 22:31:12 +02:00
Code Activity

rtl-program-code -> program-code

Browse source 
* libguile/programs.h:
* libguile/programs.c (scm_program_code): Rename from
  scm_rtl_program_code.  Also renames rtl-program-code to program-code.

* module/statprof.scm:
* module/system/repl/command.scm:
* module/system/repl/debug.scm:
* module/system/vm/coverage.scm:
* module/system/vm/disassembler.scm:
* module/system/vm/program.scm:
* module/system/vm/traps.scm:
* test-suite/tests/dwarf.test:
* test-suite/tests/rtl.test: Adapt callers.
This commit is contained in:
Andy Wingo 2013-11-19 19:16:26 +01:00
parent 0bd1e9c6a0
commit d1100525ff
11 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libguile/programs.c
View file

@ -30,10 +30,10 @@
static SCM write_program = SCM_BOOL_F;
SCM_DEFINE (scm_rtl_program_code, "rtl-program-code", 1, 0, 0,
SCM_DEFINE (scm_program_code, "program-code", 1, 0, 0,
(SCM program),
"")
#define FUNC_NAME s_scm_rtl_program_code
#define FUNC_NAME s_scm_program_code
{
SCM_VALIDATE_PROGRAM (1, program);

2
libguile/programs.h
View file

@ -42,7 +42,7 @@ scm_i_make_program (const scm_t_uint32 *code)
#endif
SCM_INTERNAL SCM scm_program_p (SCM obj);
SCM_INTERNAL SCM scm_rtl_program_code (SCM program);
SCM_INTERNAL SCM scm_program_code (SCM program);
SCM_INTERNAL SCM scm_primitive_p (SCM obj);
SCM_INTERNAL SCM scm_primitive_call_ip (SCM prim);

4
module/statprof.scm
View file

@ -217,7 +217,7 @@
(define (get-call-data proc)
(let ((k (cond
((program? proc) (rtl-program-code proc))
((program? proc) (program-code proc))
(else proc))))
(or (hashv-ref procedure-data k)
(let ((call-data (make-call-data proc 0 0 0)))
@ -581,7 +581,7 @@ to @code{statprof-reset} is true."
(cond
((eq? a b))
((and (program? a) (program? b))
(eq? (rtl-program-code a) (rtl-program-code b)))
(eq? (program-code a) (program-code b)))
(else
#f))))

2
module/system/repl/command.scm
View file

@ -459,7 +459,7 @@ Change languages."
(define (load-image x)
(let ((thunk (load-thunk-from-memory x)))
(find-mapped-elf-image (rtl-program-code thunk))))
(find-mapped-elf-image (program-code thunk))))
(define-meta-command (compile repl (form))
"compile EXP

2
module/system/repl/debug.scm
View file

@ -96,7 +96,7 @@
(format port "~aRegisters:~%" per-line-prefix)
(print "ip = #x~x" (frame-instruction-pointer frame))
(when (program? (frame-procedure frame))
(let ((code (rtl-program-code (frame-procedure frame))))
(let ((code (program-code (frame-procedure frame))))
(format port " (#x~x~@d)" code
(- (frame-instruction-pointer frame) code))))
(newline port)

2
module/system/vm/coverage.scm
View file

@ -258,7 +258,7 @@ executed."
(lp (1+ idx) end))
(else elt))))))
(and (program? proc)
(match (binary-search (data-ip-counts data) car (rtl-program-code proc))
(match (binary-search (data-ip-counts data) car (program-code proc))
(#f 0)
((ip . code) code))))

6
module/system/vm/disassembler.scm
View file

@ -350,7 +350,7 @@ address of that offset."
(define* (disassemble-program program #:optional (port (current-output-port)))
(cond
((find-program-debug-info (rtl-program-code program))
((find-program-debug-info (program-code program))
=> (lambda (pdi)
(format port "Disassembly of ~S at #x~X:\n\n" program
(program-debug-info-addr pdi))
@ -417,7 +417,7 @@ address of that offset."
(define* (fold-program-code proc seed program-or-addr #:key raw?)
(cond
((find-program-debug-info (if (program? program-or-addr)
(rtl-program-code program-or-addr)
(program-code program-or-addr)
program-or-addr))
=> (lambda (pdi)
(fold-code-range proc seed
@ -452,5 +452,5 @@ address of that offset."
(define (disassemble-file file)
(let* ((thunk (load-thunk-from-file file))
(elf (find-mapped-elf-image (rtl-program-code thunk))))
(elf (find-mapped-elf-image (program-code thunk))))
(disassemble-image elf)))

22
module/system/vm/program.scm
View file

@ -41,7 +41,7 @@
program-arguments-alist program-arguments-alists
program-lambda-list
program? rtl-program-code
program? program-code
program-free-variables
program-num-free-variables
program-free-variable-ref program-free-variable-set!))
@ -53,20 +53,20 @@
(define (rtl-program-name program)
(unless (program? program)
(error "shouldn't get here"))
(and=> (find-program-debug-info (rtl-program-code program))
(and=> (find-program-debug-info (program-code program))
program-debug-info-name))
(define (rtl-program-documentation program)
(unless (program? program)
(error "shouldn't get here"))
(find-program-docstring (rtl-program-code program)))
(find-program-docstring (program-code program)))
(define (rtl-program-minimum-arity program)
(unless (program? program)
(error "shouldn't get here"))
(program-minimum-arity (rtl-program-code program)))
(program-minimum-arity (program-code program)))
(define (rtl-program-properties program)
(unless (program? program)
(error "shouldn't get here"))
(find-program-properties (rtl-program-code program)))
(find-program-properties (program-code program)))
(define (make-binding name boxed? index start end)
(list name boxed? index start end))
@ -102,11 +102,11 @@
(define (program-sources proc)
(map (lambda (source)
(cons* (- (source-post-pc source) (rtl-program-code proc))
(cons* (- (source-post-pc source) (program-code proc))
(source-file source)
(source-line source)
(source-column source)))
(find-program-sources (rtl-program-code proc))))
(find-program-sources (program-code proc))))
(define* (program-source proc ip #:optional (sources (program-sources proc)))
(let lp ((source #f) (sources sources))
@ -129,11 +129,11 @@
;;
(define (program-sources-pre-retire proc)
(map (lambda (source)
(cons* (- (source-pre-pc source) (rtl-program-code proc))
(cons* (- (source-pre-pc source) (program-code proc))
(source-file source)
(source-line source)
(source-column source)))
(find-program-sources (rtl-program-code proc))))
(find-program-sources (program-code proc))))
(define (collapse-locals locs)
(let lp ((ret '()) (locs locs))
@ -263,7 +263,7 @@
(and (<= (arity-low-pc arity) ip)
(< ip (arity-high-pc arity))))
(arity-arguments-alist arity)))
(or (find-program-arities (rtl-program-code prog)) '())))
(or (find-program-arities (program-code prog)) '())))
(else
(let ((arity (program-arity prog ip)))
(and arity
@ -306,7 +306,7 @@ lists."
(cond
((primitive? prog) (fallback))
((program? prog)
(let ((arities (find-program-arities (rtl-program-code prog))))
(let ((arities (find-program-arities (program-code prog))))
(if arities
(map arity-arguments-alist arities)
(fallback))))

6
module/system/vm/traps.scm
View file

@ -110,13 +110,13 @@
;; Returns an absolute IP.
(define (program-last-ip prog)
(let ((pdi (find-program-debug-info (rtl-program-code prog))))
(let ((pdi (find-program-debug-info (program-code prog))))
(and pdi (program-debug-info-size pdi))))
(define (frame-matcher proc match-code?)
(if match-code?
(if (program? proc)
(let ((start (rtl-program-code proc))
(let ((start (program-code proc))
(end (program-last-ip proc)))
(lambda (frame)
(let ((ip (frame-instruction-pointer frame)))
@ -318,7 +318,7 @@
(define (program-sources-by-line proc file)
(cond
((program? proc)
(let ((code (rtl-program-code proc)))
(let ((code (program-code proc)))
(let lp ((sources (program-sources proc))
(out '()))
(if (pair? sources)

8
test-suite/tests/dwarf.test
View file

@ -49,19 +49,19 @@
(pass-if-equal 13 (bar 10))
(let ((source (find-source-for-addr (rtl-program-code qux))))
(let ((source (find-source-for-addr (program-code qux))))
(pass-if-equal "foo.scm" (source-file source))
(pass-if-equal 0 (source-line source))
(pass-if-equal 1 (source-line-for-user source))
(pass-if-equal 0 (source-column source)))
(let ((source (find-source-for-addr (rtl-program-code bar))))
(let ((source (find-source-for-addr (program-code bar))))
(pass-if-equal "foo.scm" (source-file source))
(pass-if-equal 4 (source-line source))
(pass-if-equal 5 (source-line-for-user source))
(pass-if-equal 2 (source-column source)))
(match (find-program-sources (rtl-program-code qux))
(match (find-program-sources (program-code qux))
((s1 s2 s3)
(pass-if-equal "foo.scm" (source-file s1))
(pass-if-equal 0 (source-line s1))
@ -80,7 +80,7 @@
(sources
(error "unexpected sources" sources)))
(match (find-program-sources (rtl-program-code bar))
(match (find-program-sources (program-code bar))
((source)
(pass-if-equal "foo.scm" (source-file source))
(pass-if-equal 4 (source-line source))

6
test-suite/tests/rtl.test
View file

@ -320,16 +320,16 @@ a procedure."
(end-arity)
(end-program)))))
(pass-if "program name"
(and=> (find-program-debug-info (rtl-program-code return-3))
(and=> (find-program-debug-info (program-code return-3))
(lambda (pdi)
(equal? (program-debug-info-name pdi)
'return-3))))
(pass-if "program address"
(and=> (find-program-debug-info (rtl-program-code return-3))
(and=> (find-program-debug-info (program-code return-3))
(lambda (pdi)
(equal? (program-debug-info-addr pdi)
(rtl-program-code return-3)))))))
(program-code return-3)))))))
(with-test-prefix "procedure name"
(pass-if-equal 'foo