mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

* continuations.c, continuations.h, debug.c, gc.c, init.c, root.c,

Browse source 
stacks.c: Renamed regs --> scm_contregs.
This commit is contained in:
Mikael Djurfeldt 1996-10-14 03:26:29 +00:00
parent 6cb66921f6
commit 0db18cf45a
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/continuations.c
View file

@ -68,7 +68,7 @@ scm_make_cont (answer)
SCM_NEWCELL (cont); SCM_NEWCELL (cont);
*answer = cont; *answer = cont;
SCM_DEFER_INTS; SCM_DEFER_INTS;
SCM_SETJMPBUF (cont, scm_must_malloc ((long) sizeof (regs), s_cont)); SCM_SETJMPBUF (cont, scm_must_malloc ((long) sizeof (scm_contregs), s_cont));
SCM_CAR (cont) = scm_tc7_contin; SCM_CAR (cont) = scm_tc7_contin;
SCM_DYNENV (cont) = scm_dynwinds; SCM_DYNENV (cont) = scm_dynwinds;
SCM_THROW_VALUE = SCM_EOL; SCM_THROW_VALUE = SCM_EOL;
@ -98,7 +98,7 @@ scm_make_cont (answer)
SCM_FLUSH_REGISTER_WINDOWS; SCM_FLUSH_REGISTER_WINDOWS;
j = scm_stack_size (SCM_BASE (scm_rootcont)); j = scm_stack_size (SCM_BASE (scm_rootcont));
SCM_SETJMPBUF (cont, SCM_SETJMPBUF (cont,
scm_must_malloc ((long) (sizeof (regs) + j * sizeof (SCM_STACKITEM)), scm_must_malloc ((long) (sizeof (scm_contregs) + j * sizeof (SCM_STACKITEM)),
s_cont)); s_cont));
SCM_SETLENGTH (cont, j, scm_tc7_contin); SCM_SETLENGTH (cont, j, scm_tc7_contin);
SCM_DYNENV (cont) = scm_dynwinds; SCM_DYNENV (cont) = scm_dynwinds;
@ -109,7 +109,7 @@ scm_make_cont (answer)
#ifndef SCM_STACK_GROWS_UP #ifndef SCM_STACK_GROWS_UP
src -= SCM_LENGTH (cont); src -= SCM_LENGTH (cont);
#endif /* ndef SCM_STACK_GROWS_UP */ #endif /* ndef SCM_STACK_GROWS_UP */
dst = (SCM_STACKITEM *) (SCM_CHARS (cont) + sizeof (regs)); dst = (SCM_STACKITEM *) (SCM_CHARS (cont) + sizeof (scm_contregs));
for (j = SCM_LENGTH (cont); 0 <= --j;) for (j = SCM_LENGTH (cont); 0 <= --j;)
*dst++ = *src++; *dst++ = *src++;
#endif /* def CHEAP_CONTINUATIONS */ #endif /* def CHEAP_CONTINUATIONS */
@ -165,7 +165,7 @@ scm_dynthrow (a)
grow_throw (a); grow_throw (a);
#endif /* def SCM_STACK_GROWS_UP */ #endif /* def SCM_STACK_GROWS_UP */
SCM_FLUSH_REGISTER_WINDOWS; SCM_FLUSH_REGISTER_WINDOWS;
src = (SCM_STACKITEM *) (SCM_CHARS (cont) + sizeof (regs)); src = (SCM_STACKITEM *) (SCM_CHARS (cont) + sizeof (scm_contregs));
for (j = SCM_LENGTH (cont); 0 <= --j;) for (j = SCM_LENGTH (cont); 0 <= --j;)
*dst++ = *src++; *dst++ = *src++;
#ifdef sparc /* clear out stack up to this stackframe */ #ifdef sparc /* clear out stack up to this stackframe */

14
libguile/continuations.h
View file

@ -58,15 +58,15 @@ typedef struct
#ifdef DEBUG_EXTENSIONS #ifdef DEBUG_EXTENSIONS
struct scm_debug_frame *dframe; struct scm_debug_frame *dframe;
#endif #endif
} regs; } scm_contregs;
#define SCM_JMPBUF(x) (((regs *)SCM_CHARS(x))->jmpbuf) #define SCM_JMPBUF(x) (((scm_contregs *)SCM_CHARS(x))->jmpbuf)
#define SCM_SETJMPBUF SCM_SETCDR #define SCM_SETJMPBUF SCM_SETCDR
#define SCM_DYNENV(x) (((regs *)SCM_CHARS(x))->dynenv) #define SCM_DYNENV(x) (((scm_contregs *)SCM_CHARS(x))->dynenv)
#define SCM_THROW_VALUE(x) (((regs *)SCM_CHARS(x))->throw_value) #define SCM_THROW_VALUE(x) (((scm_contregs *)SCM_CHARS(x))->throw_value)
#define SCM_BASE(x) (((regs *)SCM_CHARS(x))->base) #define SCM_BASE(x) (((scm_contregs *)SCM_CHARS(x))->base)
#define SCM_SEQ(x) (((regs *)SCM_CHARS(x))->seq) #define SCM_SEQ(x) (((scm_contregs *)SCM_CHARS(x))->seq)
#define SCM_DFRAME(x) (((regs *)SCM_CHARS(x))->dframe) #define SCM_DFRAME(x) (((scm_contregs *)SCM_CHARS(x))->dframe)

4
libguile/gc.c
View file

@ -575,7 +575,7 @@ gc_mark_nimp:
(ptr) break; (ptr) break;
SCM_SETGC8MARK (ptr); SCM_SETGC8MARK (ptr);
scm_mark_locations (SCM_VELTS (ptr), scm_mark_locations (SCM_VELTS (ptr),
(scm_sizet) (SCM_LENGTH (ptr) + sizeof (regs) / sizeof (SCM_STACKITEM))); (scm_sizet) (SCM_LENGTH (ptr) + sizeof (scm_contregs) / sizeof (SCM_STACKITEM)));
break; break;
case scm_tc7_bvect: case scm_tc7_bvect:
case scm_tc7_byvect: case scm_tc7_byvect:
@ -1064,7 +1064,7 @@ scm_gc_sweep ()
case scm_tc7_contin: case scm_tc7_contin:
if SCM_GC8MARKP (scmptr) if SCM_GC8MARKP (scmptr)
goto c8mrkcontinue; goto c8mrkcontinue;
m += SCM_LENGTH (scmptr) * sizeof (SCM_STACKITEM) + sizeof (regs); m += SCM_LENGTH (scmptr) * sizeof (SCM_STACKITEM) + sizeof (scm_contregs);
goto freechars; goto freechars;
case scm_tc7_ssymbol: case scm_tc7_ssymbol:
if SCM_GC8MARKP(scmptr) if SCM_GC8MARKP(scmptr)

2
libguile/root.c
View file

@ -191,7 +191,7 @@ cwdr (proc, a1, args, handler, stack_start)
SCM_NEWCELL (new_rootcont); SCM_NEWCELL (new_rootcont);
SCM_REDEFER_INTS; SCM_REDEFER_INTS;
SCM_SETJMPBUF (new_rootcont, SCM_SETJMPBUF (new_rootcont,
scm_must_malloc ((long) sizeof (regs), scm_must_malloc ((long) sizeof (scm_contregs),
"inferior root continuation")); "inferior root continuation"));
SCM_CAR (new_rootcont) = scm_tc7_contin; SCM_CAR (new_rootcont) = scm_tc7_contin;
SCM_DYNENV (new_rootcont) = SCM_EOL; SCM_DYNENV (new_rootcont) = SCM_EOL;