X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fsim-profile.c;h=f68866fd33102cc5faa57786589b547788cd4d31;hb=128e85e3ab36b8e30f6612fb50de3cbb4ede6824;hp=5f6b3f1fb32f00e6e5d27a689267ce6086e71a7b;hpb=21cf617c69031111357d78c1fe10746fe5ef4f6e;p=deliverable%2Fbinutils-gdb.git
diff --git a/sim/common/sim-profile.c b/sim/common/sim-profile.c
index 5f6b3f1fb3..f68866fd33 100644
--- a/sim/common/sim-profile.c
+++ b/sim/common/sim-profile.c
@@ -1,6 +1,5 @@
/* Default profiling support.
- Copyright (C) 1996, 1997, 1998, 2000, 2001, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 1996-2016 Free Software Foundation, Inc.
Contributed by Cygnus Support.
This file is part of GDB, the GNU debugger.
@@ -36,6 +35,16 @@ along with this program. If not, see . */
#endif
#include
+#if !WITH_PROFILE_PC_P
+static unsigned int _profile_stub;
+# define PROFILE_PC_FREQ(p) _profile_stub
+# define PROFILE_PC_NR_BUCKETS(p) _profile_stub
+# define PROFILE_PC_SHIFT(p) _profile_stub
+# define PROFILE_PC_START(p) _profile_stub
+# define PROFILE_PC_END(p) _profile_stub
+# define PROFILE_INSN_COUNT(p) &_profile_stub
+#endif
+
#define COMMAS(n) sim_add_commas (comma_buf, sizeof (comma_buf), (n))
static MODULE_INIT_FN profile_init;
@@ -180,7 +189,7 @@ set_profile_option_mask (SIM_DESC sd, const char *name, int mask, const char *ar
}
}
}
- }
+ }
return SIM_RC_OK;
}
@@ -404,7 +413,7 @@ profile_option_handler (SIM_DESC sd,
{
PROFILE_PC_START (CPU_PROFILE_DATA (STATE_CPU (sd, cpu_nr))) = base;
PROFILE_PC_END (CPU_PROFILE_DATA (STATE_CPU (sd, cpu_nr))) = bound;
- }
+ }
for (cpu_nr = 0; cpu_nr < MAX_NR_PROCESSORS; ++cpu_nr)
CPU_PROFILE_FLAGS (STATE_CPU (sd, cpu_nr))[PROFILE_PC_IDX] = 1;
}
@@ -452,6 +461,31 @@ profile_option_handler (SIM_DESC sd,
return SIM_RC_OK;
}
+/* Profiling output hooks. */
+
+static void
+profile_vprintf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, va_list ap)
+{
+ FILE *fp = PROFILE_FILE (CPU_PROFILE_DATA (cpu));
+
+ /* If an output file was given, redirect output to that. */
+ if (fp != NULL)
+ vfprintf (fp, fmt, ap);
+ else
+ sim_io_evprintf (sd, fmt, ap);
+}
+
+__attribute__ ((format (printf, 3, 4)))
+static void
+profile_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start (ap, fmt);
+ profile_vprintf (sd, cpu, fmt, ap);
+ va_end (ap);
+}
+
/* PC profiling support */
#if WITH_PROFILE_PC_P
@@ -465,7 +499,7 @@ profile_pc_cleanup (SIM_DESC sd)
sim_cpu *cpu = STATE_CPU (sd, n);
PROFILE_DATA *data = CPU_PROFILE_DATA (cpu);
if (PROFILE_PC_COUNT (data) != NULL)
- zfree (PROFILE_PC_COUNT (data));
+ free (PROFILE_PC_COUNT (data));
PROFILE_PC_COUNT (data) = NULL;
if (PROFILE_PC_EVENT (data) != NULL)
sim_events_deschedule (sd, PROFILE_PC_EVENT (data));
@@ -486,21 +520,14 @@ profile_pc_event (SIM_DESC sd,
{
sim_cpu *cpu = (sim_cpu*) data;
PROFILE_DATA *profile = CPU_PROFILE_DATA (cpu);
- address_word pc;
+ address_word pc = sim_pc_get (cpu);
unsigned i;
- switch (STATE_WATCHPOINTS (sd)->sizeof_pc)
- {
- case 2: pc = *(unsigned_2*)(STATE_WATCHPOINTS (sd)->pc) ; break;
- case 4: pc = *(unsigned_4*)(STATE_WATCHPOINTS (sd)->pc) ; break;
- case 8: pc = *(unsigned_8*)(STATE_WATCHPOINTS (sd)->pc) ; break;
- default: pc = 0;
- }
i = (pc - PROFILE_PC_START (profile)) >> PROFILE_PC_SHIFT (profile);
if (i < PROFILE_PC_NR_BUCKETS (profile))
PROFILE_PC_COUNT (profile) [i] += 1; /* Overflow? */
else
PROFILE_PC_COUNT (profile) [PROFILE_PC_NR_BUCKETS (profile)] += 1;
- PROFILE_PC_EVENT (profile) =
+ PROFILE_PC_EVENT (profile) =
sim_events_schedule (sd, PROFILE_PC_FREQ (profile), profile_pc_event, cpu);
}
@@ -513,8 +540,7 @@ profile_pc_init (SIM_DESC sd)
{
sim_cpu *cpu = STATE_CPU (sd, n);
PROFILE_DATA *data = CPU_PROFILE_DATA (cpu);
- if (CPU_PROFILE_FLAGS (STATE_CPU (sd, n))[PROFILE_PC_IDX]
- && STATE_WATCHPOINTS (sd)->pc != NULL)
+ if (CPU_PROFILE_FLAGS (STATE_CPU (sd, n))[PROFILE_PC_IDX])
{
int bucket_size;
/* fill in the frequency if not specified */
@@ -537,7 +563,7 @@ profile_pc_init (SIM_DESC sd)
{
/* nr_buckets = (full-address-range / 2) / (bucket_size / 2) */
PROFILE_PC_NR_BUCKETS (data) =
- ((1 << (STATE_WATCHPOINTS (sd)->sizeof_pc) * (8 - 1))
+ ((1 << sizeof (sim_cia) * (8 - 1))
/ (PROFILE_PC_BUCKET_SIZE (data) / 2));
}
else
@@ -556,7 +582,7 @@ profile_pc_init (SIM_DESC sd)
{
if (PROFILE_PC_END (data) == 0)
/* bucket_size = (full-address-range / 2) / (nr_buckets / 2) */
- bucket_size = ((1 << ((STATE_WATCHPOINTS (sd)->sizeof_pc * 8) - 1))
+ bucket_size = ((1 << ((sizeof (sim_cia) * 8) - 1))
/ (PROFILE_PC_NR_BUCKETS (data) / 2));
else
bucket_size = ((PROFILE_PC_END (data)
@@ -600,7 +626,7 @@ profile_print_pc (sim_cpu *cpu, int verbose)
if (PROFILE_PC_COUNT (profile) == 0)
return;
- sim_io_printf (sd, "Program Counter Statistics:\n\n");
+ profile_printf (sd, cpu, "Program Counter Statistics:\n\n");
/* First pass over data computes various things. */
max_val = 0;
@@ -612,45 +638,45 @@ profile_print_pc (sim_cpu *cpu, int verbose)
max_val = PROFILE_PC_COUNT (profile) [i];
}
- sim_io_printf (sd, " Total samples: %s\n",
- COMMAS (total));
- sim_io_printf (sd, " Granularity: %s bytes per bucket\n",
- COMMAS (PROFILE_PC_BUCKET_SIZE (profile)));
- sim_io_printf (sd, " Size: %s buckets\n",
- COMMAS (PROFILE_PC_NR_BUCKETS (profile)));
- sim_io_printf (sd, " Frequency: %s cycles per sample\n",
- COMMAS (PROFILE_PC_FREQ (profile)));
+ profile_printf (sd, cpu, " Total samples: %s\n",
+ COMMAS (total));
+ profile_printf (sd, cpu, " Granularity: %s bytes per bucket\n",
+ COMMAS (PROFILE_PC_BUCKET_SIZE (profile)));
+ profile_printf (sd, cpu, " Size: %s buckets\n",
+ COMMAS (PROFILE_PC_NR_BUCKETS (profile)));
+ profile_printf (sd, cpu, " Frequency: %s cycles per sample\n",
+ COMMAS (PROFILE_PC_FREQ (profile)));
if (PROFILE_PC_END (profile) != 0)
- sim_io_printf (sd, " Range: 0x%lx 0x%lx\n",
- (long) PROFILE_PC_START (profile),
+ profile_printf (sd, cpu, " Range: 0x%lx 0x%lx\n",
+ (long) PROFILE_PC_START (profile),
(long) PROFILE_PC_END (profile));
if (verbose && max_val != 0)
{
/* Now we can print the histogram. */
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
for (i = 0; i <= PROFILE_PC_NR_BUCKETS (profile); ++i)
{
if (PROFILE_PC_COUNT (profile) [i] != 0)
{
- sim_io_printf (sd, " ");
+ profile_printf (sd, cpu, " ");
if (i == PROFILE_PC_NR_BUCKETS (profile))
- sim_io_printf (sd, "%10s:", "overflow");
+ profile_printf (sd, cpu, "%10s:", "overflow");
else
- sim_io_printf (sd, "0x%08lx:",
- (long) (PROFILE_PC_START (profile)
- + (i * PROFILE_PC_BUCKET_SIZE (profile))));
- sim_io_printf (sd, " %*s",
- max_val < 10000 ? 5 : 10,
- COMMAS (PROFILE_PC_COUNT (profile) [i]));
- sim_io_printf (sd, " %4.1f",
- (PROFILE_PC_COUNT (profile) [i] * 100.0) / total);
- sim_io_printf (sd, ": ");
- sim_profile_print_bar (sd, PROFILE_HISTOGRAM_WIDTH,
+ profile_printf (sd, cpu, "0x%08lx:",
+ (long) (PROFILE_PC_START (profile)
+ + (i * PROFILE_PC_BUCKET_SIZE (profile))));
+ profile_printf (sd, cpu, " %*s",
+ max_val < 10000 ? 5 : 10,
+ COMMAS (PROFILE_PC_COUNT (profile) [i]));
+ profile_printf (sd, cpu, " %4.1f",
+ (PROFILE_PC_COUNT (profile) [i] * 100.0) / total);
+ profile_printf (sd, cpu, ": ");
+ sim_profile_print_bar (sd, cpu, PROFILE_HISTOGRAM_WIDTH,
PROFILE_PC_COUNT (profile) [i],
max_val);
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
}
}
}
@@ -663,7 +689,7 @@ profile_print_pc (sim_cpu *cpu, int verbose)
/* FIXME: Is this the best place for this code? */
{
FILE *pf = fopen ("gmon.out", "wb");
-
+
if (pf == NULL)
sim_io_eprintf (sd, "Failed to open \"gmon.out\" profile file\n");
else
@@ -705,11 +731,11 @@ profile_print_pc (sim_cpu *cpu, int verbose)
}
if (ok == 0)
sim_io_eprintf (sd, "Failed to write to \"gmon.out\" profile file\n");
- fclose(pf);
+ fclose (pf);
}
}
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
}
#endif
@@ -746,12 +772,12 @@ profile_print_insn (sim_cpu *cpu, int verbose)
if (CPU_MAX_INSNS (cpu) == 0)
return;
- sim_io_printf (sd, "Instruction Statistics");
+ profile_printf (sd, cpu, "Instruction Statistics");
#ifdef SIM_HAVE_ADDR_RANGE
if (PROFILE_RANGE (data)->ranges)
- sim_io_printf (sd, " (for selected address range(s))");
+ profile_printf (sd, cpu, " (for selected address range(s))");
#endif
- sim_io_printf (sd, "\n\n");
+ profile_printf (sd, cpu, "\n\n");
/* First pass over data computes various things. */
max_val = 0;
@@ -774,12 +800,12 @@ profile_print_insn (sim_cpu *cpu, int verbose)
if (! PROFILE_TOTAL_INSN_COUNT (data))
PROFILE_TOTAL_INSN_COUNT (data) = total;
- sim_io_printf (sd, " Total: %s insns\n", COMMAS (total));
+ profile_printf (sd, cpu, " Total: %s insns\n", COMMAS (total));
if (verbose && max_val != 0)
{
/* Now we can print the histogram. */
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
for (i = 0; i < CPU_MAX_INSNS (cpu); ++i)
{
const char *name = (*CPU_INSN_NAME (cpu)) (cpu, i);
@@ -788,19 +814,19 @@ profile_print_insn (sim_cpu *cpu, int verbose)
continue;
if (PROFILE_INSN_COUNT (data) [i] != 0)
{
- sim_io_printf (sd, " %*s: %*s: ",
- max_name_len, name,
- max_val < 10000 ? 5 : 10,
- COMMAS (PROFILE_INSN_COUNT (data) [i]));
- sim_profile_print_bar (sd, PROFILE_HISTOGRAM_WIDTH,
+ profile_printf (sd, cpu, " %*s: %*s: ",
+ max_name_len, name,
+ max_val < 10000 ? 5 : 10,
+ COMMAS (PROFILE_INSN_COUNT (data) [i]));
+ sim_profile_print_bar (sd, cpu, PROFILE_HISTOGRAM_WIDTH,
PROFILE_INSN_COUNT (data) [i],
max_val);
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
}
}
}
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
}
#endif
@@ -818,7 +844,7 @@ profile_print_memory (sim_cpu *cpu, int verbose)
PROFILE_DATA *data = CPU_PROFILE_DATA (cpu);
char comma_buf[20];
- sim_io_printf (sd, "Memory Access Statistics\n\n");
+ profile_printf (sd, cpu, "Memory Access Statistics\n\n");
/* First pass over data computes various things. */
max_val = total_read = total_write = max_name_len = 0;
@@ -836,45 +862,45 @@ profile_print_memory (sim_cpu *cpu, int verbose)
}
/* One could use PROFILE_LABEL_WIDTH here. I chose not to. */
- sim_io_printf (sd, " Total read: %s accesses\n",
- COMMAS (total_read));
- sim_io_printf (sd, " Total write: %s accesses\n",
- COMMAS (total_write));
+ profile_printf (sd, cpu, " Total read: %s accesses\n",
+ COMMAS (total_read));
+ profile_printf (sd, cpu, " Total write: %s accesses\n",
+ COMMAS (total_write));
if (verbose && max_val != 0)
{
/* FIXME: Need to separate instruction fetches from data fetches
as the former swamps the latter. */
/* Now we can print the histogram. */
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
for (i = 0; i < MODE_TARGET_MAX; ++i)
{
if (PROFILE_READ_COUNT (data) [i] != 0)
{
- sim_io_printf (sd, " %*s read: %*s: ",
- max_name_len, MODE_NAME (i),
- max_val < 10000 ? 5 : 10,
- COMMAS (PROFILE_READ_COUNT (data) [i]));
- sim_profile_print_bar (sd, PROFILE_HISTOGRAM_WIDTH,
+ profile_printf (sd, cpu, " %*s read: %*s: ",
+ max_name_len, MODE_NAME (i),
+ max_val < 10000 ? 5 : 10,
+ COMMAS (PROFILE_READ_COUNT (data) [i]));
+ sim_profile_print_bar (sd, cpu, PROFILE_HISTOGRAM_WIDTH,
PROFILE_READ_COUNT (data) [i],
max_val);
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
}
if (PROFILE_WRITE_COUNT (data) [i] != 0)
{
- sim_io_printf (sd, " %*s write: %*s: ",
- max_name_len, MODE_NAME (i),
- max_val < 10000 ? 5 : 10,
- COMMAS (PROFILE_WRITE_COUNT (data) [i]));
- sim_profile_print_bar (sd, PROFILE_HISTOGRAM_WIDTH,
+ profile_printf (sd, cpu, " %*s write: %*s: ",
+ max_name_len, MODE_NAME (i),
+ max_val < 10000 ? 5 : 10,
+ COMMAS (PROFILE_WRITE_COUNT (data) [i]));
+ sim_profile_print_bar (sd, cpu, PROFILE_HISTOGRAM_WIDTH,
PROFILE_WRITE_COUNT (data) [i],
max_val);
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
}
}
}
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
}
#endif
@@ -891,7 +917,7 @@ profile_print_core (sim_cpu *cpu, int verbose)
PROFILE_DATA *data = CPU_PROFILE_DATA (cpu);
char comma_buf[20];
- sim_io_printf (sd, "CORE Statistics\n\n");
+ profile_printf (sd, cpu, "CORE Statistics\n\n");
/* First pass over data computes various things. */
{
@@ -907,31 +933,31 @@ profile_print_core (sim_cpu *cpu, int verbose)
}
/* One could use PROFILE_LABEL_WIDTH here. I chose not to. */
- sim_io_printf (sd, " Total: %s accesses\n",
- COMMAS (total));
+ profile_printf (sd, cpu, " Total: %s accesses\n",
+ COMMAS (total));
if (verbose && max_val != 0)
{
unsigned map;
/* Now we can print the histogram. */
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
for (map = 0; map < nr_maps; map++)
{
if (PROFILE_CORE_COUNT (data) [map] != 0)
{
- sim_io_printf (sd, "%10s:", map_to_str (map));
- sim_io_printf (sd, "%*s: ",
- max_val < 10000 ? 5 : 10,
- COMMAS (PROFILE_CORE_COUNT (data) [map]));
- sim_profile_print_bar (sd, PROFILE_HISTOGRAM_WIDTH,
+ profile_printf (sd, cpu, "%10s:", map_to_str (map));
+ profile_printf (sd, cpu, "%*s: ",
+ max_val < 10000 ? 5 : 10,
+ COMMAS (PROFILE_CORE_COUNT (data) [map]));
+ sim_profile_print_bar (sd, cpu, PROFILE_HISTOGRAM_WIDTH,
PROFILE_CORE_COUNT (data) [map],
max_val);
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
}
}
}
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
}
#endif
@@ -948,35 +974,35 @@ profile_print_model (sim_cpu *cpu, int verbose)
unsigned long total_cycles = PROFILE_MODEL_TOTAL_CYCLES (data);
char comma_buf[20];
- sim_io_printf (sd, "Model %s Timing Information",
- MODEL_NAME (CPU_MODEL (cpu)));
+ profile_printf (sd, cpu, "Model %s Timing Information",
+ MODEL_NAME (CPU_MODEL (cpu)));
#ifdef SIM_HAVE_ADDR_RANGE
if (PROFILE_RANGE (data)->ranges)
- sim_io_printf (sd, " (for selected address range(s))");
+ profile_printf (sd, cpu, " (for selected address range(s))");
#endif
- sim_io_printf (sd, "\n\n");
- sim_io_printf (sd, " %-*s %s\n",
- PROFILE_LABEL_WIDTH, "Taken branches:",
- COMMAS (PROFILE_MODEL_TAKEN_COUNT (data)));
- sim_io_printf (sd, " %-*s %s\n",
- PROFILE_LABEL_WIDTH, "Untaken branches:",
- COMMAS (PROFILE_MODEL_UNTAKEN_COUNT (data)));
- sim_io_printf (sd, " %-*s %s\n",
- PROFILE_LABEL_WIDTH, "Cycles stalled due to branches:",
- COMMAS (cti_stall_cycles));
- sim_io_printf (sd, " %-*s %s\n",
- PROFILE_LABEL_WIDTH, "Cycles stalled due to loads:",
- COMMAS (load_stall_cycles));
- sim_io_printf (sd, " %-*s %s\n",
- PROFILE_LABEL_WIDTH, "Total cycles (*approximate*):",
- COMMAS (total_cycles));
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n\n");
+ profile_printf (sd, cpu, " %-*s %s\n",
+ PROFILE_LABEL_WIDTH, "Taken branches:",
+ COMMAS (PROFILE_MODEL_TAKEN_COUNT (data)));
+ profile_printf (sd, cpu, " %-*s %s\n",
+ PROFILE_LABEL_WIDTH, "Untaken branches:",
+ COMMAS (PROFILE_MODEL_UNTAKEN_COUNT (data)));
+ profile_printf (sd, cpu, " %-*s %s\n",
+ PROFILE_LABEL_WIDTH, "Cycles stalled due to branches:",
+ COMMAS (cti_stall_cycles));
+ profile_printf (sd, cpu, " %-*s %s\n",
+ PROFILE_LABEL_WIDTH, "Cycles stalled due to loads:",
+ COMMAS (load_stall_cycles));
+ profile_printf (sd, cpu, " %-*s %s\n",
+ PROFILE_LABEL_WIDTH, "Total cycles (*approximate*):",
+ COMMAS (total_cycles));
+ profile_printf (sd, cpu, "\n");
}
#endif
void
-sim_profile_print_bar (SIM_DESC sd, unsigned int width,
+sim_profile_print_bar (SIM_DESC sd, sim_cpu *cpu, unsigned int width,
unsigned int val, unsigned int max_val)
{
unsigned int i, count;
@@ -984,7 +1010,7 @@ sim_profile_print_bar (SIM_DESC sd, unsigned int width,
count = ((double) val / (double) max_val) * (double) width;
for (i = 0; i < count; ++i)
- sim_io_printf (sd, "*");
+ profile_printf (sd, cpu, "*");
}
/* Print the simulator's execution speed for CPU. */
@@ -1000,13 +1026,13 @@ profile_print_speed (sim_cpu *cpu)
double secs;
char comma_buf[20];
- sim_io_printf (sd, "Simulator Execution Speed\n\n");
+ profile_printf (sd, cpu, "Simulator Execution Speed\n\n");
if (total != 0)
- sim_io_printf (sd, " Total instructions: %s\n", COMMAS (total));
+ profile_printf (sd, cpu, " Total instructions: %s\n", COMMAS (total));
if (milliseconds < 1000)
- sim_io_printf (sd, " Total execution time: < 1 second\n\n");
+ profile_printf (sd, cpu, " Total execution time: < 1 second\n\n");
else
{
/* The printing of the time rounded to 2 decimal places makes the speed
@@ -1015,13 +1041,13 @@ profile_print_speed (sim_cpu *cpu)
better that the user not perceive there's a math error. */
secs = (double) milliseconds / 1000;
secs = ((double) (unsigned long) (secs * 100 + .5)) / 100;
- sim_io_printf (sd, " Total execution time : %.2f seconds\n", secs);
+ profile_printf (sd, cpu, " Total execution time : %.2f seconds\n", secs);
/* Don't confuse things with data that isn't useful.
If we ran for less than 2 seconds, only use the data if we
executed more than 100,000 insns. */
if (secs >= 2 || total >= 100000)
- sim_io_printf (sd, " Simulator speed: %s insns/second\n",
- COMMAS ((unsigned long) ((double) total / secs)));
+ profile_printf (sd, cpu, " Simulator speed: %s insns/second\n",
+ COMMAS ((unsigned long) ((double) total / secs)));
}
/* Print simulated execution time if the cpu frequency has been specified. */
@@ -1029,10 +1055,10 @@ profile_print_speed (sim_cpu *cpu)
if (clock != 0)
{
if (clock >= 1000000)
- sim_io_printf (sd, " Simulated cpu frequency: %.2f MHz\n",
- clock / 1000000);
+ profile_printf (sd, cpu, " Simulated cpu frequency: %.2f MHz\n",
+ clock / 1000000);
else
- sim_io_printf (sd, " Simulated cpu frequency: %.2f Hz\n", clock);
+ profile_printf (sd, cpu, " Simulated cpu frequency: %.2f Hz\n", clock);
#if WITH_PROFILE_MODEL_P
if (PROFILE_FLAGS (data) [PROFILE_MODEL_IDX])
@@ -1044,8 +1070,8 @@ profile_print_speed (sim_cpu *cpu)
error. */
secs = PROFILE_MODEL_TOTAL_CYCLES (data) / clock;
secs = ((double) (unsigned long) (secs * 100 + .5)) / 100;
- sim_io_printf (sd, " Simulated execution time: %.2f seconds\n",
- secs);
+ profile_printf (sd, cpu, " Simulated execution time: %.2f seconds\n",
+ secs);
}
#endif /* WITH_PROFILE_MODEL_P */
}
@@ -1062,14 +1088,14 @@ profile_print_addr_ranges (sim_cpu *cpu)
if (asr)
{
- sim_io_printf (sd, "Selected address ranges\n\n");
+ profile_printf (sd, cpu, "Selected address ranges\n\n");
while (asr != NULL)
{
- sim_io_printf (sd, " 0x%lx - 0x%lx\n",
- (long) asr->start, (long) asr->end);
+ profile_printf (sd, cpu, " 0x%lx - 0x%lx\n",
+ (long) asr->start, (long) asr->end);
asr = asr->next;
}
- sim_io_printf (sd, "\n");
+ profile_printf (sd, cpu, "\n");
}
}
#endif
@@ -1097,18 +1123,19 @@ profile_info (SIM_DESC sd, int verbose)
/* FIXME: If the number of processors can be selected on the command line,
then MAX_NR_PROCESSORS will need to take an argument of `sd'. */
- for (c = 0; c < MAX_NR_PROCESSORS; ++c)
+ for (c = 0; c < MAX_NR_PROCESSORS && !print_title_p; ++c)
{
sim_cpu *cpu = STATE_CPU (sd, c);
PROFILE_DATA *data = CPU_PROFILE_DATA (cpu);
for (i = 0; i < MAX_PROFILE_VALUES; ++i)
if (PROFILE_FLAGS (data) [i])
- print_title_p = 1;
- /* One could break out early if print_title_p is set. */
+ {
+ profile_printf (sd, cpu, "Summary profiling results:\n\n");
+ print_title_p = 1;
+ break;
+ }
}
- if (print_title_p)
- sim_io_printf (sd, "Summary profiling results:\n\n");
/* Loop, cpu by cpu, printing results. */
@@ -1139,7 +1166,7 @@ profile_info (SIM_DESC sd, int verbose)
#endif
))
{
- sim_io_printf (sd, "CPU %d\n\n", c);
+ profile_printf (sd, cpu, "CPU %d\n\n", c);
}
#ifdef SIM_HAVE_ADDR_RANGE
@@ -1272,6 +1299,6 @@ profile_uninstall (SIM_DESC sd)
}
if (PROFILE_INSN_COUNT (data) != NULL)
- zfree (PROFILE_INSN_COUNT (data));
+ free (PROFILE_INSN_COUNT (data));
}
}