* m32r-sim.h (M32R_MISC_PROFILE): New members insn_cycles, cti_stall,

load_stall,biggest_cycles.
	* m32r.c (m32r_model_mark_get_h_gr): Update.
	(m32r_model_init_insn_cycles,m32r_model_update_insn_cycles): New fns.
	(m32r_model_record_cti,m32r_model_record_cycles): New functions.
	* mloop.in: Call cycle init/update fns.
	* model.c: Regenerate.
	* m32rx.c (m32rx_model_mark_get_h_gr): Update.
	* mloopx.in: Call cycle init/update fns.
	* modelx.c: Regenerate.
This commit is contained in:
Doug Evans 1998-06-13 14:56:28 +00:00
parent 403bed787e
commit b4cbaee405
2 changed files with 200 additions and 1 deletions

187
sim/m32r/mloop.in Normal file
View File

@ -0,0 +1,187 @@
# Simulator main loop for m32r. -*- C -*-
# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
#
# This file is part of the GNU Simulators.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Syntax:
# /bin/sh mainloop.in init|support|{full,fast}-{extract,exec}-{scache,noscache}
# ??? After a few more ports are done, revisit.
# Will eventually need to machine generate a lot of this.
case "x$1" in
xsupport)
cat <<EOF
static INLINE void
extract16 (SIM_CPU *current_cpu, PCADDR pc, insn_t insn,
SCACHE *sc, int fast_p)
{
const IDESC *d = @cpu@_decode (current_cpu, pc, insn);
(*d->extract) (current_cpu, pc, insn, &sc->argbuf);
if (fast_p)
{
#if WITH_SEM_SWITCH_FAST
#ifdef __GNUC__
sc->semantic.sem_case = d->sem_fast_lab;
#else
sc->semantic.sem_case = d->num;
#endif
#else
sc->semantic.sem_fast = d->sem_fast;
#endif
}
else
{
sc->semantic.sem_full = d->sem_full;
}
sc->argbuf.idesc = d;
sc->next = pc + 2;
}
static INLINE void
extract32 (SIM_CPU *current_cpu, PCADDR pc, insn_t insn,
SCACHE *sc, int fast_p)
{
const IDESC *d = @cpu@_decode (current_cpu, pc, (USI) insn >> 16);
(*d->extract) (current_cpu, pc, insn, &sc->argbuf);
if (fast_p)
{
#if WITH_SEM_SWITCH_FAST
#ifdef __GNUC__
sc->semantic.sem_case = d->sem_fast_lab;
#else
sc->semantic.sem_case = d->num;
#endif
#else
sc->semantic.sem_fast_fn = d->sem_fast;
#endif
}
else
{
sc->semantic.sem_full = d->sem_full;
}
sc->argbuf.idesc = d;
sc->next = pc + 4;
}
static INLINE PCADDR
execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p)
{
PCADDR pc;
if (fast_p)
{
#if WITH_SCACHE && ! WITH_SEM_SWITCH_FAST
pc = (*sc->semantic.sem_fast) (current_cpu, sc);
#else
#if 0
pc = (*sc->semantic.sem_full) (current_cpu, &sc->argbuf);
#else
pc = (*sc->semantic.sem_full) (current_cpu, sc);
#endif
#endif
}
else
{
m32r_model_init_insn_cycles (current_cpu, 1);
TRACE_INSN_INIT (current_cpu, 1);
TRACE_INSN (current_cpu, sc->argbuf.idesc->opcode, (const struct argbuf *) &sc->argbuf, sc->argbuf.addr);
#if 0
pc = (*sc->semantic.sem_full) (current_cpu, &sc->argbuf);
#else
pc = (*sc->semantic.sem_full) (current_cpu, sc);
#endif
m32r_model_update_insn_cycles (current_cpu, 1);
TRACE_INSN_FINI (current_cpu, 1);
}
return pc;
}
EOF
;;
xinit)
cat <<EOF
/*xxxinit*/
EOF
;;
xfull-extract-* | xfast-extract-*)
cat <<EOF
{
PCADDR pc = CPU (h_pc);
if ((pc & 3) != 0)
{
/* This only occurs when single stepping.
The test is unnecessary otherwise, but the cost is teensy,
compared with decoding/extraction. */
UHI insn = GETIMEMUHI (current_cpu, pc);
extract16 (current_cpu, pc, insn & 0x7fff, sc, FAST_P);
}
else
{
USI insn = GETIMEMUSI (current_cpu, pc);
if ((SI) insn < 0)
{
extract32 (current_cpu, pc, insn, sc, FAST_P);
}
else
{
extract16 (current_cpu, pc, insn >> 16, sc, FAST_P);
extract16 (current_cpu, pc + 2, insn & 0x7fff, sc + 1, FAST_P);
/* The m32r doesn't support parallel execution. */
if ((insn & 0x8000) != 0
&& (insn & 0x7fff) != 0x7000) /* parallel nops are ok */
sim_engine_illegal_insn (current_cpu, pc);
}
}
}
EOF
;;
xfull-exec-* | xfast-exec-*)
cat <<EOF
{
#if WITH_SCACHE && FAST_P && WITH_SEM_SWITCH_FAST
#define DEFINE_SWITCH
#include "sem-switch.c"
#else
PCADDR new_pc = execute (current_cpu, sc, FAST_P);
CPU (h_pc) = new_pc;
#endif
}
EOF
;;
*)
echo "Invalid argument to mainloop.in: $1" >&2
exit 1
;;
esac

View File

@ -58,6 +58,7 @@ cat <<EOF
d1 = m32rx_decode (current_cpu, pc, insn);
abufs[0].insn = insn;
abufs[0].idesc = d1;
abufs[0].addr = pc; /* FIXME: wip */
icount = 1;
}
else
@ -68,6 +69,7 @@ cat <<EOF
d1 = m32rx_decode (current_cpu, pc, insn >> 16);
abufs[0].insn = insn;
abufs[0].idesc = d1;
abufs[0].addr = pc; /* FIXME: wip */
icount = 1;
}
else
@ -77,9 +79,11 @@ cat <<EOF
d1 = m32rx_decode (current_cpu, pc, insn >> 16);
abufs[0].insn = insn >> 16;
abufs[0].idesc = d1;
d2 = m32rx_decode (current_cpu, pc, insn & 0x7fff);
abufs[0].addr = pc; /* FIXME: wip */
d2 = m32rx_decode (current_cpu, pc + 2, insn & 0x7fff);
abufs[1].insn = insn & 0x7fff;
abufs[1].idesc = d2;
abufs[1].addr = pc + 2; /* FIXME: wip */
icount = 2;
}
else
@ -87,6 +91,7 @@ cat <<EOF
d1 = m32rx_decode (current_cpu, pc, insn >> 16);
abufs[0].insn = insn >> 16;
abufs[0].idesc = d1;
abufs[0].addr = pc; /* FIXME: wip */
icount = 1;
}
}
@ -130,9 +135,11 @@ cat <<EOF
}
#endif
m32r_model_init_insn_cycles (current_cpu, 1);
TRACE_INSN_INIT (current_cpu, 1);
TRACE_INSN (current_cpu, d1->opcode, sem_arg, CPU (h_pc));
new_pc = (*d1->sem_full) (current_cpu, sem_arg, par_exec);
m32r_model_update_insn_cycles (current_cpu, icount == 1);
TRACE_INSN_FINI (current_cpu, icount == 1);
/* The result of the semantic fn is one of:
@ -164,10 +171,12 @@ cat <<EOF
++sem_arg;
++par_exec;
m32r_model_init_insn_cycles (current_cpu, 0);
TRACE_INSN_INIT (current_cpu, 0);
TRACE_INSN (current_cpu, d2->opcode, sem_arg, CPU (h_pc) + 2);
/* pc2 isn't used. It's assigned a value for debugging. */
pc2 = (*d2->sem_full) (current_cpu, sem_arg, par_exec);
m32r_model_update_insn_cycles (current_cpu, 1);
TRACE_INSN_FINI (current_cpu, 1);
if (NEW_PC_BRANCH_P (new_pc))
@ -175,6 +184,9 @@ cat <<EOF
else
CPU (h_pc) += 4;
}
/* Update count of parallel insns executed. */
PROFILE_COUNT_PARINSNS (current_cpu);
}
else if (NEW_PC_BRANCH_P (new_pc))
CPU (h_pc) = new_pc;