2000-08-08
2000-08-08 19:40:41 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
6d8c69f2d0f5b3e4712c2d867d921e9e0656dad9
(32 lines)
(+21/-11)
[
Show
| Annotate
]
Branch: 7.9
Fixed a few more warnings.
Rev: src/interpret.c:1.160
5:
\*/
/**/
#include "global.h"
- RCSID("$Id: interpret.c,v 1.159 2000/08/02 20:31:51 hubbe Exp $");
+ RCSID("$Id: interpret.c,v 1.160 2000/08/08 19:40:41 grubba Exp $");
#include "interpret.h"
#include "object.h"
#include "program.h"
75:
error("No more mark stack!\n");
*Pike_mark_sp++=Pike_sp;
}
- int pop_sp_mark(void)
+ ptrdiff_t pop_sp_mark(void)
{
#ifdef PIKE_DEBUG
if(Pike_mark_sp < Pike_interpreter.mark_stack)
89: Inside #if defined(PIKE_DEBUG)
static void gc_check_stack_callback(struct callback *foo, void *bar, void *gazonk)
{
struct pike_frame *f;
- debug_gc_xmark_svalues(Pike_interpreter.evaluator_stack,Pike_sp-Pike_interpreter.evaluator_stack-1," on current interpreter stack");
+ debug_gc_xmark_svalues(Pike_interpreter.evaluator_stack,
+ Pike_sp-Pike_interpreter.evaluator_stack-1,
+ " on current interpreter stack");
for(f=Pike_fp;f;f=f->next)
{
379: Inside #if defined(PIKE_DEBUG)
init_buf();
describe_svalue(Pike_sp-1,0,0);
s=simple_free_buf();
- if((long)strlen(s) > (long)TRACE_LEN)
+ if((size_t)strlen(s) > (size_t)TRACE_LEN)
{
s[TRACE_LEN]=0;
s[TRACE_LEN-1]='.';
482: Inside #if defined(_REENTRANT)
#ifdef _REENTRANT
struct object *thread_id;
#endif
- int stack;
- int mark_stack;
+ ptrdiff_t stack;
+ ptrdiff_t mark_stack;
};
struct backlog backlog[BACKLOG];
585:
my_strcat("Return: ");
describe_svalue(Pike_sp-1,0,0);
s=simple_free_buf();
- if((long)strlen(s) > (long)TRACE_LEN)
+ if((size_t)strlen(s) > (size_t)TRACE_LEN)
{
s[TRACE_LEN]=0;
s[TRACE_LEN-1]='.';
608:
}
my_strcat(")");
s=simple_free_buf();
- if((long)strlen(s) > (long)TRACE_LEN)
+ if((size_t)strlen(s) > (size_t)TRACE_LEN)
{
s[TRACE_LEN]=0;
s[TRACE_LEN-1]='.';
680: Inside #if defined(PROFILING) and #if defined(HAVE_GETHRTIME)
long long children_base = Pike_interpreter.accounted_time;
long long start_time = gethrtime() - Pike_interpreter.time_base;
unsigned INT32 self_time_base;
+ #if 0
+ #ifdef PIKE_DEBUG
if(start_time < 0)
{
fatal("gethrtime() shrunk\n start_time=%ld\n gethrtime()=%ld\n Pike_interpreter.time_base=%ld\n",
689: Inside #if defined(PROFILING)
}
#endif
#endif
+ #endif
+ #endif
#if defined(PIKE_DEBUG) && defined(_REENTRANT)
if(d_flag)
960:
char buf[50];
init_buf();
- sprintf(buf,"%lx->",(long)o);
+ sprintf(buf, "%lx->",
+ DO_NOT_WARN((long)o));
my_strcat(buf);
my_strcat(function->name->str);
do_trace_call(args);
1110: Inside #if defined(PROFILING) and #if defined(HAVE_GETHRTIME)
time_passed = gethrtime() - Pike_interpreter.time_base - start_time;
self_time=time_passed - time_in_children;
Pike_interpreter.accounted_time+=self_time;
+ #if 0
#ifdef PIKE_DEBUG
if(self_time < 0 || children_base <0 || Pike_interpreter.accounted_time <0)
fatal("Time is negative\n self_time=%ld\n time_passed=%ld\n time_in_children=%ld\n children_base=%ld\n Pike_interpreter.accounted_time=%ld!\n Pike_interpreter.time_base=%ld\n start_time=%ld\n",
1122: Inside #if defined(PROFILING), #if defined(HAVE_GETHRTIME) and #if defined(PIKE_DEBUG)
(long)(start_time/100000)
);
#endif
+ #endif
function->total_time=self_time_base + (INT32)(time_passed /1000);
function->self_time+=(INT32)( self_time /1000);
}
1312:
Pike_sp->type = T_INT;
Pike_sp++;
}else{
- INT32 expected_stack = Pike_sp - Pike_interpreter.evaluator_stack + 1;
+ ptrdiff_t expected_stack = Pike_sp - Pike_interpreter.evaluator_stack + 1;
Pike_sp+=args;
apply_low(o,fun,args);
if(Pike_sp - Pike_interpreter.evaluator_stack > expected_stack)
1369:
pop_n_elems(args);
push_int(0);
}else{
- INT32 expected_stack=Pike_sp-args+1 - Pike_interpreter.evaluator_stack;
+ ptrdiff_t expected_stack=Pike_sp-args+1 - Pike_interpreter.evaluator_stack;
strict_apply_svalue(s,args);
if(Pike_sp > (expected_stack + Pike_interpreter.evaluator_stack))