Remove unused functions and prototypes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14342

diff --git a/callgrind/context.c b/callgrind/context.c
index 342f5c95242d713f4b7e71fad4bc819c7522476f..853a4d869c570196e3668193370435b7a1412110 100644 (file)
--- a/callgrind/context.c
+++ b/callgrind/context.c
@@ -82,11 +82,6 @@ void CLG_(init_cxt_table)()
      cxts.table[i] = 0;
 }
 
-cxt_hash* CLG_(get_cxt_hash)()
-{
-  return &cxts;
-}
-
 /* double size of cxt table  */
 static void resize_cxt_table(void)
 {

diff --git a/callgrind/events.c b/callgrind/events.c
index 5bad95b9d5c5d262ee0ec0df1900a8e893e1c78a..ab693c71859fc2ddf8c2e5762077ae2fcbcb0c2d 100644 (file)
--- a/callgrind/events.c
+++ b/callgrind/events.c
@@ -162,14 +162,6 @@ EventSet* CLG_(get_event_set2)(Int id1, Int id2)
     return eventset_from_mask((1u << id1) | (1u << id2));
 }
 
-EventSet* CLG_(get_event_set3)(Int id1, Int id2, Int id3)
-{
-    CLG_ASSERT(id1>=0 && id1<MAX_EVENTGROUP_COUNT);
-    CLG_ASSERT(id2>=0 && id2<MAX_EVENTGROUP_COUNT);
-    CLG_ASSERT(id3>=0 && id3<MAX_EVENTGROUP_COUNT);
-    return eventset_from_mask((1u << id1) | (1u << id2) | (1u << id3));
-}
-
 EventSet* CLG_(add_event_group)(EventSet* es, Int id)
 {
     CLG_ASSERT(id>=0 && id<MAX_EVENTGROUP_COUNT);
@@ -192,30 +184,6 @@ EventSet* CLG_(add_event_set)(EventSet* es1, EventSet* es2)
     return eventset_from_mask(es1->mask | es2->mask);
 }
 
-Int CLG_(sprint_eventset)(HChar* buf, EventSet* es)
-{
-    Int i, j, pos;
-    UInt mask;
-    EventGroup* eg;
-
-
-    CLG_ASSERT(es->size >0);
-    pos = 0;
-    for(i=0, mask=1; i<MAX_EVENTGROUP_COUNT; i++, mask=mask<<1) {
-       if ((es->mask & mask)==0) continue;
-       if (eventGroup[i] ==0) continue;
-
-       eg = eventGroup[i];
-       for(j=0; j<eg->size; j++) {
-           if (pos>0) buf[pos++] = ' ';
-           pos += VG_(sprintf)(buf + pos, "%s", eg->name[j]);
-       }
-    }
-    buf[pos] = 0;
-
-    return pos;
-}
-
 
 /* Get cost array for an event set */
 ULong* CLG_(get_eventset_cost)(EventSet* es)
@@ -269,19 +237,6 @@ Bool CLG_(is_zero_cost)(EventSet* es, ULong* cost)
     return True;
 }
 
-Bool CLG_(is_equal_cost)(EventSet* es, ULong* c1, ULong* c2)
-{
-    Int i;
-
-    if (!c1) return CLG_(is_zero_cost)(es, c2);
-    if (!c2) return CLG_(is_zero_cost)(es, c1);
-
-    for(i=0; i<es->size; i++)
-       if (c1[i] != c2[i]) return False;
-
-    return True;
-}
-
 void CLG_(copy_cost)(EventSet* es, ULong* dst, ULong* src)
 {
     Int i;

diff --git a/callgrind/events.h b/callgrind/events.h
index e1e8f1839600c2ac32195dbad080558ada970078..322d27fdf25373fee08b127c63ad03111bed5b15 100644 (file)
--- a/callgrind/events.h
+++ b/callgrind/events.h
@@ -74,12 +74,9 @@ struct _EventSet {
 /* Same event set is returned when requesting same event groups */
 EventSet* CLG_(get_event_set)(Int id);
 EventSet* CLG_(get_event_set2)(Int id1, Int id2);
-EventSet* CLG_(get_event_set3)(Int id1, Int id2, Int id3);
 EventSet* CLG_(add_event_group)(EventSet*, Int id);
 EventSet* CLG_(add_event_group2)(EventSet*, Int id1, Int id2);
 EventSet* CLG_(add_event_set)(EventSet*, EventSet*);
-/* Writes event names into buf. Returns number of characters written */
-Int CLG_(sprint_eventset)(HChar* buf, EventSet*);
 
 
 /* Operations on costs. A cost pointer of 0 means zero cost.
@@ -93,7 +90,6 @@ void CLG_(init_cost_lz)(EventSet*,ULong**);
 /* Set costs of an event set to zero */
 void CLG_(zero_cost)(EventSet*,ULong*);
 Bool CLG_(is_zero_cost)(EventSet*,ULong*);
-Bool CLG_(is_equal_cost)(EventSet*,ULong*,ULong*);
 void CLG_(copy_cost)(EventSet*,ULong* dst, ULong* src);
 void CLG_(copy_cost_lz)(EventSet*,ULong** pdst, ULong* src);
 void CLG_(add_cost)(EventSet*,ULong* dst, ULong* src);

diff --git a/callgrind/global.h b/callgrind/global.h
index 7d021ba946b9cfb0fc6ca310d9d6838fffeb0b35..69143c01fb527ba2c96582eeb77a07bb9446692a 100644 (file)
--- a/callgrind/global.h
+++ b/callgrind/global.h
@@ -776,7 +776,6 @@ void CLG_(setup_bbcc)(BB* bb) VG_REGPARM(1);
 /* from jumps.c */
 void CLG_(init_jcc_hash)(jcc_hash*);
 void CLG_(copy_current_jcc_hash)(jcc_hash* dst);
-jcc_hash* CLG_(get_current_jcc_hash)(void);
 void CLG_(set_current_jcc_hash)(jcc_hash*);
 jCC* CLG_(get_jcc)(BBCC* from, UInt, BBCC* to);
 
@@ -793,11 +792,9 @@ Int CLG_(unwind_call_stack)(Addr sp, Int);
 /* from context.c */
 void CLG_(init_fn_stack)(fn_stack*);
 void CLG_(copy_current_fn_stack)(fn_stack*);
-fn_stack* CLG_(get_current_fn_stack)(void);
 void CLG_(set_current_fn_stack)(fn_stack*);
 
 void CLG_(init_cxt_table)(void);
-cxt_hash* CLG_(get_cxt_hash)(void);
 Context* CLG_(get_cxt)(fn_node** fn);
 void CLG_(push_cxt)(fn_node* fn);