mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 03:30:27 +02:00
Code Activity

Rename scm_tc7_rtl_program to scm_tc7_program

Browse source 
* libguile/tags.h (scm_tc7_program): Rename from scm_tc7_rtl_program.
* libguile/continuations.c:
* libguile/control.c:
* libguile/evalext.c:
* libguile/foreign.c:
* libguile/goops.c:
* libguile/gsubr.c:
* libguile/print.c:
* libguile/programs.c:
* libguile/programs.h:
* libguile/vm-engine.c: Adapt users.

* module/system/vm/assembler.scm: Rename a tc7-rtl-program local to
  tc7-program.
* libguile/tags.h (scm_tc7_program): Rename from scm_tc7_rtl_program. * libguile/continuations.c: * libguile/control.c: * libguile/evalext.c: * libguile/foreign.c: * libguile/goops.c: * libguile/gsubr.c: * libguile/print.c: * libguile/programs.c: * libguile/programs.h: * libguile/vm-engine.c: Adapt users.

* module/system/vm/assembler.scm: Rename a tc7-rtl-program local to
  tc7-program.
This commit is contained in:
Andy Wingo 2013-11-19 18:24:22 +01:00
parent 9121d9f1ac
commit e0755cd12a
12 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/continuations.c
View file

@ -75,7 +75,7 @@ make_continuation_trampoline (SCM contregs)
scm_t_bits nfree = 1;
scm_t_bits flags = SCM_F_PROGRAM_IS_CONTINUATION;
ret = scm_words (scm_tc7_rtl_program | (nfree << 16) | flags, nfree + 2);
ret = scm_words (scm_tc7_program | (nfree << 16) | flags, nfree + 2);
SCM_SET_CELL_WORD_1 (ret, continuation_stub_code);
SCM_RTL_PROGRAM_FREE_VARIABLE_SET (ret, 0, contregs);

2
libguile/control.c
View file

@ -70,7 +70,7 @@ make_partial_continuation (SCM vm_cont)
scm_t_bits flags = SCM_F_PROGRAM_IS_PARTIAL_CONTINUATION;
SCM ret;
ret = scm_words (scm_tc7_rtl_program | (nfree << 16) | flags, nfree + 2);
ret = scm_words (scm_tc7_program | (nfree << 16) | flags, nfree + 2);
SCM_SET_CELL_WORD_1 (ret, compose_continuation_code);
SCM_RTL_PROGRAM_FREE_VARIABLE_SET (ret, 0, vm_cont);

2
libguile/evalext.c
View file

@ -86,7 +86,7 @@ SCM_DEFINE (scm_self_evaluating_p, "self-evaluating?", 1, 0, 0,
case scm_tc7_number:
case scm_tc7_string:
case scm_tc7_smob:
case scm_tc7_rtl_program:
case scm_tc7_program:
case scm_tc7_bytevector:
case scm_tc7_array:
case scm_tc7_bitvector:

2
libguile/foreign.c
View file

@ -821,7 +821,7 @@ cif_to_procedure (SCM cif, SCM func_ptr)
c_cif = (ffi_cif *) SCM_POINTER_VALUE (cif);
ret = scm_words (scm_tc7_rtl_program | (nfree << 16) | flags, nfree + 2);
ret = scm_words (scm_tc7_program | (nfree << 16) | flags, nfree + 2);
SCM_SET_CELL_WORD_1 (ret, get_foreign_stub_code (c_cif->nargs));
SCM_RTL_PROGRAM_FREE_VARIABLE_SET (ret, 0, cif);
SCM_RTL_PROGRAM_FREE_VARIABLE_SET (ret, 1, func_ptr);

2
libguile/goops.c
View file

@ -291,7 +291,7 @@ SCM_DEFINE (scm_class_of, "class-of", 1, 0, 0,
case scm_tc16_fraction:
return scm_class_fraction;
}
case scm_tc7_rtl_program:
case scm_tc7_program:
if (SCM_PROGRAM_IS_PRIMITIVE_GENERIC (x)
&& SCM_UNPACK (*SCM_SUBR_GENERIC (x)))
return scm_class_primitive_generic;

2
libguile/gsubr.c
View file

@ -239,7 +239,7 @@ create_subr (int define, const char *name,
flags = SCM_F_PROGRAM_IS_PRIMITIVE;
flags |= generic_loc ? SCM_F_PROGRAM_IS_PRIMITIVE_GENERIC : 0;
ret = scm_words (scm_tc7_rtl_program | (nfree << 16) | flags, nfree + 2);
ret = scm_words (scm_tc7_program | (nfree << 16) | flags, nfree + 2);
SCM_SET_CELL_WORD_1 (ret, get_subr_stub_code (nreq, nopt, rest));
SCM_RTL_PROGRAM_FREE_VARIABLE_SET (ret, 0, scm_from_pointer (fcn, NULL));
SCM_RTL_PROGRAM_FREE_VARIABLE_SET (ret, 1, sname);

2
libguile/print.c
View file

@ -660,7 +660,7 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate)
case scm_tc7_variable:
scm_i_variable_print (exp, port, pstate);
break;
case scm_tc7_rtl_program:
case scm_tc7_program:
scm_i_program_print (exp, port, pstate);
break;
case scm_tc7_pointer:

2
libguile/programs.c
View file

@ -54,7 +54,7 @@ SCM_DEFINE (scm_make_rtl_program, "make-rtl-program", 1, 2, 0,
SCM_OUT_OF_RANGE (2, byte_offset);
if (SCM_UNBNDP (free_variables) || scm_is_false (free_variables))
return scm_cell (scm_tc7_rtl_program, (scm_t_bits) code);
return scm_cell (scm_tc7_program, (scm_t_bits) code);
else
abort ();
}

4
libguile/programs.h
View file

@ -25,7 +25,7 @@
* The new RTL programs.
*/
#define SCM_RTL_PROGRAM_P(x) (SCM_HAS_TYP7 (x, scm_tc7_rtl_program))
#define SCM_RTL_PROGRAM_P(x) (SCM_HAS_TYP7 (x, scm_tc7_program))
#define SCM_RTL_PROGRAM_CODE(x) ((scm_t_uint32 *) SCM_CELL_WORD_1 (x))
#define SCM_RTL_PROGRAM_FREE_VARIABLES(x) (SCM_CELL_OBJECT_LOC (x, 2))
#define SCM_RTL_PROGRAM_FREE_VARIABLE_REF(x,i) (SCM_RTL_PROGRAM_FREE_VARIABLES (x)[i])
@ -36,7 +36,7 @@
static inline SCM
scm_i_make_rtl_program (const scm_t_uint32 *code)
{
return scm_cell (scm_tc7_rtl_program, (scm_t_bits)code);
return scm_cell (scm_tc7_program, (scm_t_bits)code);
}
SCM_INTERNAL SCM scm_make_rtl_program (SCM bytevector, SCM byte_offset, SCM free_variables);

2
libguile/tags.h
View file

@ -429,7 +429,7 @@ typedef union SCM { struct { scm_t_bits n; } n; } SCM;
#define scm_tc7_unused_17 61
#define scm_tc7_unused_21 63
#define scm_tc7_rtl_program 69
#define scm_tc7_program 69
#define scm_tc7_unused_79 79
#define scm_tc7_weak_set 85
#define scm_tc7_weak_table 87

2
libguile/vm-engine.c
View file

@ -1558,7 +1558,7 @@ RTL_VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
SCM_UNPACK_RTL_24 (ip[2], nfree);
// FIXME: Assert range of nfree?
closure = scm_words (scm_tc7_rtl_program | (nfree << 16), nfree + 2);
closure = scm_words (scm_tc7_program | (nfree << 16), nfree + 2);
SCM_SET_CELL_WORD_1 (closure, ip + offset);
// FIXME: Elide these initializations?
for (n = 0; n < nfree; n++)

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

@ -900,7 +900,7 @@ should be .data or .rodata), and return the resulting linker object.
(define tc7-wide-stringbuf
(+ tc7-stringbuf stringbuf-shared-flag stringbuf-wide-flag))
(define tc7-ro-string (+ 21 #x200))
(define tc7-rtl-program 69)
(define tc7-program 69)
(define tc7-bytevector 77)
(define tc7-bitvector 95)
@ -972,10 +972,10 @@ should be .data or .rodata), and return the resulting linker object.
((static-procedure? obj)
(case word-size
((4)
(bytevector-u32-set! buf pos tc7-rtl-program endianness)
(bytevector-u32-set! buf pos tc7-program endianness)
(bytevector-u32-set! buf (+ pos 4) 0 endianness))
((8)
(bytevector-u64-set! buf pos tc7-rtl-program endianness)
(bytevector-u64-set! buf pos tc7-program endianness)
(bytevector-u64-set! buf (+ pos 8) 0 endianness))
(else (error "bad word size"))))