2000-07-07
2000-07-07 01:28:57 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>
-
fc26f60c1b0c9d2c25a200df926a9b3bd598bc53
(35 lines)
(+18/-17)
[
Show
| Annotate
]
Branch: 7.9
jumbopatch!
Rev: src/array.c:1.76
Rev: src/docode.c:1.75
Rev: src/encode.c:1.61
Rev: src/error.c:1.52
Rev: src/interpret.c:1.157
Rev: src/interpret.h:1.49
5:
\*/
/**/
#include "global.h"
- RCSID("$Id: interpret.c,v 1.156 2000/07/07 00:54:54 hubbe Exp $");
+ RCSID("$Id: interpret.c,v 1.157 2000/07/07 01:24:14 hubbe Exp $");
#include "interpret.h"
#include "object.h"
#include "program.h"
71:
void push_sp_mark(void)
{
- if(Pike_interpreter.mark_sp == Pike_interpreter.mark_stack + stack_size)
+ if(Pike_mark_sp == Pike_interpreter.mark_stack + stack_size)
error("No more mark stack!\n");
- *Pike_interpreter.mark_sp++=Pike_sp;
+ *Pike_mark_sp++=Pike_sp;
}
int pop_sp_mark(void)
{
#ifdef PIKE_DEBUG
- if(Pike_interpreter.mark_sp < Pike_interpreter.mark_stack)
+ if(Pike_mark_sp < Pike_interpreter.mark_stack)
fatal("Mark stack underflow!\n");
#endif
- return Pike_sp - *--Pike_interpreter.mark_sp;
+ return Pike_sp - *--Pike_mark_sp;
}
167:
}
Pike_sp=Pike_interpreter.evaluator_stack;
- Pike_interpreter.mark_sp=Pike_interpreter.mark_stack;
+ Pike_mark_sp=Pike_interpreter.mark_stack;
Pike_fp=0;
#ifdef PIKE_DEBUG
1086:
check_threads_etc();
{
- struct svalue **save_mark_sp=Pike_interpreter.mark_sp;
+ struct svalue **save_mark_sp=Pike_mark_sp;
tailrecurse=eval_instruction(pc);
- Pike_interpreter.mark_sp=save_mark_sp;
+ Pike_mark_sp=save_mark_sp;
#ifdef PIKE_DEBUG
- if(Pike_interpreter.mark_sp < save_mark_sp)
+ if(Pike_mark_sp < save_mark_sp)
fatal("Popped below save_mark_sp!\n");
#endif
}
1213:
Pike_fp->expendible=expendible;
return 0;
}else{
- struct svalue **save_mark_sp=Pike_interpreter.mark_sp;
+ struct svalue **save_mark_sp=Pike_mark_sp;
int x;
Pike_fp->expendible=Pike_fp->locals + Pike_fp->num_locals;
x=eval_instruction(pc);
#ifdef PIKE_DEBUG
- if(Pike_interpreter.mark_sp < save_mark_sp)
+ if(Pike_mark_sp < save_mark_sp)
fatal("mark Pike_sp underflow in catch.\n");
#endif
- Pike_interpreter.mark_sp=save_mark_sp;
+ Pike_mark_sp=save_mark_sp;
Pike_fp->expendible=expendible;
if(x!=-1) mega_apply(APPLY_STACK, x, 0,0);
UNSETJMP(tmp);
1261:
{
ret=1;
}else{
- struct svalue **save_mark_sp=Pike_interpreter.mark_sp;
+ struct svalue **save_mark_sp=Pike_mark_sp;
int tmp=eval_instruction(o->prog->program + offset);
- Pike_interpreter.mark_sp=save_mark_sp;
+ Pike_mark_sp=save_mark_sp;
if(tmp!=-1) mega_apply(APPLY_STACK, tmp, 0,0);
#ifdef PIKE_DEBUG
1398: Inside #if defined(PIKE_DEBUG)
"(%d entries on stack, stack_size is %d entries)\n",
Pike_sp-Pike_interpreter.evaluator_stack,stack_size);
- if(Pike_interpreter.mark_sp > &(Pike_interpreter.mark_stack[stack_size]))
+ if(Pike_mark_sp > &(Pike_interpreter.mark_stack[stack_size]))
fatal("Mark stack overflow.\n");
- if(Pike_interpreter.mark_sp < Pike_interpreter.mark_stack)
+ if(Pike_mark_sp < Pike_interpreter.mark_stack)
fatal("Mark stack underflow.\n");
for(s=Pike_interpreter.evaluator_stack;s<Pike_sp;s++) check_svalue(s);
s=Pike_interpreter.evaluator_stack;
- for(m=Pike_interpreter.mark_stack;m<Pike_interpreter.mark_sp;m++)
+ for(m=Pike_interpreter.mark_stack;m<Pike_mark_sp;m++)
{
if(*m < s)
fatal("Mark stack failure.\n");