Branch: Tag:

2005-05-18

2005-05-18 12:36:54 by Martin Stjernholm <mast@lysator.liu.se>

Fixed various type errors for 64 bit architectures. (Most are in harmless
debug messages, but anyway..)

Rev: src/array.c:1.164
Rev: src/backend.cmod:1.146
Rev: src/builtin_functions.c:1.555
Rev: src/code/bytecode.h:1.11
Rev: src/encode.c:1.214
Rev: src/gc.c:1.257
Rev: src/interpret_functions.h:1.170
Rev: src/las.c:1.347
Rev: src/modules/Gmp/mpz_glue.c:1.162
Rev: src/modules/Image/encodings/xcf.c:1.49
Rev: src/modules/Parser/html.c:1.173
Rev: src/modules/files/file.c:1.321
Rev: src/modules/files/sendfile.c:1.70
Rev: src/modules/spider/xml.c:1.71
Rev: src/object.c:1.257
Rev: src/peep.c:1.99
Rev: src/pike_types.c:1.236
Rev: src/post_modules/Shuffler/a_source_system_memory.c:1.11
Rev: src/program.c:1.566
Rev: src/svalue.c:1.195
Rev: src/threads.c:1.238

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: program.c,v 1.565 2004/09/27 15:12:09 grubba Exp $ + || $Id: program.c,v 1.566 2005/05/18 12:36:53 mast Exp $   */      #include "global.h" - RCSID("$Id: program.c,v 1.565 2004/09/27 15:12:09 grubba Exp $"); + RCSID("$Id: program.c,v 1.566 2005/05/18 12:36:53 mast Exp $");   #include "program.h"   #include "object.h"   #include "dynamic_buffer.h"
2636: Inside #if defined(PIKE_DEBUG)
   for (d=0; d < p->num_inherits; d++) {    struct inherit *inh = p->inherits + d;    -  fprintf(stderr, "%*s %4d: %5d %7d %8d %12d %6d %8d %10d %11d\n", +  fprintf(stderr, "%*s %4d: %5d %7d %8d %12"PRINTPTRDIFFT"d %6d %8d %10d %11"PRINTSIZET"d\n",    indent, "",    d, inh->inherit_level,    inh->prog ? inh->prog->id : -1,
2652: Inside #if defined(PIKE_DEBUG)
   for (d=0; d < p->num_identifiers; d++) {    struct identifier *id = p->identifiers + d;    -  fprintf(stderr, "%*s %4d: %5x %6d %4d \"%s\"\n", +  fprintf(stderr, "%*s %4d: %5x %6"PRINTPTRDIFFT"d %4d \"%s\"\n",    indent, "",    d, id->identifier_flags, id->func.offset,    id->run_time_type, id->name->str);
2878: Inside #if defined(PIKE_DEBUG)
   if(ID_FROM_INT(p,variable_positions[offset+q])->run_time_type !=    i->run_time_type)    { -  fprintf(stderr, "Storage offset: 0x%08x vs 0x%08x\n" -  "Func offset: 0x%08x vs 0x%08x\n" +  fprintf(stderr, "Storage offset: " +  "0x%08"PRINTPTRDIFFT"x vs 0x%08"PRINTPTRDIFFT"x\n" +  "Func offset: 0x%08"PRINTPTRDIFFT"x vs 0x%08"PRINTPTRDIFFT"x\n"    "Type: %s vs %s\n",    INHERIT_FROM_INT(p, variable_positions[offset+q])->    storage_offset,
2891: Inside #if defined(PIKE_DEBUG)
   get_name_of_type(i->run_time_type));    if (i->name) {    Pike_fatal("Variable '%s' and '%s' overlap\n" -  "Offset 0x%08x - 0x%08x overlaps with 0x%08x - 0x%08x\n", +  "Offset 0x%08"PRINTPTRDIFFT"x - 0x%08"PRINTPTRDIFFT"x " +  "overlaps with " +  "0x%08"PRINTPTRDIFFT"x - 0x%08"PRINTPTRDIFFT"x\n",    ID_FROM_INT(p, variable_positions[offset+q])->name->str,    i->name->str,    INHERIT_FROM_INT(p, variable_positions[offset+q])->
2905: Inside #if defined(PIKE_DEBUG)
   offset, offset+size-1);    } else {    Pike_fatal("Variable '%s' and anonymous variable (%d) overlap\n" -  "Offset 0x%08x - 0x%08x overlaps with 0x%08x - 0x%08x\n", +  "Offset 0x%08"PRINTPTRDIFFT"x - 0x%08"PRINTPTRDIFFT"x " +  "overlaps with " +  "0x%08"PRINTPTRDIFFT"x - 0x%08"PRINTPTRDIFFT"x\n",    ID_FROM_INT(p, variable_positions[offset+q])->name->str,    e,    INHERIT_FROM_INT(p, variable_positions[offset+q])->
5519: Inside #if defined(PIKE_DEBUG)
   cnt += len<<shift;    if (a_flag > 100) {    fprintf(stderr, "Filename entry:\n" -  " len: %d, shift: %d\n", +  " len: %"PRINTSIZET"d, shift: %d\n",    len, shift);    }    }
5545: Inside #if defined(PIKE_DEBUG)
   " (line : %d ?= %d)!\n"    " ( pc : %d ?= %d)!\n"    " (shift: %d ?= %d)!\n" -  " (len : %d ?= %d)!\n" +  " (len : %"PRINTSIZET"d ?= %"PRINTSIZET"d)!\n"    " (file : %s ?= %s)!\n",    Pike_compiler->last_line, line,    Pike_compiler->last_pc, off,