author | Camm Maguire <camm@debian.org> | 2003年07月16日 02:03:07 +0000 |
---|---|---|
committer | Camm Maguire <camm@debian.org> | 2003年07月16日 02:03:07 +0000 |
commit | 1fd519c829d1c33ba731368a261a0d051a7b6934 (patch) | |
tree | 397dd5a5cfb72a563c2d7bca94e5242864525b4d | |
parent | 94d0d4282fb15e8dea0b2bdc4b1d8cc85bfc148b (diff) | |
download | gcl-unlabeled-1.11.4.tar.gz |
-rw-r--r-- | gcl/lsp/make_defpackage.c | 10 | ||||
-rwxr-xr-x | gcl/lsp/mislib.c | 6 | ||||
-rw-r--r-- | gcl/lsp/predlib.h | 12 | ||||
-rwxr-xr-x | gcl/o/usig2.c | 11 |
diff --git a/gcl/lsp/make_defpackage.c b/gcl/lsp/make_defpackage.c index 66e2dd305..f294633f9 100644 --- a/gcl/lsp/make_defpackage.c +++ b/gcl/lsp/make_defpackage.c @@ -433,11 +433,11 @@ T175:; return;}} } } -static object LnkTLI12(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_vproc_new(VV[12],(void **)&LnkLI12,first,ap);va_end(ap);return V1;} /* SET-DIFFERENCE */ -static object LnkTLI11(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_vproc_new(VV[11],(void **)&LnkLI11,first,ap);va_end(ap);return V1;} /* INTERSECTION */ -static object LnkTLI10(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_vproc_new(VV[10],(void **)&LnkLI10,first,ap);va_end(ap);return V1;} /* FIND */ -static void LnkT9(){ call_or_link(VV[9],(void **)&Lnk9);} /* PACKAGE-SIZE */ -static void LnkT8(){ call_or_link(VV[8],(void **)&Lnk8);} /* PACKAGE-SHADOWING-SYMBOLS */ +static object LnkTLI12(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_vproc_new(VV[12],(void **)(void *)&LnkLI12,first,ap);va_end(ap);return V1;} /* SET-DIFFERENCE */ +static object LnkTLI11(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_vproc_new(VV[11],(void **)(void *)&LnkLI11,first,ap);va_end(ap);return V1;} /* INTERSECTION */ +static object LnkTLI10(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_vproc_new(VV[10],(void **)(void *)&LnkLI10,first,ap);va_end(ap);return V1;} /* FIND */ +static void LnkT9(){ call_or_link(VV[9],(void **)(void *)&Lnk9);} /* PACKAGE-SIZE */ +static void LnkT8(){ call_or_link(VV[8],(void **)(void *)&Lnk8);} /* PACKAGE-SHADOWING-SYMBOLS */ #ifdef SYSTEM_SPECIAL_INIT SYSTEM_SPECIAL_INIT diff --git a/gcl/lsp/mislib.c b/gcl/lsp/mislib.c index 030e19f48..dafb3e36c 100755 --- a/gcl/lsp/mislib.c +++ b/gcl/lsp/mislib.c @@ -553,9 +553,9 @@ register object *base0; return; } } -static void LnkT19(){ call_or_link(VV[19],(void **)&Lnk19);} /* GET-DECODED-TIME */ -static object LnkTLI18(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_proc_new(VV[18],(void **)&LnkLI18,1,first,ap);va_end(ap);return V1;} /* LEAP-YEAR-P */ -static object LnkTLI17(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_proc_new(VV[17],(void **)&LnkLI17,1,first,ap);va_end(ap);return V1;} /* NUMBER-OF-DAYS-FROM-1900 */ +static void LnkT19(){ call_or_link(VV[19],(void **)(void *)&Lnk19);} /* GET-DECODED-TIME */ +static object LnkTLI18(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_proc_new(VV[18],(void **)(void *)&LnkLI18,1,first,ap);va_end(ap);return V1;} /* LEAP-YEAR-P */ +static object LnkTLI17(object first,...){object V1;va_list ap;va_start(ap,first);V1=call_proc_new(VV[17],(void **)(void *)&LnkLI17,1,first,ap);va_end(ap);return V1;} /* NUMBER-OF-DAYS-FROM-1900 */ #ifdef SYSTEM_SPECIAL_INIT SYSTEM_SPECIAL_INIT diff --git a/gcl/lsp/predlib.h b/gcl/lsp/predlib.h index 461112f7d..5cc76bdcc 100644 --- a/gcl/lsp/predlib.h +++ b/gcl/lsp/predlib.h @@ -51,18 +51,18 @@ static object LI19(); #define VC21 #define VC22 #define VC23 -#define VC24 object V83 ,V82 ,V80 ,V79 ,V78 ,V77 ,V75 ,V74 ,V73 ,V72 ,V71 ,V69 ,V68 ,V67 ,V65 ,V64 ,V63 ,V62 ,V61 ,V60 ,V59 ,V58 ,V57 ,V54 ,V50; +#define VC24 object V84 ,V83 ,V81 ,V80 ,V79 ,V78 ,V76 ,V75 ,V74 ,V73 ,V72 ,V70 ,V69 ,V68 ,V66 ,V65 ,V64 ,V63 ,V62 ,V61 ,V60 ,V59 ,V58 ,V55 ,V51; static object LI25(); #define VMB25 register object *base=vs_top; #define VMS25 register object *sup=vs_top+1;vs_top=sup; #define VMV25 vs_reserve(1); #define VMR25(VMT25) vs_top=base ; return(VMT25); static object LI26(); -#define VMB26 object V94; +#define VMB26 object V95; #define VMS26 #define VMV26 #define VMR26(VMT26) return(VMT26); -#define VC27 object V142 ,V139 ,V137 ,V113 ,V112 ,V110; +#define VC27 object V144 ,V141 ,V139 ,V115 ,V114 ,V112; static object LI28(); #define VMB28 #define VMS28 @@ -79,7 +79,7 @@ static object LI30(); #define VMV30 #define VMR30(VMT30) return(VMT30); static object LI31(); -#define VMB31 register object *base=vs_top; object V233 ,V232 ,V226 ,V224 ,V220 ,V218; +#define VMB31 register object *base=vs_top; object V235 ,V234 ,V228 ,V226 ,V222 ,V220; #define VMS31 register object *sup=vs_top+4;vs_top=sup; #define VMV31 vs_reserve(4); #define VMR31(VMT31) vs_top=base ; return(VMT31); @@ -89,10 +89,10 @@ static object LI31(); #define VM30 0 #define VM29 0 #define VM28 0 -#define VM27 5 +#define VM27 6 #define VM26 0 #define VM25 1 -#define VM24 4 +#define VM24 6 #define VM23 2 #define VM22 2 #define VM21 2 diff --git a/gcl/o/usig2.c b/gcl/o/usig2.c index 8f4f5afb7..0a8956203 100755 --- a/gcl/o/usig2.c +++ b/gcl/o/usig2.c @@ -253,8 +253,10 @@ before_interrupt(struct save_for_interrupt *p, int allowed) SS1(p->ihs_topVAL,*ihs_top); { void **pp = p->save_objects; #undef XS - /* #define XS(a) *pp++ = (void *) (a); */ -#define XS(a) *pp++ = * (void **) (&a); +#undef XSI +#define XS(a) *pp++ = (void *) (a); +#define XSI(a) XS(a) +/* #define XS(a) *pp++ = * (void **) (&a); */ #include "usig2_aux.c" if ((pp - (&(p->save_objects)[0])) >= (sizeof(p->save_objects)/sizeof(void *))) abort(); @@ -309,12 +311,15 @@ after_interrupt(struct save_for_interrupt *p, int allowed) RS1(p->ihs_topVAL,*ihs_top); { void **pp = p->save_objects; #undef XS +#undef XSI /* #define XS(a) a = (void *)(*pp++) We store back in the location 'a' the value we have saved. */ -#define XS(a) do { void **_p = (void **)(&a); *_p = (void *)(*pp++);}while(0) +/* #define XS(a) do { void **_p = (void **)(&a); *_p = (void *)(*pp++);}while(0) */ +#define XS(a) a = (void *)(*pp++) +#define XSI(a) {union {void *v;long l;}u; u.v=*pp++; a = u.l;} #include "usig2_aux.c" } |