diff options
Diffstat (limited to 'src/mem/slicc/symbols')
-rw-r--r-- | src/mem/slicc/symbols/Func.py | 1 | ||||
-rw-r--r-- | src/mem/slicc/symbols/StateMachine.py | 8 | ||||
-rw-r--r-- | src/mem/slicc/symbols/Type.py | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/mem/slicc/symbols/Func.py b/src/mem/slicc/symbols/Func.py index 459cca52a..a5751344a 100644 --- a/src/mem/slicc/symbols/Func.py +++ b/src/mem/slicc/symbols/Func.py @@ -81,6 +81,7 @@ class Func(Symbol): if self.isInternalMachineFunc: code('#include "mem/protocol/${{self.machineStr}}_Controller.hh"') + code('using namespace std;') # Generate function header void_type = self.symtab.find("void", Type) return_type = self.return_type.c_ident diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py index 0c66ddab4..a58c1e9c7 100644 --- a/src/mem/slicc/symbols/StateMachine.py +++ b/src/mem/slicc/symbols/StateMachine.py @@ -32,7 +32,7 @@ from slicc.symbols.Var import Var import slicc.generate.html as html python_class_map = {"int": "Int", - "string": "String", + "std::string": "String", "bool": "Bool", "CacheMemory": "RubyCache", "Sequencer": "RubySequencer", @@ -271,12 +271,12 @@ std::string m_name; int m_transitions_per_cycle; int m_buffer_size; int m_recycle_latency; -map<std::string, std::string> m_cfg; +std::map<std::string, std::string> m_cfg; NodeID m_version; Network* m_net_ptr; MachineID m_machineID; bool m_is_blocking; -map< Address, MessageBuffer* > m_block_map; +std::map<Address, MessageBuffer*> m_block_map; ${ident}_Profiler s_profiler; static int m_num_controllers; @@ -714,6 +714,8 @@ $c_ident::${{action.ident}}(const Address& addr) #include "mem/protocol/Types.hh" #include "mem/ruby/system/System.hh" +using namespace std; + void ${ident}_Controller::wakeup() { diff --git a/src/mem/slicc/symbols/Type.py b/src/mem/slicc/symbols/Type.py index 645291ac2..c4b4d4275 100644 --- a/src/mem/slicc/symbols/Type.py +++ b/src/mem/slicc/symbols/Type.py @@ -385,12 +385,7 @@ set${{dm.ident}}(const ${{dm.type.c_ident}}& local_${{dm.ident}}) code('};') code(''' -// Output operator declaration -std::ostream& -operator<<(std::ostream& out, const ${{self.c_ident}}& obj); - -// Output operator definition -extern inline std::ostream& +inline std::ostream& operator<<(std::ostream& out, const ${{self.c_ident}}& obj) { obj.print(out); |