diff --git a/src/interpret.c b/src/interpret.c index b875572e030bf4e7de3e3c55f3a825ca853d0a09..5574f340666e292ee420a1f2e5915ede2b301e68 100644 --- a/src/interpret.c +++ b/src/interpret.c @@ -5,7 +5,7 @@ \*/ /**/ #include "global.h" -RCSID("$Id: interpret.c,v 1.182 2001/01/12 02:09:28 mast Exp $"); +RCSID("$Id: interpret.c,v 1.183 2001/01/24 08:17:27 hubbe Exp $"); #include "interpret.h" #include "object.h" #include "program.h" @@ -82,7 +82,7 @@ static char trace_buffer[2000]; * (much simpler than letting it point at the last used value.) */ PMOD_EXPORT struct Pike_interpreter Pike_interpreter; -PMOD_EXPORT int stack_size = EVALUATOR_STACK_SIZE; +PMOD_EXPORT int Pike_stack_size = EVALUATOR_STACK_SIZE; /* mark stack, used to store markers into the normal stack */ @@ -90,7 +90,7 @@ int mark_stack_malloced = 0; void push_sp_mark(void) { - if(Pike_mark_sp == Pike_interpreter.mark_stack + stack_size) + if(Pike_mark_sp == Pike_interpreter.mark_stack + Pike_stack_size) Pike_error("No more mark stack!\n"); *Pike_mark_sp++=Pike_sp; } @@ -165,8 +165,8 @@ PMOD_EXPORT void init_interpreter(void) Pike_interpreter.evaluator_stack_malloced=0; mark_stack_malloced=0; - Pike_interpreter.evaluator_stack=MMALLOC(stack_size,struct svalue); - Pike_interpreter.mark_stack=MMALLOC(stack_size, struct svalue *); + Pike_interpreter.evaluator_stack=MMALLOC(Pike_stack_size,struct svalue); + Pike_interpreter.mark_stack=MMALLOC(Pike_stack_size, struct svalue *); if((char *)MAP_FAILED == (char *)Pike_interpreter.evaluator_stack) Pike_interpreter.evaluator_stack=0; if((char *)MAP_FAILED == (char *)Pike_interpreter.mark_stack) Pike_interpreter.mark_stack=0; #else @@ -177,13 +177,13 @@ PMOD_EXPORT void init_interpreter(void) use_malloc: if(!Pike_interpreter.evaluator_stack) { - Pike_interpreter.evaluator_stack=(struct svalue *)xalloc(stack_size*sizeof(struct svalue)); + Pike_interpreter.evaluator_stack=(struct svalue *)xalloc(Pike_stack_size*sizeof(struct svalue)); Pike_interpreter.evaluator_stack_malloced=1; } if(!Pike_interpreter.mark_stack) { - Pike_interpreter.mark_stack=(struct svalue **)xalloc(stack_size*sizeof(struct svalue *)); + Pike_interpreter.mark_stack=(struct svalue **)xalloc(Pike_stack_size*sizeof(struct svalue *)); mark_stack_malloced=1; } @@ -1637,13 +1637,13 @@ void slow_check_stack(void) debug_check_stack(); - if(Pike_sp > &(Pike_interpreter.evaluator_stack[stack_size])) + if(Pike_sp > &(Pike_interpreter.evaluator_stack[Pike_stack_size])) fatal("Svalue stack overflow. " "(%ld entries on stack, stack_size is %ld entries)\n", PTRDIFF_T_TO_LONG(Pike_sp - Pike_interpreter.evaluator_stack), - PTRDIFF_T_TO_LONG(stack_size)); + PTRDIFF_T_TO_LONG(Pike_stack_size)); - if(Pike_mark_sp > &(Pike_interpreter.mark_stack[stack_size])) + if(Pike_mark_sp > &(Pike_interpreter.mark_stack[Pike_stack_size])) fatal("Mark stack overflow.\n"); if(Pike_mark_sp < Pike_interpreter.mark_stack) @@ -1660,7 +1660,7 @@ void slow_check_stack(void) s=*m; } - if(s > &(Pike_interpreter.evaluator_stack[stack_size])) + if(s > &(Pike_interpreter.evaluator_stack[Pike_stack_size])) fatal("Mark stack exceeds svalue stack\n"); for(f=Pike_fp;f;f=f->next) @@ -1668,10 +1668,10 @@ void slow_check_stack(void) if(f->locals) { if(f->locals < Pike_interpreter.evaluator_stack || - f->locals > &(Pike_interpreter.evaluator_stack[stack_size])) + f->locals > &(Pike_interpreter.evaluator_stack[Pike_stack_size])) fatal("Local variable pointer points to Finsp�ng.\n"); - if(f->args < 0 || f->args > stack_size) + if(f->args < 0 || f->args > Pike_stack_size) fatal("FEL FEL FEL! HELP!! (corrupted pike_frame)\n"); } } @@ -1711,12 +1711,12 @@ PMOD_EXPORT void cleanup_interpret(void) #ifdef USE_MMAP_FOR_STACK if(!Pike_interpreter.evaluator_stack_malloced) { - munmap((char *)Pike_interpreter.evaluator_stack, stack_size*sizeof(struct svalue)); + munmap((char *)Pike_interpreter.evaluator_stack, Pike_stack_size*sizeof(struct svalue)); Pike_interpreter.evaluator_stack=0; } if(!mark_stack_malloced) { - munmap((char *)Pike_interpreter.mark_stack, stack_size*sizeof(struct svalue *)); + munmap((char *)Pike_interpreter.mark_stack, Pike_stack_size*sizeof(struct svalue *)); Pike_interpreter.mark_stack=0; } #endif @@ -1743,3 +1743,4 @@ void really_clean_up_interpret(void) free_all_pike_frame_blocks(); #endif } + diff --git a/src/interpret.h b/src/interpret.h index 8ec9e38c8f828da9635c03027953bf2abd764579..13f7c491620750ae6eea5fe2c149b28a129d5d81 100644 --- a/src/interpret.h +++ b/src/interpret.h @@ -5,7 +5,7 @@ \*/ /* - * $Id: interpret.h,v 1.75 2001/01/24 01:36:34 hubbe Exp $ + * $Id: interpret.h,v 1.76 2001/01/24 08:17:27 hubbe Exp $ */ #ifndef INTERPRET_H #define INTERPRET_H @@ -340,3 +340,4 @@ PMOD_EXPORT extern struct Pike_interpreter Pike_interpreter; #endif + diff --git a/src/interpreter.h b/src/interpreter.h index f3bf32eb6ab432ab6419ddda7b8d4b0a73677d61..da3debe82a32e6a01590d5e0510dc1d0e3ed26df 100644 --- a/src/interpreter.h +++ b/src/interpreter.h @@ -205,3 +205,4 @@ static int eval_instruction(unsigned char *pc) } } + diff --git a/src/main.c b/src/main.c index 97a25883f084f2342e2f0ebea2838667b307f5c6..52fc2eadd97f1c91a17275be9b69fdd094253971 100644 --- a/src/main.c +++ b/src/main.c @@ -5,7 +5,7 @@ \*/ /**/ #include "global.h" -RCSID("$Id: main.c,v 1.109 2000/12/01 20:21:25 grubba Exp $"); +RCSID("$Id: main.c,v 1.110 2001/01/24 08:17:28 hubbe Exp $"); #include "fdlib.h" #include "backend.h" #include "module.h" @@ -272,10 +272,10 @@ int dbm_main(int argc, char **argv) break; } } - stack_size=STRTOL(p,&p,0); + Pike_stack_size=STRTOL(p,&p,0); p+=strlen(p); - if(stack_size < 256) + if(Pike_stack_size < 256) { fprintf(stderr,"Stack size must at least be 256.\n"); exit(1); @@ -755,3 +755,4 @@ void low_exit_main(void) #endif } + diff --git a/src/modules/Java/jvm.c b/src/modules/Java/jvm.c index 3851d85b5da0d813e02ce7b7099dd30ac698ca2d..9f3ff3da67b498e16bc5291a1ae8b98a00471989 100644 --- a/src/modules/Java/jvm.c +++ b/src/modules/Java/jvm.c @@ -1,5 +1,5 @@ /* - * $Id: jvm.c,v 1.31 2000/12/05 21:08:28 per Exp $ + * $Id: jvm.c,v 1.32 2001/01/24 08:17:45 hubbe Exp $ * * Pike interface to Java Virtual Machine * @@ -17,7 +17,7 @@ #endif /* HAVE_CONFIG_H */ #include "global.h" -RCSID("$Id: jvm.c,v 1.31 2000/12/05 21:08:28 per Exp $"); +RCSID("$Id: jvm.c,v 1.32 2001/01/24 08:17:45 hubbe Exp $"); #include "program.h" #include "interpret.h" #include "stralloc.h" @@ -3506,3 +3506,4 @@ void pike_module_exit(void) #endif /* HAVE_JAVA */ } + diff --git a/src/threads.c b/src/threads.c index c51deb3c171089f3b5cdad196e9849aebe817737..1281f406ba9acc4059f78b1b5caec376f6f16af3 100644 --- a/src/threads.c +++ b/src/threads.c @@ -1,5 +1,5 @@ #include "global.h" -RCSID("$Id: threads.c,v 1.149 2000/12/05 21:08:23 per Exp $"); +RCSID("$Id: threads.c,v 1.150 2001/01/24 08:17:28 hubbe Exp $"); PMOD_EXPORT int num_threads = 1; PMOD_EXPORT int threads_disabled = 0; @@ -62,12 +62,12 @@ void th_atfork_child(void) #ifdef __NT__ -int low_nt_create_thread(unsigned stack_size, +int low_nt_create_thread(unsigned Pike_stack_size, unsigned (TH_STDCALL *fun)(void *), void *arg, unsigned *id) { - HANDLE h = (HANDLE)_beginthreadex(NULL, stack_size, fun, arg, 0, id); + HANDLE h = (HANDLE)_beginthreadex(NULL, Pike_stack_size, fun, arg, 0, id); if(h) { CloseHandle(h); @@ -1496,3 +1496,4 @@ void th_cleanup(void) } #endif + diff --git a/src/threads.h b/src/threads.h index f59cdadf4511645bacd88dc6ec41f16cfe59e863..a6dd906f947214c101e59fb4a408253d0d144683 100644 --- a/src/threads.h +++ b/src/threads.h @@ -1,5 +1,5 @@ /* - * $Id: threads.h,v 1.110 2000/12/16 05:45:45 marcus Exp $ + * $Id: threads.h,v 1.111 2001/01/24 08:17:28 hubbe Exp $ */ #ifndef THREADS_H #define THREADS_H @@ -716,3 +716,4 @@ PMOD_EXPORT extern struct program *thread_id_prog; #include "interpret.h" #endif /* THREADS_H */ +