2003-01-09
2003-01-09 15:21:27 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
97ebb34c4943c76740e88c89a7bfbca1e6f0f077
(27 lines)
(+15/-12)
[
Show
| Annotate
]
Branch: 7.9
Parameter-less macros can cause problems with headerfiles.
In this case <sys/thread.h> on Solaris 2.x.
t_flag is now gone. Use Pike_interpreter.trace_level.
Rev: src/apply_low.h:1.14
Rev: src/builtin.cmod:1.105
Rev: src/error.c:1.101
Rev: src/gc.c:1.192
Rev: src/interpret.c:1.287
Rev: src/interpret.h:1.122
Rev: src/interpret_functions.h:1.126
Rev: src/interpreter.h:1.81
Rev: src/main.c:1.162
Rev: src/mapping.c:1.158
Rev: src/multiset.c:1.65
Rev: src/opcodes.c:1.131
Rev: src/svalue.c:1.154
Rev: src/threads.c:1.196
2:
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
- || $Id: interpret_functions.h,v 1.125 2003/01/06 14:39:03 grubba Exp $
+ || $Id: interpret_functions.h,v 1.126 2003/01/09 15:21:26 grubba Exp $
*/
/*
106: Inside #if defined(PIKE_DEBUG)
#ifdef PIKE_DEBUG
- #define GET_JUMP() (backlog[backlogp].arg=(\
- (t_flag>3 ? sprintf(trace_buffer, "- Target = %+ld\n", \
- (long)LOW_GET_JUMP()), \
- write_to_stderr(trace_buffer,strlen(trace_buffer)) : 0), \
+ #define GET_JUMP() (backlog[backlogp].arg=( \
+ (Pike_interpreter.trace_level>3 ? \
+ sprintf(trace_buffer, "- Target = %+ld\n", \
+ (long)LOW_GET_JUMP()), \
+ write_to_stderr(trace_buffer,strlen(trace_buffer)) : 0), \
LOW_GET_JUMP()))
#define SKIPJUMP() (GET_JUMP(), LOW_SKIPJUMP())
156:
else \
low_return(); \
\
- DO_IF_DEBUG(if (t_flag) \
+ DO_IF_DEBUG(if (Pike_interpreter.trace_level) \
fprintf(stderr, "Returning to 0x%p\n", \
Pike_fp->pc)); \
DO_JUMP_TO(Pike_fp->pc); \
} \
- DO_IF_DEBUG(if (t_flag) \
+ DO_IF_DEBUG(if (Pike_interpreter.trace_level) \
fprintf(stderr, "Inter return\n")); \
INTER_RETURN; \
}
2015:
int args=(ARGS); \
struct svalue *expected_stack=Pike_sp-args; \
struct svalue *s=&Pike_fp->context.prog->constants[arg1].sval; \
- if(t_flag>1) \
+ if(Pike_interpreter.trace_level>1) \
{ \
init_buf(); \
describe_svalue(s, 0,0); \
2026:
if(Pike_sp != expected_stack + !s->u.efun->may_return_void) \
{ \
if(Pike_sp < expected_stack) \
- Pike_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) \
Pike_fatal("Function left %d droppings on stack: %s\n", \
Pike_sp-(expected_stack+1), \
s->u.efun->name->str); \
if(Pike_sp == expected_stack && !s->u.efun->may_return_void) \
- Pike_fatal("Non-void function returned without return value " \
+ 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) \
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); \
} \
- if(t_flag>1 && Pike_sp>expected_stack) trace_return_value(); \
+ if(Pike_interpreter.trace_level>1 && Pike_sp>expected_stack) \
+ trace_return_value(); \
}while(0)
#else
#define DO_CALL_BUILTIN(ARGS) \
2117:
push_zeroes(new_frame->num_locals - args); \
\
DO_IF_DEBUG({ \
- if(t_flag > 3) \
+ if(Pike_interpreter.trace_level > 3) \
fprintf(stderr,"- Allocating %d extra locals.\n", \
new_frame->num_locals - new_frame->num_args); \
}); \