mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-07 01:54:10 +00:00
Code Activity

Fixed build with clang

Browse source
This commit is contained in:
Clifford Wolf 2013-06-18 19:54:33 +02:00
parent 48aa72ae8f
commit a046a302f0
1 changed files with 69 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
kernel/rtlil.h
View file

@ -239,16 +239,8 @@ struct RTLIL::Module {
void add(RTLIL::Cell *cell); void add(RTLIL::Cell *cell);
void fixup_ports(); void fixup_ports();
template<typename T> void rewrite_sigspecs(T functor) { template<typename T>
for (auto &it : cells) void rewrite_sigspecs(T functor);
it.second->rewrite_sigspecs(functor);
for (auto &it : processes)
it.second->rewrite_sigspecs(functor);
for (auto &it : connections) {
functor(it.first);
functor(it.second);
}
}
}; };
struct RTLIL::Wire { struct RTLIL::Wire {
@ -274,10 +266,8 @@ struct RTLIL::Cell {
std::map<RTLIL::IdString, RTLIL::Const> parameters; std::map<RTLIL::IdString, RTLIL::Const> parameters;
void optimize(); void optimize();
template<typename T> void rewrite_sigspecs(T functor) { template<typename T>
for (auto &it : connections) void rewrite_sigspecs(T functor);
functor(it.second);
}
}; };
struct RTLIL::SigChunk { struct RTLIL::SigChunk {
@ -346,16 +336,8 @@ struct RTLIL::CaseRule {
~CaseRule(); ~CaseRule();
void optimize(); void optimize();
template<typename T> void rewrite_sigspecs(T functor) { template<typename T>
for (auto &it : compare) void rewrite_sigspecs(T functor);
functor(it);
for (auto &it : actions) {
functor(it.first);
functor(it.second);
}
for (auto it : switches)
it->rewrite_sigspecs(functor);
}
}; };
struct RTLIL::SwitchRule { struct RTLIL::SwitchRule {
@ -365,11 +347,8 @@ struct RTLIL::SwitchRule {
~SwitchRule(); ~SwitchRule();
void optimize(); void optimize();
template<typename T> void rewrite_sigspecs(T functor) { template<typename T>
functor(signal); void rewrite_sigspecs(T functor);
for (auto it : cases)
it->rewrite_sigspecs(functor);
}
}; };
struct RTLIL::SyncRule { struct RTLIL::SyncRule {
@ -378,13 +357,8 @@ struct RTLIL::SyncRule {
std::vector<RTLIL::SigSig> actions; std::vector<RTLIL::SigSig> actions;
void optimize(); void optimize();
template<typename T> void rewrite_sigspecs(T functor) { template<typename T>
functor(signal); void rewrite_sigspecs(T functor);
for (auto &it : actions) {
functor(it.first);
functor(it.second);
}
}
}; };
struct RTLIL::Process { struct RTLIL::Process {
@ -395,11 +369,65 @@ struct RTLIL::Process {
~Process(); ~Process();
void optimize(); void optimize();
template<typename T> void rewrite_sigspecs(T functor) { template<typename T>
root_case.rewrite_sigspecs(functor); void rewrite_sigspecs(T functor);
for (auto it : syncs)
it->rewrite_sigspecs(functor);
}
}; };
template<typename T>
void RTLIL::Module::rewrite_sigspecs(T functor)
{
for (auto &it : cells)
it.second->rewrite_sigspecs(functor);
for (auto &it : processes)
it.second->rewrite_sigspecs(functor);
for (auto &it : connections) {
functor(it.first);
functor(it.second);
}
}
template<typename T>
void RTLIL::Cell::rewrite_sigspecs(T functor) {
for (auto &it : connections)
functor(it.second);
}
template<typename T>
void RTLIL::CaseRule::rewrite_sigspecs(T functor) {
for (auto &it : compare)
functor(it);
for (auto &it : actions) {
functor(it.first);
functor(it.second);
}
for (auto it : switches)
it->rewrite_sigspecs(functor);
}
template<typename T>
void RTLIL::SwitchRule::rewrite_sigspecs(T functor)
{
functor(signal);
for (auto it : cases)
it->rewrite_sigspecs(functor);
}
template<typename T>
void RTLIL::SyncRule::rewrite_sigspecs(T functor)
{
functor(signal);
for (auto &it : actions) {
functor(it.first);
functor(it.second);
}
}
template<typename T>
void RTLIL::Process::rewrite_sigspecs(T functor)
{
root_case.rewrite_sigspecs(functor);
for (auto it : syncs)
it->rewrite_sigspecs(functor);
}
#endif #endif