386c386
< code('${{var.type.c_ident}}$th* m_${{var.c_ident}}_ptr;')
---
> code('${{var.type.c_ident}}$th* m_${{var.ident}}_ptr;')
491,492c491,492
< m_${{var.c_ident}}_ptr = new ${{var.type.c_ident}}();
< m_${{var.c_ident}}_ptr->setReceiver(this);
---
> m_${{var.ident}}_ptr = new ${{var.type.c_ident}}();
> m_${{var.ident}}_ptr->setReceiver(this);
499,501c499,501
< m_${{var.c_ident}}_ptr = new ${{var.type.c_ident}}();
< peerQueueMap[${{var["physical_network"]}}] = m_${{var.c_ident}}_ptr;
< m_${{var.c_ident}}_ptr->setSender(this);
---
> m_${{var.ident}}_ptr = new ${{var.type.c_ident}}();
> peerQueueMap[${{var["physical_network"]}}] = m_${{var.ident}}_ptr;
> m_${{var.ident}}_ptr->setSender(this);
535c535
< vid = "m_%s_ptr" % var.c_ident
---
> vid = "m_%s_ptr" % var.ident
629c629
< $vid->setDescription("[Version " + to_string(m_version) + ", ${ident}, name=${{var.c_ident}}]");
---
> $vid->setDescription("[Version " + to_string(m_version) + ", ${ident}, name=${{var.ident}}]");
677c677
< mq_ident = "m_%s_mandatoryQueue_ptr" % self.ident
---
> mq_ident = "m_mandatoryQueue_ptr"
958c958
< vid = "m_%s_ptr" % var.c_ident
---
> vid = "m_%s_ptr" % var.ident
975c975
< vid = "m_%s_ptr" % var.c_ident
---
> vid = "m_%s_ptr" % var.ident
995,997c995,997
< m_${{var.c_ident}}_ptr = peer->getPeerQueue(${{var["physical_network"]}});
< assert(m_${{var.c_ident}}_ptr != NULL);
< m_${{var.c_ident}}_ptr->setReceiver(this);
---
> m_${{var.ident}}_ptr = peer->getPeerQueue(${{var["physical_network"]}});
> assert(m_${{var.ident}}_ptr != NULL);
> m_${{var.ident}}_ptr->setReceiver(this);
1133a1134,1135
> code.indent()
>
1144c1146
< ${ident}_State next_state = state;
---
> ${ident}_State next_state = state;
1146,1148c1148,1150
< DPRINTF(RubyGenerated, "%s, Time: %lld, state: %s, event: %s, addr: %s\\n",
< *this, curCycle(), ${ident}_State_to_string(state),
< ${ident}_Event_to_string(event), addr);
---
> DPRINTF(RubyGenerated, "%s, Time: %lld, state: %s, event: %s, addr: %s\\n",
> *this, curCycle(), ${ident}_State_to_string(state),
> ${ident}_Event_to_string(event), addr);
1150c1152
< TransitionResult result =
---
> TransitionResult result =
1162,1171d1163
< if (result == TransitionResult_Valid) {
< DPRINTF(RubyGenerated, "next_state: %s\\n",
< ${ident}_State_to_string(next_state));
< countTransition(state, event);
< DPRINTFR(ProtocolTrace, "%15d %3s %10s%20s %6s>%-6s %s %s\\n",
< curTick(), m_version, "${ident}",
< ${ident}_Event_to_string(event),
< ${ident}_State_to_string(state),
< ${ident}_State_to_string(next_state),
< addr, GET_TRANSITION_COMMENT());
1173c1165,1177
< CLEAR_TRANSITION_COMMENT();
---
> if (result == TransitionResult_Valid) {
> DPRINTF(RubyGenerated, "next_state: %s\\n",
> ${ident}_State_to_string(next_state));
> countTransition(state, event);
>
> DPRINTFR(ProtocolTrace, "%15d %3s %10s%20s %6s>%-6s %s %s\\n",
> curTick(), m_version, "${ident}",
> ${ident}_Event_to_string(event),
> ${ident}_State_to_string(state),
> ${ident}_State_to_string(next_state),
> addr, GET_TRANSITION_COMMENT());
>
> CLEAR_TRANSITION_COMMENT();
1189,1204c1193,1208
< } else if (result == TransitionResult_ResourceStall) {
< DPRINTFR(ProtocolTrace, "%15s %3s %10s%20s %6s>%-6s %s %s\\n",
< curTick(), m_version, "${ident}",
< ${ident}_Event_to_string(event),
< ${ident}_State_to_string(state),
< ${ident}_State_to_string(next_state),
< addr, "Resource Stall");
< } else if (result == TransitionResult_ProtocolStall) {
< DPRINTF(RubyGenerated, "stalling\\n");
< DPRINTFR(ProtocolTrace, "%15s %3s %10s%20s %6s>%-6s %s %s\\n",
< curTick(), m_version, "${ident}",
< ${ident}_Event_to_string(event),
< ${ident}_State_to_string(state),
< ${ident}_State_to_string(next_state),
< addr, "Protocol Stall");
< }
---
> } else if (result == TransitionResult_ResourceStall) {
> DPRINTFR(ProtocolTrace, "%15s %3s %10s%20s %6s>%-6s %s %s\\n",
> curTick(), m_version, "${ident}",
> ${ident}_Event_to_string(event),
> ${ident}_State_to_string(state),
> ${ident}_State_to_string(next_state),
> addr, "Resource Stall");
> } else if (result == TransitionResult_ProtocolStall) {
> DPRINTF(RubyGenerated, "stalling\\n");
> DPRINTFR(ProtocolTrace, "%15s %3s %10s%20s %6s>%-6s %s %s\\n",
> curTick(), m_version, "${ident}",
> ${ident}_Event_to_string(event),
> ${ident}_State_to_string(state),
> ${ident}_State_to_string(next_state),
> addr, "Protocol Stall");
> }
1206c1210,1213
< return result;
---
> return result;
> ''')
> code.dedent()
> code('''
1313c1320
< code(' $case')
---
> code(' $case\n')
1320a1328
>