Commit edc9e2a4 authored by rmrf's avatar rmrf
Browse files

Sus auto does not compile: WaitContainer versus CallExpr

parent 6cc9fbc0
add_library (libsystemc-clang add_library (libsystemc-clang
ModuleDecl.cpp ModuleDecl.cpp
FindModule.cpp FindModule.cpp
SCModules.cpp SCModules.cpp
FindSCMain.cpp FindSCMain.cpp
FindPorts.cpp FindPorts.cpp
FindTLMInterfaces.cpp FindTLMInterfaces.cpp
FindEvents.cpp FindEvents.cpp
FindGlobalEvents.cpp FindGlobalEvents.cpp
FindEntryFunctions.cpp FindEntryFunctions.cpp
FindSensitivity.cpp FindSensitivity.cpp
FindWait.cpp FindWait.cpp
FindNotify.cpp FindNotify.cpp
FindSignals.cpp FindSignals.cpp
FindSimTime.cpp FindSimTime.cpp
FindConstructor.cpp FindConstructor.cpp
SystemCClang.cpp SystemCClang.cpp
FindNetlist.cpp FindNetlist.cpp
FindArgument.cpp FindArgument.cpp
Automata.cpp Automata.cpp
SuspensionAutomata.cpp SuspensionAutomata.cpp
# SCuitable/GlobalSuspensionAutomata.cpp SCuitable/GlobalSuspensionAutomata.cpp
# SCuitable/FindGPUMacro.cpp SCuitable/FindGPUMacro.cpp
#################################### ####################################
#From here the files are for the reflection database #From here the files are for the reflection database
#################################### ####################################
#Utility.cpp #Utility.cpp
EntryFunctionContainer.cpp EntryFunctionContainer.cpp
WaitContainer.cpp WaitContainer.cpp
NotifyContainer.cpp NotifyContainer.cpp
EventDecl.cpp EventDecl.cpp
ProcessDecl.cpp ProcessDecl.cpp
Signal.cpp Signal.cpp
PortDecl.cpp PortDecl.cpp
InterfaceDecl.cpp InterfaceDecl.cpp
Model.cpp Model.cpp
WaitCalls.cpp WaitCalls.cpp
NotifyCalls.cpp NotifyCalls.cpp
EventContainer.cpp EventContainer.cpp
# AST MATCHERS # AST MATCHERS
# matchers/sc_module.cpp # matchers/sc_module.cpp
) )
...@@ -13,7 +13,7 @@ namespace scpar { ...@@ -13,7 +13,7 @@ namespace scpar {
class FindWait:public RecursiveASTVisitor < FindWait > { class FindWait:public RecursiveASTVisitor < FindWait > {
public: public:
typedef vector < CallExpr * >waitListType; typedef vector < CallExpr * > waitListType;
typedef pair < CXXMethodDecl *,vector < string > >processWaitEventPairType; typedef pair < CXXMethodDecl *,vector < string > >processWaitEventPairType;
typedef map < CXXMethodDecl *, vector < string > >processWaitEventMapType; typedef map < CXXMethodDecl *, vector < string > >processWaitEventMapType;
......
...@@ -130,8 +130,7 @@ namespace scpar { ...@@ -130,8 +130,7 @@ namespace scpar {
typedef pair<State*, vector<SusCFG*> > stateCommonCodeBlockPairType; typedef pair<State*, vector<SusCFG*> > stateCommonCodeBlockPairType;
typedef map<State *, vector<SusCFG*> > stateCommonCodeBlockMapType; typedef map<State *, vector<SusCFG*> > stateCommonCodeBlockMapType;
SuspensionAutomata(vector<WaitContainer*>, CXXMethodDecl *, ASTContext *, SuspensionAutomata(vector<WaitContainer*>, CXXMethodDecl *, ASTContext *, llvm::raw_ostream &);
raw_ostream &);
~SuspensionAutomata(); ~SuspensionAutomata();
void addRemainingBlocks(State*, vector<SusCFG*>&); void addRemainingBlocks(State*, vector<SusCFG*>&);
void checkInsert(vector<SusCFG*>, vector<SusCFG*>&); void checkInsert(vector<SusCFG*>, vector<SusCFG*>&);
......
...@@ -111,7 +111,7 @@ bool SystemCConsumer::fire() { ...@@ -111,7 +111,7 @@ bool SystemCConsumer::fire() {
FindNotify findNotify{ ef->_entryMethodDecl, _os }; FindNotify findNotify{ ef->_entryMethodDecl, _os };
ef->addNotifys(findNotify); ef->addNotifys(findNotify);
/* /*
SuspensionAutomata suspensionAutomata(findWaits.getWaitCalls(), ef->getEntryMethod(), &_context, llvm::errs()); SuspensionAutomata suspensionAutomata(findWaits.getWaitCalls(), ef->getEntryMethod(), &_context, llvm::errs());
if (suspensionAutomata.initialize()) { if (suspensionAutomata.initialize()) {
suspensionAutomata.genSusCFG(); suspensionAutomata.genSusCFG();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment