2002-08-15
2002-08-15 14:50:28 by Marcus Comstedt <marcus@mc.pp.se>
-
5aad93d0f00ff6eaf5b329826eb84e35b67fc4b4
(65 lines)
(+33/-32)
[
Show
| Annotate
]
Branch: 7.9
Rename fatal -> Pike_fatal.
Rev: src/apply_low.h:1.7
Rev: src/array.c:1.129
Rev: src/array.h:1.41
Rev: src/backend.cmod:1.27
Rev: src/bignum.c:1.25
Rev: src/block_alloc.h:1.41
Rev: src/builtin.cmod:1.90
Rev: src/builtin_functions.c:1.435
Rev: src/callback.c:1.26
Rev: src/code/ia32.c:1.21
Rev: src/code/ppc32.c:1.16
Rev: src/code/ppc32.h:1.14
Rev: src/code/sparc.c:1.11
Rev: src/code/sparc.h:1.13
Rev: src/compilation.h:1.28
Rev: src/constants.c:1.38
Rev: src/cpp.c:1.102
Rev: src/cyclic.c:1.6
Rev: src/dlopen.c:1.32
Rev: src/docode.c:1.144
Rev: src/dynamic_buffer.c:1.16
Rev: src/dynamic_load.c:1.64
Rev: src/encode.c:1.151
Rev: src/error.c:1.86
Rev: src/fd_control.c:1.41
Rev: src/fdlib.c:1.52
Rev: src/fdlib.h:1.41
Rev: src/fsort_template.h:1.11
Rev: src/gc.c:1.185
Rev: src/gc.h:1.90
Rev: src/hashtable.c:1.11
Rev: src/interpret.c:1.263
Rev: src/interpret.h:1.110
Rev: src/interpret_functions.h:1.105
Rev: src/interpreter.h:1.76
Rev: src/iterators.cmod:1.26
Rev: src/language.yacc:1.289
Rev: src/las.c:1.297
Rev: src/lex.c:1.105
Rev: src/lexer.h:1.38
Rev: src/main.c:1.150
Rev: src/mapping.c:1.149
Rev: src/module_support.c:1.46
Rev: src/modules/Gmp/mpf.cmod:1.9
Rev: src/modules/Gmp/mpq.cmod:1.10
Rev: src/modules/Gmp/mpz_glue.c:1.107
Rev: src/modules/HTTPLoop/cache.c:1.17
Rev: src/modules/HTTPLoop/requestobject.c:1.21
Rev: src/modules/Image/colors.c:1.61
Rev: src/modules/Image/colortable.c:1.109
Rev: src/modules/Image/colortable_lookup.h:1.18
Rev: src/modules/Image/encodings/bmp.c:1.35
Rev: src/modules/Image/font.c:1.72
Rev: src/modules/Image/image_module.c:1.14
Rev: src/modules/Image/layers.c:1.79
Rev: src/modules/Odbc/odbc.c:1.30
Rev: src/modules/Oracle/oracle.c:1.70
Rev: src/modules/PDF/pdf_module.c:1.11
Rev: src/modules/Parser/html.c:1.152
Rev: src/modules/Parser/parser.c:1.14
Rev: src/modules/Perl/perlmod.c:1.25
Rev: src/modules/Pipe/pipe.c:1.49
Rev: src/modules/_Charset/charsetmod.c:1.35
Rev: src/modules/_Charset/iso2022.c:1.23
Rev: src/modules/files/file.c:1.239
Rev: src/modules/files/sendfile.c:1.57
Rev: src/modules/files/socket.c:1.63
Rev: src/modules/files/stat.c:1.22
Rev: src/modules/files/udp.c:1.37
Rev: src/modules/spider/xml.c:1.52
Rev: src/modules/sprintf/sprintf.c:1.93
Rev: src/modules/sybase/sybase.c:1.9
Rev: src/multiset.c:1.50
Rev: src/multiset.h:1.25
Rev: src/object.c:1.203
Rev: src/object.h:1.71
Rev: src/opcodes.c:1.122
Rev: src/operators.c:1.159
Rev: src/peep.c:1.72
Rev: src/pike_error.h:1.19
Rev: src/pike_macros.h:1.31
Rev: src/pike_memory.c:1.120
Rev: src/pike_search.c:1.9
Rev: src/pike_search_engine.c:1.8
Rev: src/pike_search_engine2.c:1.5
Rev: src/pike_threadlib.h:1.16
Rev: src/pike_types.c:1.194
Rev: src/pike_types.h:1.79
Rev: src/port.c:1.52
Rev: src/post_modules/GTK/source/support.c:1.33
Rev: src/post_modules/Unicode/normalize.c:1.9
Rev: src/preprocessor.h:1.51
Rev: src/program.c:1.441
Rev: src/queue.c:1.8
Rev: src/rbtree.c:1.10
Rev: src/rbtree_low.h:1.2
Rev: src/signal_handler.c:1.225
Rev: src/stralloc.c:1.143
Rev: src/stralloc.h:1.66
Rev: src/svalue.c:1.144
Rev: src/svalue.h:1.106
Rev: src/threads.c:1.180
5:
\*/
/**/
#include "global.h"
- RCSID("$Id: interpret.c,v 1.262 2002/06/25 14:26:40 grubba Exp $");
+ RCSID("$Id: interpret.c,v 1.263 2002/08/15 14:49:21 marcus Exp $");
#include "interpret.h"
#include "object.h"
#include "program.h"
118: Inside #if defined(PIKE_DEBUG)
{
#ifdef PIKE_DEBUG
if(Pike_mark_sp < Pike_interpreter.mark_stack)
- fatal("Mark stack underflow!\n");
+ Pike_fatal("Mark stack underflow!\n");
#endif
return Pike_sp - *--Pike_mark_sp;
}
531: Inside #if defined(PIKE_DEBUG)
struct external_variable_context tmp=*loc;
#ifdef PIKE_DEBUG
if(!loc->inherit->inherit_level)
- fatal("Gahhh! inherit level zero in wrong place!\n");
+ Pike_fatal("Gahhh! inherit level zero in wrong place!\n");
#endif
while(tmp.inherit->inherit_level >= loc->inherit->inherit_level)
{
579: Inside #if defined(DEBUG_MALLOC)
if (loc->o->refs == 0x55555555) {
fprintf(stderr, "The object %p has been zapped!\n", loc->o);
describe(p);
- fatal("Object zapping detected.\n");
+ Pike_fatal("Object zapping detected.\n");
}
if (p->refs == 0x55555555) {
fprintf(stderr, "The program %p has been zapped!\n", p);
describe(p);
fprintf(stderr, "Which taken from the object %p\n", loc->o);
describe(loc->o);
- fatal("Looks like the program %p has been zapped!\n", p);
+ Pike_fatal("Looks like the program %p has been zapped!\n", p);
}
#endif /* DEBUG_MALLOC */
#ifdef PIKE_DEBUG
if(loc->parent_identifier < 0 ||
loc->parent_identifier > p->num_identifier_references)
- fatal("Identifier out of range, loc->parent_identifer=%d!\n",
+ Pike_fatal("Identifier out of range, loc->parent_identifer=%d!\n",
loc->parent_identifier);
#endif
617: Inside #if defined(DEBUG_MALLOC)
describe(p);
fprintf(stderr, "Which was in turn taken from the object %p\n", loc->o);
describe(loc->o);
- fatal("Looks like the program %p has been zapped!\n", p);
+ Pike_fatal("Looks like the program %p has been zapped!\n", p);
}
#endif /* DEBUG_MALLOC */
}
767:
#ifdef PIKE_DEBUG
#define EVAL_INSTR_RET_CHECK(x) \
if (x == -2) \
- fatal("Return value -2 from eval_instruction is not handled here.\n"\
+ Pike_fatal("Return value -2 from eval_instruction is not handled here.\n"\
"Probable cause: F_ESCAPE_CATCH outside catch block.\n")
#else
#define EVAL_INSTR_RET_CHECK(x)
856: Inside #if defined(__GNUC__), #if defined(PIKE_DEBUG) and #if defined(PIKE_OPCODE_ALIGN)
fprintf(stderr, "Calling code at 0x%p:\n", pc);
#ifdef PIKE_OPCODE_ALIGN
if (((INT32)pc) % PIKE_OPCODE_ALIGN) {
- fatal("Odd offset!\n");
+ Pike_fatal("Odd offset!\n");
}
#endif /* PIKE_OPCODE_ALIGN */
for (i=0; i < 16; i+=4) {
1044:
}) \
DO_IF_DEBUG( \
if(X->flags & PIKE_FRAME_MALLOCED_LOCALS) \
- fatal("Pike frame is not supposed to have malloced locals here!\n")); \
+ Pike_fatal("Pike frame is not supposed to have malloced locals here!\n")); \
\
DO_IF_DMALLOC( \
X->context.prog=0; \
1090: Inside #if defined(PIKE_DEBUG) && defined(_REENTRANT)
CHECK_INTERPRETER_LOCK();
if( Pike_interpreter.thread_id && !th_equal( OBJ2THREAD(Pike_interpreter.thread_id)->id, self) )
- fatal("Current thread is wrong.\n");
+ Pike_fatal("Current thread is wrong.\n");
if(thread_for_id(th_self()) != Pike_interpreter.thread_id)
- fatal("thread_for_id() (or Pike_interpreter.thread_id) failed in mega_apply! "
+ Pike_fatal("thread_for_id() (or Pike_interpreter.thread_id) failed in mega_apply! "
"%p != %p\n", thread_for_id(self), Pike_interpreter.thread_id);
}
#endif
1152: Inside #if defined(PIKE_DEBUG)
if(Pike_sp != expected_stack + !s->u.efun->may_return_void)
{
if(Pike_sp < expected_stack)
- fatal("Function popped too many arguments: %s\n",
+ Pike_fatal("Function popped too many arguments: %s\n",
s->u.efun->name->str);
if(Pike_sp>expected_stack+1)
- fatal("Function left droppings on stack: %s\n",
+ Pike_fatal("Function left droppings on stack: %s\n",
s->u.efun->name->str);
if(Pike_sp == expected_stack && !s->u.efun->may_return_void)
- fatal("Non-void function returned without return value on stack: %s %d\n",
+ Pike_fatal("Non-void function returned without return value on stack: %s %d\n",
s->u.efun->name->str,s->u.efun->may_return_void);
if(Pike_sp==expected_stack+1 && s->u.efun->may_return_void)
- fatal("Void function returned with a value on the stack: %s %d\n",
+ Pike_fatal("Void function returned with a value on the stack: %s %d\n",
s->u.efun->name->str, s->u.efun->may_return_void);
}
#endif
1225: Inside #if defined(PIKE_DEBUG)
call_lfun:
#ifdef PIKE_DEBUG
if(fun < 0 || fun >= NUM_LFUNS)
- fatal("Apply lfun on illegal value!\n");
+ Pike_fatal("Apply lfun on illegal value!\n");
#endif
if(!o->prog)
PIKE_ERROR("destructed object", "Apply on destructed object.\n", Pike_sp, args);
1298:
struct svalue *save_sp=Pike_fp->save_sp; \
DO_IF_DEBUG( \
if(Pike_mark_sp < Pike_fp->save_mark_sp) \
- fatal("Popped below save_mark_sp!\n"); \
+ Pike_fatal("Popped below save_mark_sp!\n"); \
if(Pike_sp<Pike_interpreter.evaluator_stack) \
- fatal("Stack error (also simple).\n"); \
+ Pike_fatal("Stack error (also simple).\n"); \
) \
\
Pike_mark_sp=Pike_fp->save_mark_sp; \
1356: Inside #if defined(PIKE_DEBUG)
{
while(rec->frame_pointer == current) rec=rec->previous;
if(rec->frame_pointer == current->next)
- fatal("You can't touch this!\n");
+ Pike_fatal("You can't touch this!\n");
}
}
#endif
1447: Inside #if defined(PIKE_DEBUG)
x=eval_instruction(pc);
#ifdef PIKE_DEBUG
if(Pike_mark_sp < save_mark_sp)
- fatal("mark Pike_sp underflow in catch.\n");
+ Pike_fatal("mark Pike_sp underflow in catch.\n");
#endif
Pike_mark_sp=save_mark_sp;
Pike_fp->expendible=expendible;
1527: Inside #if defined(PIKE_DEBUG)
#ifdef PIKE_DEBUG
if(Pike_sp<Pike_interpreter.evaluator_stack)
- fatal("Stack error (simple).\n");
+ Pike_fatal("Stack error (simple).\n");
#endif
ret=0;
}
1579:
PMOD_EXPORT void safe_apply(struct object *o, char *fun ,INT32 args)
{
#ifdef PIKE_DEBUG
- if(!o->prog) fatal("Apply safe on destructed object.\n");
+ if(!o->prog) Pike_fatal("Apply safe on destructed object.\n");
#endif
safe_apply_low2(o, find_identifier(fun, o->prog), args, 1);
}
1690: Inside #if defined(PIKE_DEBUG)
{
#ifdef PIKE_DEBUG
if(fun < 0 || fun >= NUM_LFUNS)
- fatal("Apply lfun on illegal value!\n");
+ Pike_fatal("Apply lfun on illegal value!\n");
#endif
if(!o->prog)
PIKE_ERROR("destructed object", "Apply on destructed object.\n", Pike_sp, args);
1731: Inside #if defined(PIKE_DEBUG)
}
#ifdef PIKE_DEBUG
if(Pike_sp < (expected_stack + Pike_interpreter.evaluator_stack))
- fatal("Stack underflow!\n");
+ Pike_fatal("Stack underflow!\n");
#endif
}
}
1745: Inside #if defined(PIKE_DEBUG)
debug_check_stack();
if(Pike_sp > &(Pike_interpreter.evaluator_stack[Pike_stack_size]))
- fatal("Svalue stack overflow. "
+ Pike_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(Pike_stack_size));
if(Pike_mark_sp > &(Pike_interpreter.mark_stack[Pike_stack_size]))
- fatal("Mark stack overflow.\n");
+ Pike_fatal("Mark stack overflow.\n");
if(Pike_mark_sp < Pike_interpreter.mark_stack)
- fatal("Mark stack underflow.\n");
+ Pike_fatal("Mark stack underflow.\n");
for(s=Pike_interpreter.evaluator_stack;s<Pike_sp;s++) check_svalue(s);
1762: Inside #if defined(PIKE_DEBUG)
for(m=Pike_interpreter.mark_stack;m<Pike_mark_sp;m++)
{
if(*m < s)
- fatal("Mark stack failure.\n");
+ Pike_fatal("Mark stack failure.\n");
s=*m;
}
if(s > &(Pike_interpreter.evaluator_stack[Pike_stack_size]))
- fatal("Mark stack exceeds svalue stack\n");
+ Pike_fatal("Mark stack exceeds svalue stack\n");
for(f=Pike_fp;f;f=f->next)
{
1776: Inside #if defined(PIKE_DEBUG)
{
if(f->locals < Pike_interpreter.evaluator_stack ||
f->locals > &(Pike_interpreter.evaluator_stack[Pike_stack_size]))
- fatal("Local variable pointer points to Finspång.\n");
+ Pike_fatal("Local variable pointer points to Finspång.\n");
if(f->args < 0 || f->args > Pike_stack_size)
- fatal("FEL FEL FEL! HELP!! (corrupted pike_frame)\n");
+ Pike_fatal("FEL FEL FEL! HELP!! (corrupted pike_frame)\n");
}
}
}