003-01-15 Dave Brolley <brolley@redhat.com>

        * compCGEN.cxx (cgen_bi_endian_cpu): Don't initialize trace_count.
        (trace_counter): Use total_insn_count and total_latency.
        * cgen-cpu.h (class cgen_bi_endian_cpu): Remove trace_count.

diff --git a/sid/component/cgen-cpu/ChangeLog b/sid/component/cgen-cpu/ChangeLog
index cf8488c..becc5c8 100644 (file)
--- a/sid/component/cgen-cpu/ChangeLog
+++ b/sid/component/cgen-cpu/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-15  Dave Brolley  <brolley@redhat.com>
+
+       * compCGEN.cxx (cgen_bi_endian_cpu): Don't initialize trace_count.
+       (trace_counter): Use total_insn_count and total_latency.
+       * cgen-cpu.h (class cgen_bi_endian_cpu): Remove trace_count.
+
 2003-01-09  Frank Ch. Eigler  <fche@redhat.com>
 
        * tracedis.cxx (bfd_{get,put}_bits): Use int, not obsolete bfd

diff --git a/sid/component/cgen-cpu/cgen-cpu.h b/sid/component/cgen-cpu/cgen-cpu.h
index d7f6484..4399ab8 100644 (file)
--- a/sid/component/cgen-cpu/cgen-cpu.h
+++ b/sid/component/cgen-cpu/cgen-cpu.h
@@ -1,6 +1,6 @@
 // cgen-cpu.h  -*- C++ -*-
 
-// Copyright (C) 2000, 2001, 2002 Red Hat.
+// Copyright (C) 2000, 2001, 2002, 2003 Red Hat.
 // This file is part of SID and is licensed under the GPL.
 // See the file COPYING.SID for conditions for redistribution.
 
@@ -80,7 +80,6 @@ protected:
   static int cgen_symbol_at_address(bfd_vma addr, struct disassemble_info * info);
   // Counter tracing support
   void trace_counter (PCADDR pc);
-  host_int_8 trace_count;
 
 public:
   cgen_bi_endian_cpu ();

diff --git a/sid/component/cgen-cpu/compCGEN.cxx b/sid/component/cgen-cpu/compCGEN.cxx
index 82a3cc2..3e2fae3 100644 (file)
--- a/sid/component/cgen-cpu/compCGEN.cxx
+++ b/sid/component/cgen-cpu/compCGEN.cxx
@@ -1,6 +1,6 @@
 // compCGEN.cxx - CPU components.  -*- C++ -*-
 
-// Copyright (C) 1999, 2000, 2001, 2002 Red Hat.
+// Copyright (C) 1999, 2000, 2001, 2002, 2003 Red Hat.
 // This file is part of SID and is licensed under the GPL.
 // See the file COPYING.SID for conditions for redistribution.
 
@@ -39,7 +39,6 @@ using namespace cgen;
 // ----------------------------------------------------------------------------
 cgen_bi_endian_cpu::cgen_bi_endian_cpu ()
 {
-  trace_count = 0;
   warnings_enabled = false;
   add_attribute ("enable-warnings?", & warnings_enabled, "setting");
   this->engine_type = ENGINE_UNKNOWN;
@@ -260,11 +259,8 @@ void
 cgen_bi_endian_cpu::trace_counter (PCADDR pc)
 {
   this->trace_stream
-    << this->trace_count++ << ' ' 
-    << (this->sched_query.now()-1) << '\t';
-
-  // Invalidate any local icaches; they distort approximate cycle counting.
-  this->flush_icache (pc);
+    << this->total_insn_count << ' ' 
+    << this->total_insn_count + this->total_latency << '\t';
 }
 \f