|
From: <sv...@va...> - 2005-10-10 16:49:00
|
Author: njn
Date: 2005-10-10 17:49:01 +0100 (Mon, 10 Oct 2005)
New Revision: 4899
Log:
Convert some native types to our types.
Modified:
trunk/cachegrind/cg_main.c
trunk/cachegrind/cg_sim.c
Modified: trunk/cachegrind/cg_main.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/cachegrind/cg_main.c 2005-10-10 16:18:09 UTC (rev 4898)
+++ trunk/cachegrind/cg_main.c 2005-10-10 16:49:01 UTC (rev 4899)
@@ -192,8 +192,8 @@
=20
static UInt hash(Char *s, UInt table_size)
{
- const int hash_constant =3D 256;
- int hash_value =3D 0;
+ const Int hash_constant =3D 256;
+ Int hash_value =3D 0;
for ( ; *s; s++)
hash_value =3D (hash_constant * hash_value + *s) % table_size;
return hash_value;
@@ -963,7 +963,7 @@
=20
static void cg_fini(Int exitcode)
{
- static char buf1[128], buf2[128], buf3[128], fmt [128];
+ static Char buf1[128], buf2[128], buf3[128], fmt [128];
=20
CC D_total;
ULong L2_total_m, L2_total_mr, L2_total_mw,
@@ -1053,7 +1053,7 @@
=20
// Various stats
if (VG_(clo_verbosity) > 1) {
- int BB_lookups =3D full_debug_BBs + fn_debug_BBs +
+ Int BB_lookups =3D full_debug_BBs + fn_debug_BBs +
file_line_debug_BBs + no_debug_BBs;
=20
VG_(message)(Vg_DebugMsg, "");
@@ -1100,9 +1100,9 @@
/*--- Command line processing ---*/
/*--------------------------------------------------------------------*/
=20
-static void parse_cache_opt ( cache_t* cache, char* opt )
+static void parse_cache_opt ( cache_t* cache, Char* opt )
{
- int i =3D 0, i2, i3;
+ Int i =3D 0, i2, i3;
=20
// Option argument looks like "65536,2,64".
// Find commas, replace with NULs to make three independent=20
Modified: trunk/cachegrind/cg_sim.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/cachegrind/cg_sim.c 2005-10-10 16:18:09 UTC (rev 4898)
+++ trunk/cachegrind/cg_sim.c 2005-10-10 16:49:01 UTC (rev 4899)
@@ -39,22 +39,22 @@
*/
=20
typedef struct {
- int size; /* bytes */
- int assoc;
- int line_size; /* bytes */
- int sets;
- int sets_min_1;
- int assoc_bits;
- int line_size_bits;
- int tag_shift;
- char desc_line[128];
+ Int size; /* bytes */
+ Int assoc;
+ Int line_size; /* bytes */
+ Int sets;
+ Int sets_min_1;
+ Int assoc_bits;
+ Int line_size_bits;
+ Int tag_shift;
+ Char desc_line[128];
UWord* tags;
} cache_t2;
=20
/* By this point, the size/assoc/line_size has been checked. */
static void cachesim_initcache(cache_t config, cache_t2* c)
{
- int i;
+ Int i;
=20
c->size =3D config.size;
c->assoc =3D config.assoc;
@@ -114,7 +114,7 @@
register UInt set1 =3D ( a >> L.line_size_bits) & (L.sets_mi=
n_1); \
register UInt set2 =3D ((a+size-1) >> L.line_size_bits) & (L.sets_mi=
n_1); \
register UWord tag =3D a >> L.tag_shift; =
\
- int i, j; =
\
+ Int i, j; =
\
Bool is_miss =3D False; =
\
UWord* set; =
\
=
\
|