[Valgrind-developers] valgrind: r6297 - trunk/perf

[<sv...@va...>]

Author: sewardj
Date: 2006-10-17 03:21:55 +0100 (Tue, 17 Oct 2006)
New Revision: 6297

Log:
Merge r6216:

Fix all the places where gcc complains about casts from pointers
(presumably 64 bit) to integers of different size (in this case,
32-bit int).  This makes it compile cleanly on 64-bit AIX and also
means it doesn't crash :-)

Modified:
   trunk/perf/tinycc.c


Modified: trunk/perf/tinycc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/tinycc.c	2006-10-17 02:21:17 UTC (rev 6296)
+++ trunk/perf/tinycc.c	2006-10-17 02:21:55 UTC (rev 6297)
@@ -2171,9 +2171,9 @@
=20
 /* symbol management */
 typedef struct Sym {
-    int v;    /* symbol token */
-    int r;    /* associated register */
-    int c;    /* associated number */
+    long v;    /* symbol token */
+    long r;    /* associated register */
+    long c;    /* associated number */
     CType type;    /* associated type */
     struct Sym *next; /* next related symbol */
     struct Sym *prev; /* prev symbol in stack */
@@ -2341,7 +2341,7 @@
    rsym: return symbol
    anon_sym: anonymous symbol index
 */
-static int rsym, anon_sym, ind, loc;
+static long rsym, anon_sym, ind, loc;
 /* expression generation modifiers */
 static int const_wanted; /* true if constant wanted */
 static int nocode_wanted; /* true if no code generation wanted for an ex=
pression */
@@ -2350,7 +2350,7 @@
 static CType func_vt; /* current function return type (used by return
                          instruction) */
 static int func_vc;
-static int last_line_num, last_ind, func_ind; /* debug last line number =
and pc */
+static long last_line_num, last_ind, func_ind; /* debug last line number=
 and pc */
 static int tok_ident;
 static TokenSym **table_ident;
 static TokenSym *hash_ident[TOK_HASH_SIZE];
@@ -6084,7 +6084,7 @@
 }
=20
 /* generate a jump to a label */
-int gjmp(int t)
+long gjmp(int t)
 {
     return psym(0xe9, t);
 }
@@ -7372,7 +7372,7 @@
 }
=20
 /* push, without hashing */
-static Sym *sym_push2(Sym **ps, int v, int t, int c)
+static Sym *sym_push2(Sym **ps, long v, long t, long c)
 {
     Sym *s;
     s =3D sym_malloc();
@@ -8148,7 +8148,7 @@
 {
     Sym *s;
=20
-    s =3D sym_push2(&define_stack, v, macro_type, (int)str);
+    s =3D sym_push2(&define_stack, v, macro_type, (long)str);
     s->next =3D first_arg;
     table_ident[v - TOK_IDENT]->sym_define =3D s;
 }
@@ -9788,7 +9788,7 @@
                     next_nomacro();
                 }
                 tok_str_add(&str, 0);
-                sym_push2(&args, sa->v & ~SYM_FIELD, sa->type.t, (int)st=
r.str);
+                sym_push2(&args, sa->v & ~SYM_FIELD, sa->type.t, (long)s=
tr.str);
                 sa =3D sa->next;
                 if (tok =3D=3D ')') {
                     /* special case for gcc var args: add an empty
@@ -14740,7 +14740,7 @@
                     }
                     tok_str_add(&func_str, -1);
                     tok_str_add(&func_str, 0);
-                    sym->r =3D (int)func_str.str;
+                    sym->r =3D (long)func_str.str;
                 } else {
                     /* compute text section */
                     cur_text_section =3D ad.section;
@@ -17330,7 +17330,7 @@
 /* NOTE: the same name space as C labels is used to avoid using too
    much memory when storing labels in TokenStrings */
 static void asm_new_label1(TCCState *s1, int label, int is_local,
-                           int sh_num, int value)
+                           int sh_num, long value)
 {
     Sym *sym;
=20