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

        * sidcpuutil.h (sidutil): Add total_insn_count when computing
        simulated cycles.

diff --git a/sid/include/ChangeLog b/sid/include/ChangeLog
index d0e6545..9ee1e09 100644 (file)
--- a/sid/include/ChangeLog
+++ b/sid/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-15  Dave Brolley  <brolley@redhat.com>
+
+       * sidcpuutil.h (sidutil): Add total_insn_count when computing
+       simulated cycles.
+
 2002-11-29  Ben Elliston  <bje@redhat.com>
 
        * sidcpuutil.h (basic_cpu::print_insn_summary_pin): New pin.

diff --git a/sid/include/sidcpuutil.h b/sid/include/sidcpuutil.h
index c091f40..13fb061 100644 (file)
--- a/sid/include/sidcpuutil.h
+++ b/sid/include/sidcpuutil.h
@@ -1,6 +1,6 @@
 // sidcpuutil.h - Elements common to CPU models.  -*- 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.
 
@@ -283,7 +283,7 @@ namespace sidutil
     virtual void print_insn_summary (sid::host_int_4)
       {
        std::cerr << "instruction count: " << this->total_insn_count << "  "
-                 << "simulated cycles: " << this->total_latency << std::endl;
+                 << "simulated cycles: " << this->total_latency + this->total_insn_count << std::endl;
       }
     virtual void stepped (sid::host_int_4 n)
       {