pike.git/ src/ program.c

1997-10-17

1997-10-17 02:31:41 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• 35681031c20c89421bfc4cb5d2ab7d99dba122c5 (56 lines) (+54/-2) ^{[ Show | Annotate ]}
  Branch: 7.9

garbage collector bug fixed

Rev: src/gc.c:1.18
Rev: src/object.c:1.27
Rev: src/program.c:1.45

4:   ||| See the files COPYING and DISCLAIMER for more information.   \*/   #include "global.h" - RCSID("$Id: program.c,v 1.44 1997/10/16 06:34:27 hubbe Exp $"); + RCSID("$Id: program.c,v 1.45 1997/10/17 02:31:41 hubbe Exp $");   #include "program.h"   #include "object.h"   #include "dynamic_buffer.h"
540:    fatal("Identifier offset is wrong!\n");    }    +     for(e=0;e<(int)p->num_identifier_indexes;e++)    {    if(p->identifier_index[e] > p->num_identifier_references)
548:       for(e=0;e<(int)p->num_inherits;e++)    { +  struct program *tmp_prog=p->inherits[e].prog; +  INT32 d; +     if(p->inherits[e].storage_offset < 0)    fatal("Inherit->storage_offset is wrong.\n"); -  +  +  for(d=0;d<(int)tmp_prog->num_identifiers;d++) +  { +  struct identifier *id=tmp_prog->identifiers+d; +  +  if(IDENTIFIER_IS_VARIABLE(id->identifier_flags)) +  { +  INT32 offset,size,e2; +  offset=p->inherits[e].storage_offset + id->func.offset; +  size=id->run_time_type == T_MIXED ? sizeof(struct svalue) : sizeof(union anything); +  +  if(offset < 0 || offset+size > p->storage_needed) +  fatal("Variable located outside allocated space.\n"); +  +  +  for(e2=0;e2<(int)p->num_inherits;e2++) +  { +  struct program *tmp_prog2=p->inherits[e2].prog; +  INT32 d2; +  +  for(d2=0;d2<(int)tmp_prog2->num_identifiers;d2++) +  { +  struct identifier *id2=tmp_prog2->identifiers+d2; +  +  if(e==e2 && d==d2) continue; +  +  if(IDENTIFIER_IS_VARIABLE(id2->identifier_flags)) +  { +  INT32 offset2,size2; +  +  offset2=p->inherits[e2].storage_offset + id2->func.offset; +  size2=id2->run_time_type == T_MIXED ? sizeof(struct svalue) : sizeof(union anything); +  if( (offset > offset2) ? +  (offset2+size2 > offset) : +  (offset+size > offset2)) +  { +  fatal("Variable %s (%ld+%ld) and %s (%ld+%ld) overlap.\n", +  id->name->str, (long)offset, (long)size, +  id2->name->str, (long)offset2, (long)size2);    }    } -  +  } +  } +  } +  } +  } + }   #endif      /* internal function to make the index-table */
1736: Inside #if defined(GC2)
   {    debug_gc_check_svalues(p->constants, p->num_constants, T_PROGRAM, p);    + #ifdef DEBUG    if(d_flag)    {    int e;
1748: Inside #if defined(GC2)
   gc_check(p->identifiers[e].type);    }    } + #endif    }   }