summaryrefslogtreecommitdiff
path: root/src/mem/slicc
diff options
context:
space:
mode:
Diffstat (limited to 'src/mem/slicc')
-rw-r--r--src/mem/slicc/ast/AST.cc2
-rw-r--r--src/mem/slicc/ast/AST.hh10
-rw-r--r--src/mem/slicc/ast/ASTs.hh86
-rw-r--r--src/mem/slicc/ast/ActionDeclAST.cc4
-rw-r--r--src/mem/slicc/ast/ActionDeclAST.hh6
-rw-r--r--src/mem/slicc/ast/AssignStatementAST.cc2
-rw-r--r--src/mem/slicc/ast/AssignStatementAST.hh6
-rw-r--r--src/mem/slicc/ast/CheckAllocateStatementAST.cc8
-rw-r--r--src/mem/slicc/ast/CheckAllocateStatementAST.hh6
-rw-r--r--src/mem/slicc/ast/CheckStopSlotsStatementAST.cc8
-rw-r--r--src/mem/slicc/ast/CheckStopSlotsStatementAST.hh8
-rw-r--r--src/mem/slicc/ast/ChipComponentAccessAST.cc2
-rw-r--r--src/mem/slicc/ast/ChipComponentAccessAST.hh10
-rw-r--r--src/mem/slicc/ast/CopyHeadStatementAST.cc8
-rw-r--r--src/mem/slicc/ast/CopyHeadStatementAST.hh10
-rw-r--r--src/mem/slicc/ast/DeclAST.cc2
-rw-r--r--src/mem/slicc/ast/DeclAST.hh10
-rw-r--r--src/mem/slicc/ast/DeclListAST.cc2
-rw-r--r--src/mem/slicc/ast/DeclListAST.hh6
-rw-r--r--src/mem/slicc/ast/EnqueueStatementAST.cc10
-rw-r--r--src/mem/slicc/ast/EnqueueStatementAST.hh8
-rw-r--r--src/mem/slicc/ast/EnumDeclAST.cc6
-rw-r--r--src/mem/slicc/ast/EnumDeclAST.hh8
-rw-r--r--src/mem/slicc/ast/EnumExprAST.cc2
-rw-r--r--src/mem/slicc/ast/EnumExprAST.hh6
-rw-r--r--src/mem/slicc/ast/ExprAST.cc2
-rw-r--r--src/mem/slicc/ast/ExprAST.hh4
-rw-r--r--src/mem/slicc/ast/ExprStatementAST.cc2
-rw-r--r--src/mem/slicc/ast/ExprStatementAST.hh6
-rw-r--r--src/mem/slicc/ast/FormalParamAST.cc6
-rw-r--r--src/mem/slicc/ast/FormalParamAST.hh4
-rw-r--r--src/mem/slicc/ast/FuncCallExprAST.cc4
-rw-r--r--src/mem/slicc/ast/FuncCallExprAST.hh6
-rw-r--r--src/mem/slicc/ast/FuncDeclAST.cc6
-rw-r--r--src/mem/slicc/ast/FuncDeclAST.hh10
-rw-r--r--src/mem/slicc/ast/IfStatementAST.cc2
-rw-r--r--src/mem/slicc/ast/IfStatementAST.hh8
-rw-r--r--src/mem/slicc/ast/InPortDeclAST.cc6
-rw-r--r--src/mem/slicc/ast/InPortDeclAST.hh8
-rw-r--r--src/mem/slicc/ast/InfixOperatorExprAST.cc2
-rw-r--r--src/mem/slicc/ast/InfixOperatorExprAST.hh4
-rw-r--r--src/mem/slicc/ast/LiteralExprAST.cc2
-rw-r--r--src/mem/slicc/ast/LiteralExprAST.hh4
-rw-r--r--src/mem/slicc/ast/Location.cc2
-rw-r--r--src/mem/slicc/ast/Location.hh2
-rw-r--r--src/mem/slicc/ast/MachineAST.cc4
-rw-r--r--src/mem/slicc/ast/MachineAST.hh8
-rw-r--r--src/mem/slicc/ast/MemberExprAST.cc2
-rw-r--r--src/mem/slicc/ast/MemberExprAST.hh4
-rw-r--r--src/mem/slicc/ast/MethodCallExprAST.cc2
-rw-r--r--src/mem/slicc/ast/MethodCallExprAST.hh8
-rw-r--r--src/mem/slicc/ast/ObjDeclAST.cc6
-rw-r--r--src/mem/slicc/ast/ObjDeclAST.hh8
-rw-r--r--src/mem/slicc/ast/OutPortDeclAST.cc4
-rw-r--r--src/mem/slicc/ast/OutPortDeclAST.hh8
-rw-r--r--src/mem/slicc/ast/PairAST.cc2
-rw-r--r--src/mem/slicc/ast/PairAST.hh4
-rw-r--r--src/mem/slicc/ast/PairListAST.cc2
-rw-r--r--src/mem/slicc/ast/PairListAST.hh6
-rw-r--r--src/mem/slicc/ast/PeekStatementAST.cc10
-rw-r--r--src/mem/slicc/ast/PeekStatementAST.hh4
-rw-r--r--src/mem/slicc/ast/ReturnStatementAST.cc2
-rw-r--r--src/mem/slicc/ast/ReturnStatementAST.hh6
-rw-r--r--src/mem/slicc/ast/StatementAST.cc2
-rw-r--r--src/mem/slicc/ast/StatementAST.hh4
-rw-r--r--src/mem/slicc/ast/StatementListAST.cc2
-rw-r--r--src/mem/slicc/ast/StatementListAST.hh6
-rw-r--r--src/mem/slicc/ast/TransitionDeclAST.cc4
-rw-r--r--src/mem/slicc/ast/TransitionDeclAST.hh6
-rw-r--r--src/mem/slicc/ast/TypeAST.cc2
-rw-r--r--src/mem/slicc/ast/TypeAST.hh4
-rw-r--r--src/mem/slicc/ast/TypeDeclAST.cc6
-rw-r--r--src/mem/slicc/ast/TypeDeclAST.hh8
-rw-r--r--src/mem/slicc/ast/TypeFieldAST.cc2
-rw-r--r--src/mem/slicc/ast/TypeFieldAST.hh10
-rw-r--r--src/mem/slicc/ast/TypeFieldEnumAST.cc6
-rw-r--r--src/mem/slicc/ast/TypeFieldEnumAST.hh10
-rw-r--r--src/mem/slicc/ast/TypeFieldMemberAST.cc2
-rw-r--r--src/mem/slicc/ast/TypeFieldMemberAST.hh14
-rw-r--r--src/mem/slicc/ast/TypeFieldMethodAST.cc2
-rw-r--r--src/mem/slicc/ast/TypeFieldMethodAST.hh6
-rw-r--r--src/mem/slicc/ast/VarExprAST.cc6
-rw-r--r--src/mem/slicc/ast/VarExprAST.hh4
-rw-r--r--src/mem/slicc/generator/fileio.cc2
-rw-r--r--src/mem/slicc/generator/fileio.hh2
-rw-r--r--src/mem/slicc/generator/html_gen.cc6
-rw-r--r--src/mem/slicc/generator/html_gen.hh4
-rw-r--r--src/mem/slicc/generator/mif_gen.cc10
-rw-r--r--src/mem/slicc/generator/mif_gen.hh2
-rw-r--r--src/mem/slicc/main.cc24
-rw-r--r--src/mem/slicc/main.hh6
-rw-r--r--src/mem/slicc/parser/lexer.ll4
-rw-r--r--src/mem/slicc/parser/parser.yy2
-rw-r--r--src/mem/slicc/slicc_global.hh4
-rw-r--r--src/mem/slicc/symbols/Action.hh2
-rw-r--r--src/mem/slicc/symbols/Event.hh2
-rw-r--r--src/mem/slicc/symbols/Func.cc12
-rw-r--r--src/mem/slicc/symbols/Func.hh4
-rw-r--r--src/mem/slicc/symbols/State.hh2
-rw-r--r--src/mem/slicc/symbols/StateMachine.cc86
-rw-r--r--src/mem/slicc/symbols/StateMachine.hh8
-rw-r--r--src/mem/slicc/symbols/Symbol.cc2
-rw-r--r--src/mem/slicc/symbols/Symbol.hh6
-rw-r--r--src/mem/slicc/symbols/SymbolTable.cc32
-rw-r--r--src/mem/slicc/symbols/SymbolTable.hh18
-rw-r--r--src/mem/slicc/symbols/Transition.cc12
-rw-r--r--src/mem/slicc/symbols/Transition.hh6
-rw-r--r--src/mem/slicc/symbols/Type.cc26
-rw-r--r--src/mem/slicc/symbols/Type.hh6
-rw-r--r--src/mem/slicc/symbols/Var.cc4
-rw-r--r--src/mem/slicc/symbols/Var.hh6
111 files changed, 411 insertions, 411 deletions
diff --git a/src/mem/slicc/ast/AST.cc b/src/mem/slicc/ast/AST.cc
index 9342cd2e8..cf59a4360 100644
--- a/src/mem/slicc/ast/AST.cc
+++ b/src/mem/slicc/ast/AST.cc
@@ -36,4 +36,4 @@
*
*/
-#include "AST.hh"
+#include "mem/slicc/ast/AST.hh"
diff --git a/src/mem/slicc/ast/AST.hh b/src/mem/slicc/ast/AST.hh
index b20bbebe2..93c45b3f0 100644
--- a/src/mem/slicc/ast/AST.hh
+++ b/src/mem/slicc/ast/AST.hh
@@ -39,11 +39,11 @@
#ifndef AST_H
#define AST_H
-#include "slicc_global.hh"
-#include "Vector.hh"
-#include "Map.hh"
-#include "Location.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/ast/Location.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
class AST {
public:
diff --git a/src/mem/slicc/ast/ASTs.hh b/src/mem/slicc/ast/ASTs.hh
index 77b055a80..d0ed5698f 100644
--- a/src/mem/slicc/ast/ASTs.hh
+++ b/src/mem/slicc/ast/ASTs.hh
@@ -35,56 +35,56 @@
#ifndef ASTs_H
#define ASTs_H
-#include "slicc_global.hh"
-#include "main.hh"
-#include "StateMachine.hh"
-#include "AST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/main.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/ast/AST.hh"
-#include "MachineAST.hh"
+#include "mem/slicc/ast/MachineAST.hh"
-#include "TypeAST.hh"
-#include "FormalParamAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/FormalParamAST.hh"
-#include "DeclListAST.hh"
-#include "DeclAST.hh"
-#include "ActionDeclAST.hh"
-#include "InPortDeclAST.hh"
-#include "OutPortDeclAST.hh"
-#include "TransitionDeclAST.hh"
-#include "EnumDeclAST.hh"
-#include "TypeDeclAST.hh"
-#include "ObjDeclAST.hh"
-#include "FuncDeclAST.hh"
+#include "mem/slicc/ast/DeclListAST.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/ActionDeclAST.hh"
+#include "mem/slicc/ast/InPortDeclAST.hh"
+#include "mem/slicc/ast/OutPortDeclAST.hh"
+#include "mem/slicc/ast/TransitionDeclAST.hh"
+#include "mem/slicc/ast/EnumDeclAST.hh"
+#include "mem/slicc/ast/TypeDeclAST.hh"
+#include "mem/slicc/ast/ObjDeclAST.hh"
+#include "mem/slicc/ast/FuncDeclAST.hh"
-#include "TypeFieldAST.hh"
-#include "TypeFieldMethodAST.hh"
-#include "TypeFieldMemberAST.hh"
-#include "TypeFieldEnumAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/ast/TypeFieldMethodAST.hh"
+#include "mem/slicc/ast/TypeFieldMemberAST.hh"
+#include "mem/slicc/ast/TypeFieldEnumAST.hh"
-#include "PairAST.hh"
-#include "PairListAST.hh"
+#include "mem/slicc/ast/PairAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
-#include "ExprAST.hh"
-#include "VarExprAST.hh"
-#include "EnumExprAST.hh"
-#include "LiteralExprAST.hh"
-#include "MemberExprAST.hh"
-#include "InfixOperatorExprAST.hh"
-#include "FuncCallExprAST.hh"
-#include "MethodCallExprAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/slicc/ast/EnumExprAST.hh"
+#include "mem/slicc/ast/LiteralExprAST.hh"
+#include "mem/slicc/ast/MemberExprAST.hh"
+#include "mem/slicc/ast/InfixOperatorExprAST.hh"
+#include "mem/slicc/ast/FuncCallExprAST.hh"
+#include "mem/slicc/ast/MethodCallExprAST.hh"
-#include "ChipComponentAccessAST.hh"
+#include "mem/slicc/ast/ChipComponentAccessAST.hh"
-#include "StatementListAST.hh"
-#include "StatementAST.hh"
-#include "ExprStatementAST.hh"
-#include "AssignStatementAST.hh"
-#include "EnqueueStatementAST.hh"
-#include "IfStatementAST.hh"
-#include "PeekStatementAST.hh"
-#include "CopyHeadStatementAST.hh"
-#include "CheckAllocateStatementAST.hh"
-#include "CheckStopSlotsStatementAST.hh"
-#include "ReturnStatementAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprStatementAST.hh"
+#include "mem/slicc/ast/AssignStatementAST.hh"
+#include "mem/slicc/ast/EnqueueStatementAST.hh"
+#include "mem/slicc/ast/IfStatementAST.hh"
+#include "mem/slicc/ast/PeekStatementAST.hh"
+#include "mem/slicc/ast/CopyHeadStatementAST.hh"
+#include "mem/slicc/ast/CheckAllocateStatementAST.hh"
+#include "mem/slicc/ast/CheckStopSlotsStatementAST.hh"
+#include "mem/slicc/ast/ReturnStatementAST.hh"
#endif //ASTs_H
diff --git a/src/mem/slicc/ast/ActionDeclAST.cc b/src/mem/slicc/ast/ActionDeclAST.cc
index 6514b9afd..372920a1b 100644
--- a/src/mem/slicc/ast/ActionDeclAST.cc
+++ b/src/mem/slicc/ast/ActionDeclAST.cc
@@ -36,8 +36,8 @@
*
*/
-#include "ActionDeclAST.hh"
-#include "Action.hh"
+#include "mem/slicc/ast/ActionDeclAST.hh"
+#include "mem/slicc/symbols/Action.hh"
ActionDeclAST::ActionDeclAST(string* ident_ptr,
PairListAST* pairs_ptr,
diff --git a/src/mem/slicc/ast/ActionDeclAST.hh b/src/mem/slicc/ast/ActionDeclAST.hh
index cc020a95f..bf6d4d403 100644
--- a/src/mem/slicc/ast/ActionDeclAST.hh
+++ b/src/mem/slicc/ast/ActionDeclAST.hh
@@ -39,9 +39,9 @@
#ifndef ActionDeclAST_H
#define ActionDeclAST_H
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "StatementListAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
class ActionDeclAST : public DeclAST {
public:
diff --git a/src/mem/slicc/ast/AssignStatementAST.cc b/src/mem/slicc/ast/AssignStatementAST.cc
index 2d72e583e..290ef101d 100644
--- a/src/mem/slicc/ast/AssignStatementAST.cc
+++ b/src/mem/slicc/ast/AssignStatementAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "AssignStatementAST.hh"
+#include "mem/slicc/ast/AssignStatementAST.hh"
AssignStatementAST::AssignStatementAST(ExprAST* lvalue_ptr, ExprAST* rvalue_ptr)
: StatementAST()
diff --git a/src/mem/slicc/ast/AssignStatementAST.hh b/src/mem/slicc/ast/AssignStatementAST.hh
index c249c8a75..0b442b5c6 100644
--- a/src/mem/slicc/ast/AssignStatementAST.hh
+++ b/src/mem/slicc/ast/AssignStatementAST.hh
@@ -39,9 +39,9 @@
#ifndef ASSIGNSTATEMENTAST_H
#define ASSIGNSTATEMENTAST_H
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
diff --git a/src/mem/slicc/ast/CheckAllocateStatementAST.cc b/src/mem/slicc/ast/CheckAllocateStatementAST.cc
index 25fd4d2e7..1f498efe2 100644
--- a/src/mem/slicc/ast/CheckAllocateStatementAST.cc
+++ b/src/mem/slicc/ast/CheckAllocateStatementAST.cc
@@ -32,10 +32,10 @@
*
*/
-#include "CheckAllocateStatementAST.hh"
-#include "SymbolTable.hh"
-#include "VarExprAST.hh"
-#include "util.hh"
+#include "mem/slicc/ast/CheckAllocateStatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/gems_common/util.hh"
CheckAllocateStatementAST::CheckAllocateStatementAST(VarExprAST* variable)
: StatementAST()
diff --git a/src/mem/slicc/ast/CheckAllocateStatementAST.hh b/src/mem/slicc/ast/CheckAllocateStatementAST.hh
index 8df08a086..1df853514 100644
--- a/src/mem/slicc/ast/CheckAllocateStatementAST.hh
+++ b/src/mem/slicc/ast/CheckAllocateStatementAST.hh
@@ -35,9 +35,9 @@
#ifndef CHECKALLOCATESTATEMENTAST_H
#define CHECKALLOCATESTATEMENTAST_H
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class VarExprAST;
class Var;
diff --git a/src/mem/slicc/ast/CheckStopSlotsStatementAST.cc b/src/mem/slicc/ast/CheckStopSlotsStatementAST.cc
index f102e8894..38dc449d6 100644
--- a/src/mem/slicc/ast/CheckStopSlotsStatementAST.cc
+++ b/src/mem/slicc/ast/CheckStopSlotsStatementAST.cc
@@ -32,10 +32,10 @@
*
*/
-#include "CheckStopSlotsStatementAST.hh"
-#include "SymbolTable.hh"
-#include "VarExprAST.hh"
-#include "PairListAST.hh"
+#include "mem/slicc/ast/CheckStopSlotsStatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
CheckStopSlotsStatementAST::CheckStopSlotsStatementAST(VarExprAST* variable, string* condStr, string* bankStr)
: StatementAST()
diff --git a/src/mem/slicc/ast/CheckStopSlotsStatementAST.hh b/src/mem/slicc/ast/CheckStopSlotsStatementAST.hh
index 131b8cf4d..6de068caa 100644
--- a/src/mem/slicc/ast/CheckStopSlotsStatementAST.hh
+++ b/src/mem/slicc/ast/CheckStopSlotsStatementAST.hh
@@ -35,10 +35,10 @@
#ifndef CHECKSTOPSLOTSSTATEMENTAST_H
#define CHECKSTOPSLOTSSTATEMENTAST_H
-#include "slicc_global.hh"
-#include "ExprAST.hh"
-#include "StatementAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class VarExprAST;
class Var;
diff --git a/src/mem/slicc/ast/ChipComponentAccessAST.cc b/src/mem/slicc/ast/ChipComponentAccessAST.cc
index 1ba1b98f2..952bd6ad9 100644
--- a/src/mem/slicc/ast/ChipComponentAccessAST.cc
+++ b/src/mem/slicc/ast/ChipComponentAccessAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "ChipComponentAccessAST.hh"
+#include "mem/slicc/ast/ChipComponentAccessAST.hh"
ChipComponentAccessAST::ChipComponentAccessAST(VarExprAST* machine, ExprAST* mach_version, VarExprAST* component, string* proc_name, Vector<ExprAST*>* expr_vec_ptr)
diff --git a/src/mem/slicc/ast/ChipComponentAccessAST.hh b/src/mem/slicc/ast/ChipComponentAccessAST.hh
index 039fece2b..4702066a5 100644
--- a/src/mem/slicc/ast/ChipComponentAccessAST.hh
+++ b/src/mem/slicc/ast/ChipComponentAccessAST.hh
@@ -39,11 +39,11 @@
#ifndef ChipComponentAccessAST_H
#define ChipComponentAccessAST_H
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
-#include "VarExprAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class ChipComponentAccessAST : public ExprAST {
public:
diff --git a/src/mem/slicc/ast/CopyHeadStatementAST.cc b/src/mem/slicc/ast/CopyHeadStatementAST.cc
index 40e61dc07..8d455eb9d 100644
--- a/src/mem/slicc/ast/CopyHeadStatementAST.cc
+++ b/src/mem/slicc/ast/CopyHeadStatementAST.cc
@@ -32,10 +32,10 @@
*
*/
-#include "CopyHeadStatementAST.hh"
-#include "SymbolTable.hh"
-#include "VarExprAST.hh"
-#include "util.hh"
+#include "mem/slicc/ast/CopyHeadStatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/gems_common/util.hh"
CopyHeadStatementAST::CopyHeadStatementAST(VarExprAST* in_queue_ptr,
VarExprAST* out_queue_ptr,
diff --git a/src/mem/slicc/ast/CopyHeadStatementAST.hh b/src/mem/slicc/ast/CopyHeadStatementAST.hh
index 1631395fc..53d479136 100644
--- a/src/mem/slicc/ast/CopyHeadStatementAST.hh
+++ b/src/mem/slicc/ast/CopyHeadStatementAST.hh
@@ -35,11 +35,11 @@
#ifndef COPYHEADSTATEMENTAST_H
#define COPYHEADTATEMENTAST_H
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "StatementListAST.hh"
-#include "TypeAST.hh"
-#include "PairListAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
class VarExprAST;
class Var;
diff --git a/src/mem/slicc/ast/DeclAST.cc b/src/mem/slicc/ast/DeclAST.cc
index 4269ed9f4..ebbdaeeaa 100644
--- a/src/mem/slicc/ast/DeclAST.cc
+++ b/src/mem/slicc/ast/DeclAST.cc
@@ -36,4 +36,4 @@
*
*/
-#include "DeclAST.hh"
+#include "mem/slicc/ast/DeclAST.hh"
diff --git a/src/mem/slicc/ast/DeclAST.hh b/src/mem/slicc/ast/DeclAST.hh
index e7c8467d6..bcada7180 100644
--- a/src/mem/slicc/ast/DeclAST.hh
+++ b/src/mem/slicc/ast/DeclAST.hh
@@ -39,11 +39,11 @@
#ifndef DECLAST_H
#define DECLAST_H
-#include "slicc_global.hh"
-#include "AST.hh"
-#include "PairListAST.hh"
-#include "StateMachine.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class DeclAST : public AST {
public:
diff --git a/src/mem/slicc/ast/DeclListAST.cc b/src/mem/slicc/ast/DeclListAST.cc
index 6dacd5435..f2e35acd0 100644
--- a/src/mem/slicc/ast/DeclListAST.cc
+++ b/src/mem/slicc/ast/DeclListAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "DeclListAST.hh"
+#include "mem/slicc/ast/DeclListAST.hh"
DeclListAST::DeclListAST(Vector<DeclAST*>* vec_ptr)
: AST()
diff --git a/src/mem/slicc/ast/DeclListAST.hh b/src/mem/slicc/ast/DeclListAST.hh
index 80c7fffcc..f776a0812 100644
--- a/src/mem/slicc/ast/DeclListAST.hh
+++ b/src/mem/slicc/ast/DeclListAST.hh
@@ -39,9 +39,9 @@
#ifndef DeclListAST_H
#define DeclListAST_H
-#include "slicc_global.hh"
-#include "AST.hh"
-#include "DeclAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
+#include "mem/slicc/ast/DeclAST.hh"
class DeclListAST : public AST {
public:
diff --git a/src/mem/slicc/ast/EnqueueStatementAST.cc b/src/mem/slicc/ast/EnqueueStatementAST.cc
index 49f2a9233..e323e67ac 100644
--- a/src/mem/slicc/ast/EnqueueStatementAST.cc
+++ b/src/mem/slicc/ast/EnqueueStatementAST.cc
@@ -32,11 +32,11 @@
*
*/
-#include "EnqueueStatementAST.hh"
-#include "SymbolTable.hh"
-#include "VarExprAST.hh"
-#include "PairListAST.hh"
-#include "util.hh"
+#include "mem/slicc/ast/EnqueueStatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
+#include "mem/gems_common/util.hh"
EnqueueStatementAST::EnqueueStatementAST(VarExprAST* queue_name_ptr,
TypeAST* type_name_ptr,
diff --git a/src/mem/slicc/ast/EnqueueStatementAST.hh b/src/mem/slicc/ast/EnqueueStatementAST.hh
index eb7dad9af..939b9734c 100644
--- a/src/mem/slicc/ast/EnqueueStatementAST.hh
+++ b/src/mem/slicc/ast/EnqueueStatementAST.hh
@@ -39,10 +39,10 @@
#ifndef ENQUEUESTATEMENTAST_H
#define ENQUEUESTATEMENTAST_H
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "StatementListAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class VarExprAST;
class Var;
diff --git a/src/mem/slicc/ast/EnumDeclAST.cc b/src/mem/slicc/ast/EnumDeclAST.cc
index c8e033095..0edfa57f7 100644
--- a/src/mem/slicc/ast/EnumDeclAST.cc
+++ b/src/mem/slicc/ast/EnumDeclAST.cc
@@ -36,9 +36,9 @@
*
*/
-#include "EnumDeclAST.hh"
-#include "main.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/EnumDeclAST.hh"
+#include "mem/slicc/main.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
EnumDeclAST::EnumDeclAST(TypeAST* type_ast_ptr,
PairListAST* pairs_ptr,
diff --git a/src/mem/slicc/ast/EnumDeclAST.hh b/src/mem/slicc/ast/EnumDeclAST.hh
index 4474b69cc..24384dedb 100644
--- a/src/mem/slicc/ast/EnumDeclAST.hh
+++ b/src/mem/slicc/ast/EnumDeclAST.hh
@@ -39,10 +39,10 @@
#ifndef EnumDeclAST_H
#define EnumDeclAST_H
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "TypeAST.hh"
-#include "TypeFieldAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
class EnumDeclAST : public DeclAST {
public:
diff --git a/src/mem/slicc/ast/EnumExprAST.cc b/src/mem/slicc/ast/EnumExprAST.cc
index 90dc4bebf..f04c3efff 100644
--- a/src/mem/slicc/ast/EnumExprAST.cc
+++ b/src/mem/slicc/ast/EnumExprAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "EnumExprAST.hh"
+#include "mem/slicc/ast/EnumExprAST.hh"
EnumExprAST::EnumExprAST(TypeAST* type_ast_ptr,
string* value_ptr)
diff --git a/src/mem/slicc/ast/EnumExprAST.hh b/src/mem/slicc/ast/EnumExprAST.hh
index 492f9ac33..08feea450 100644
--- a/src/mem/slicc/ast/EnumExprAST.hh
+++ b/src/mem/slicc/ast/EnumExprAST.hh
@@ -39,9 +39,9 @@
#ifndef EnumExprAST_H
#define EnumExprAST_H
-#include "slicc_global.hh"
-#include "ExprAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class EnumExprAST : public ExprAST {
diff --git a/src/mem/slicc/ast/ExprAST.cc b/src/mem/slicc/ast/ExprAST.cc
index e910d688a..c933d0ed6 100644
--- a/src/mem/slicc/ast/ExprAST.cc
+++ b/src/mem/slicc/ast/ExprAST.cc
@@ -36,4 +36,4 @@
*
*/
-#include "ExprAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
diff --git a/src/mem/slicc/ast/ExprAST.hh b/src/mem/slicc/ast/ExprAST.hh
index 0015cebaa..a2ec9cb81 100644
--- a/src/mem/slicc/ast/ExprAST.hh
+++ b/src/mem/slicc/ast/ExprAST.hh
@@ -39,8 +39,8 @@
#ifndef EXPRAST_H
#define EXPRAST_H
-#include "slicc_global.hh"
-#include "AST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
class ExprAST : public AST {
diff --git a/src/mem/slicc/ast/ExprStatementAST.cc b/src/mem/slicc/ast/ExprStatementAST.cc
index 5eb1ce7b4..fa9465d81 100644
--- a/src/mem/slicc/ast/ExprStatementAST.cc
+++ b/src/mem/slicc/ast/ExprStatementAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "ExprStatementAST.hh"
+#include "mem/slicc/ast/ExprStatementAST.hh"
ExprStatementAST::ExprStatementAST(ExprAST* expr_ptr)
: StatementAST()
diff --git a/src/mem/slicc/ast/ExprStatementAST.hh b/src/mem/slicc/ast/ExprStatementAST.hh
index 925ded72a..046de6599 100644
--- a/src/mem/slicc/ast/ExprStatementAST.hh
+++ b/src/mem/slicc/ast/ExprStatementAST.hh
@@ -39,9 +39,9 @@
#ifndef ExprStatementAST_H
#define ExprStatementAST_H
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
class ExprStatementAST : public StatementAST {
public:
diff --git a/src/mem/slicc/ast/FormalParamAST.cc b/src/mem/slicc/ast/FormalParamAST.cc
index b7dacf8a1..171c4c933 100644
--- a/src/mem/slicc/ast/FormalParamAST.cc
+++ b/src/mem/slicc/ast/FormalParamAST.cc
@@ -36,9 +36,9 @@
*
*/
-#include "FormalParamAST.hh"
-#include "StatementAST.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/FormalParamAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
FormalParamAST::~FormalParamAST()
{
diff --git a/src/mem/slicc/ast/FormalParamAST.hh b/src/mem/slicc/ast/FormalParamAST.hh
index 0dc08fabe..be213fb01 100644
--- a/src/mem/slicc/ast/FormalParamAST.hh
+++ b/src/mem/slicc/ast/FormalParamAST.hh
@@ -39,8 +39,8 @@
#ifndef FORMALPARAMAST_H
#define FORMALPARAMAST_H
-#include "slicc_global.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class FormalParamAST : public AST {
diff --git a/src/mem/slicc/ast/FuncCallExprAST.cc b/src/mem/slicc/ast/FuncCallExprAST.cc
index 845d0c8e3..becead545 100644
--- a/src/mem/slicc/ast/FuncCallExprAST.cc
+++ b/src/mem/slicc/ast/FuncCallExprAST.cc
@@ -36,8 +36,8 @@
*
*/
-#include "FuncCallExprAST.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/FuncCallExprAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
FuncCallExprAST::FuncCallExprAST(string* proc_name_ptr,
Vector<ExprAST*>* expr_vec_ptr)
diff --git a/src/mem/slicc/ast/FuncCallExprAST.hh b/src/mem/slicc/ast/FuncCallExprAST.hh
index edac97a04..fecca3486 100644
--- a/src/mem/slicc/ast/FuncCallExprAST.hh
+++ b/src/mem/slicc/ast/FuncCallExprAST.hh
@@ -39,9 +39,9 @@
#ifndef FUNCCALLEXPRAST_H
#define FUNCCALLEXPRAST_H
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
// ProcGen decl
diff --git a/src/mem/slicc/ast/FuncDeclAST.cc b/src/mem/slicc/ast/FuncDeclAST.cc
index 9f9dd1f8e..69c09121a 100644
--- a/src/mem/slicc/ast/FuncDeclAST.cc
+++ b/src/mem/slicc/ast/FuncDeclAST.cc
@@ -36,9 +36,9 @@
*
*/
-#include "FuncDeclAST.hh"
-#include "SymbolTable.hh"
-#include "main.hh"
+#include "mem/slicc/ast/FuncDeclAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/main.hh"
FuncDeclAST::FuncDeclAST(TypeAST* return_type_ast_ptr,
string* ident_ptr,
diff --git a/src/mem/slicc/ast/FuncDeclAST.hh b/src/mem/slicc/ast/FuncDeclAST.hh
index 4096a8b66..a06eb7eb1 100644
--- a/src/mem/slicc/ast/FuncDeclAST.hh
+++ b/src/mem/slicc/ast/FuncDeclAST.hh
@@ -39,11 +39,11 @@
#ifndef FuncDeclAST_H
#define FuncDeclAST_H
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "TypeFieldAST.hh"
-#include "TypeAST.hh"
-#include "FormalParamAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/FormalParamAST.hh"
class FuncDeclAST : public DeclAST {
public:
diff --git a/src/mem/slicc/ast/IfStatementAST.cc b/src/mem/slicc/ast/IfStatementAST.cc
index 372b213d8..e3c076ff1 100644
--- a/src/mem/slicc/ast/IfStatementAST.cc
+++ b/src/mem/slicc/ast/IfStatementAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "IfStatementAST.hh"
+#include "mem/slicc/ast/IfStatementAST.hh"
IfStatementAST::IfStatementAST(ExprAST* cond_ptr,
StatementListAST* then_ptr,
diff --git a/src/mem/slicc/ast/IfStatementAST.hh b/src/mem/slicc/ast/IfStatementAST.hh
index bad7a286d..6ac4a573b 100644
--- a/src/mem/slicc/ast/IfStatementAST.hh
+++ b/src/mem/slicc/ast/IfStatementAST.hh
@@ -39,10 +39,10 @@
#ifndef IFSTATEMENTAST_H
#define IFSTATEMENTAST_H
-#include "slicc_global.hh"
-#include "ExprAST.hh"
-#include "StatementAST.hh"
-#include "StatementListAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
class IfStatementAST : public StatementAST {
diff --git a/src/mem/slicc/ast/InPortDeclAST.cc b/src/mem/slicc/ast/InPortDeclAST.cc
index 6b13fec51..7711f2b6c 100644
--- a/src/mem/slicc/ast/InPortDeclAST.cc
+++ b/src/mem/slicc/ast/InPortDeclAST.cc
@@ -36,9 +36,9 @@
*
*/
-#include "InPortDeclAST.hh"
-#include "SymbolTable.hh"
-#include "Var.hh"
+#include "mem/slicc/ast/InPortDeclAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/symbols/Var.hh"
InPortDeclAST::InPortDeclAST(string* ident_ptr,
TypeAST* msg_type_ptr,
diff --git a/src/mem/slicc/ast/InPortDeclAST.hh b/src/mem/slicc/ast/InPortDeclAST.hh
index 4f3c25f93..24d8b1cfb 100644
--- a/src/mem/slicc/ast/InPortDeclAST.hh
+++ b/src/mem/slicc/ast/InPortDeclAST.hh
@@ -39,10 +39,10 @@
#ifndef InPortDeclAST_H
#define InPortDeclAST_H
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "StatementListAST.hh"
-#include "VarExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
class InPortDeclAST : public DeclAST {
public:
diff --git a/src/mem/slicc/ast/InfixOperatorExprAST.cc b/src/mem/slicc/ast/InfixOperatorExprAST.cc
index ba3aa1245..916974bc7 100644
--- a/src/mem/slicc/ast/InfixOperatorExprAST.cc
+++ b/src/mem/slicc/ast/InfixOperatorExprAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "InfixOperatorExprAST.hh"
+#include "mem/slicc/ast/InfixOperatorExprAST.hh"
InfixOperatorExprAST::InfixOperatorExprAST(ExprAST* left_ptr,
string* op_ptr,
diff --git a/src/mem/slicc/ast/InfixOperatorExprAST.hh b/src/mem/slicc/ast/InfixOperatorExprAST.hh
index 451156f6d..a573acbb7 100644
--- a/src/mem/slicc/ast/InfixOperatorExprAST.hh
+++ b/src/mem/slicc/ast/InfixOperatorExprAST.hh
@@ -39,8 +39,8 @@
#ifndef INFIXOPERATOREXPRAST_H
#define INFIXOPERATOREXPRAST_H
-#include "slicc_global.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
class InfixOperatorExprAST : public ExprAST {
diff --git a/src/mem/slicc/ast/LiteralExprAST.cc b/src/mem/slicc/ast/LiteralExprAST.cc
index b3b415bc9..04083db26 100644
--- a/src/mem/slicc/ast/LiteralExprAST.cc
+++ b/src/mem/slicc/ast/LiteralExprAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "LiteralExprAST.hh"
+#include "mem/slicc/ast/LiteralExprAST.hh"
Type* LiteralExprAST::generate(string& code) const
{
diff --git a/src/mem/slicc/ast/LiteralExprAST.hh b/src/mem/slicc/ast/LiteralExprAST.hh
index be433a1e3..b0152489b 100644
--- a/src/mem/slicc/ast/LiteralExprAST.hh
+++ b/src/mem/slicc/ast/LiteralExprAST.hh
@@ -39,8 +39,8 @@
#ifndef LITERALEXPRAST_H
#define LITERALEXPRAST_H
-#include "slicc_global.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
class LiteralExprAST : public ExprAST {
diff --git a/src/mem/slicc/ast/Location.cc b/src/mem/slicc/ast/Location.cc
index 91b8dbd28..6209ccdb7 100644
--- a/src/mem/slicc/ast/Location.cc
+++ b/src/mem/slicc/ast/Location.cc
@@ -36,7 +36,7 @@
*
*/
-#include "Location.hh"
+#include "mem/slicc/ast/Location.hh"
int g_line_number = 0;
string g_file_name("");
diff --git a/src/mem/slicc/ast/Location.hh b/src/mem/slicc/ast/Location.hh
index 6cf2df5a4..f070efc46 100644
--- a/src/mem/slicc/ast/Location.hh
+++ b/src/mem/slicc/ast/Location.hh
@@ -39,7 +39,7 @@
#ifndef LOCATION_H
#define LOCATION_H
-#include "slicc_global.hh"
+#include "mem/slicc/slicc_global.hh"
extern int g_line_number;
extern string g_file_name;
diff --git a/src/mem/slicc/ast/MachineAST.cc b/src/mem/slicc/ast/MachineAST.cc
index 3ee97bc38..68acb0070 100644
--- a/src/mem/slicc/ast/MachineAST.cc
+++ b/src/mem/slicc/ast/MachineAST.cc
@@ -36,8 +36,8 @@
*
*/
-#include "MachineAST.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/MachineAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
MachineAST::MachineAST(string* ident_ptr,
PairListAST* pairs_ptr,
diff --git a/src/mem/slicc/ast/MachineAST.hh b/src/mem/slicc/ast/MachineAST.hh
index c05bcc5f2..cf8361d82 100644
--- a/src/mem/slicc/ast/MachineAST.hh
+++ b/src/mem/slicc/ast/MachineAST.hh
@@ -39,10 +39,10 @@
#ifndef MachineAST_H
#define MachineAST_H
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "DeclListAST.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/DeclListAST.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
class MachineAST : public DeclAST {
public:
diff --git a/src/mem/slicc/ast/MemberExprAST.cc b/src/mem/slicc/ast/MemberExprAST.cc
index c4e9ce24b..9547251b6 100644
--- a/src/mem/slicc/ast/MemberExprAST.cc
+++ b/src/mem/slicc/ast/MemberExprAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "MemberExprAST.hh"
+#include "mem/slicc/ast/MemberExprAST.hh"
MemberExprAST::MemberExprAST(ExprAST* expr_ast_ptr, string* field_ptr)
: ExprAST()
diff --git a/src/mem/slicc/ast/MemberExprAST.hh b/src/mem/slicc/ast/MemberExprAST.hh
index c5fd3d0dd..2be5c69d6 100644
--- a/src/mem/slicc/ast/MemberExprAST.hh
+++ b/src/mem/slicc/ast/MemberExprAST.hh
@@ -39,8 +39,8 @@
#ifndef MemberExprAST_H
#define MemberExprAST_H
-#include "slicc_global.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
class MemberExprAST : public ExprAST {
diff --git a/src/mem/slicc/ast/MethodCallExprAST.cc b/src/mem/slicc/ast/MethodCallExprAST.cc
index fe6505a1a..da4be31e8 100644
--- a/src/mem/slicc/ast/MethodCallExprAST.cc
+++ b/src/mem/slicc/ast/MethodCallExprAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "MethodCallExprAST.hh"
+#include "mem/slicc/ast/MethodCallExprAST.hh"
MethodCallExprAST::MethodCallExprAST(ExprAST* obj_expr_ptr,
string* proc_name_ptr,
diff --git a/src/mem/slicc/ast/MethodCallExprAST.hh b/src/mem/slicc/ast/MethodCallExprAST.hh
index 22766e922..537d5993a 100644
--- a/src/mem/slicc/ast/MethodCallExprAST.hh
+++ b/src/mem/slicc/ast/MethodCallExprAST.hh
@@ -39,10 +39,10 @@
#ifndef MethodCallExprAST_H
#define MethodCallExprAST_H
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class MethodCallExprAST : public ExprAST {
public:
diff --git a/src/mem/slicc/ast/ObjDeclAST.cc b/src/mem/slicc/ast/ObjDeclAST.cc
index 106c18cac..6e338cc3d 100644
--- a/src/mem/slicc/ast/ObjDeclAST.cc
+++ b/src/mem/slicc/ast/ObjDeclAST.cc
@@ -36,9 +36,9 @@
*
*/
-#include "ObjDeclAST.hh"
-#include "SymbolTable.hh"
-#include "main.hh"
+#include "mem/slicc/ast/ObjDeclAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/main.hh"
ObjDeclAST::ObjDeclAST(TypeAST* type_ptr,
string* ident_ptr,
diff --git a/src/mem/slicc/ast/ObjDeclAST.hh b/src/mem/slicc/ast/ObjDeclAST.hh
index 2d4ac9714..0415f5322 100644
--- a/src/mem/slicc/ast/ObjDeclAST.hh
+++ b/src/mem/slicc/ast/ObjDeclAST.hh
@@ -39,10 +39,10 @@
#ifndef ObjDeclAST_H
#define ObjDeclAST_H
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "TypeFieldAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class ObjDeclAST : public DeclAST {
public:
diff --git a/src/mem/slicc/ast/OutPortDeclAST.cc b/src/mem/slicc/ast/OutPortDeclAST.cc
index 1aa0363aa..b53484715 100644
--- a/src/mem/slicc/ast/OutPortDeclAST.cc
+++ b/src/mem/slicc/ast/OutPortDeclAST.cc
@@ -36,8 +36,8 @@
*
*/
-#include "OutPortDeclAST.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/OutPortDeclAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
OutPortDeclAST::OutPortDeclAST(string* ident_ptr,
TypeAST* msg_type_ptr,
diff --git a/src/mem/slicc/ast/OutPortDeclAST.hh b/src/mem/slicc/ast/OutPortDeclAST.hh
index 3fcd755ef..28fc5903e 100644
--- a/src/mem/slicc/ast/OutPortDeclAST.hh
+++ b/src/mem/slicc/ast/OutPortDeclAST.hh
@@ -39,10 +39,10 @@
#ifndef OutPortDeclAST_H
#define OutPortDeclAST_H
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "StatementListAST.hh"
-#include "VarExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
class OutPortDeclAST : public DeclAST {
public:
diff --git a/src/mem/slicc/ast/PairAST.cc b/src/mem/slicc/ast/PairAST.cc
index da71bdd01..312aa6946 100644
--- a/src/mem/slicc/ast/PairAST.cc
+++ b/src/mem/slicc/ast/PairAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "PairAST.hh"
+#include "mem/slicc/ast/PairAST.hh"
PairAST::PairAST(string* key_ptr, string* value_ptr)
: AST()
diff --git a/src/mem/slicc/ast/PairAST.hh b/src/mem/slicc/ast/PairAST.hh
index 4cc297dc1..7f2969b0c 100644
--- a/src/mem/slicc/ast/PairAST.hh
+++ b/src/mem/slicc/ast/PairAST.hh
@@ -39,8 +39,8 @@
#ifndef PAIRAST_H
#define PAIRAST_H
-#include "slicc_global.hh"
-#include "AST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
class PairAST : public AST {
public:
diff --git a/src/mem/slicc/ast/PairListAST.cc b/src/mem/slicc/ast/PairListAST.cc
index 9af8b3898..925b8065f 100644
--- a/src/mem/slicc/ast/PairListAST.cc
+++ b/src/mem/slicc/ast/PairListAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "PairListAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
void PairListAST::addPair(PairAST* pair_ptr)
{
diff --git a/src/mem/slicc/ast/PairListAST.hh b/src/mem/slicc/ast/PairListAST.hh
index 9d2700277..bc695eaa4 100644
--- a/src/mem/slicc/ast/PairListAST.hh
+++ b/src/mem/slicc/ast/PairListAST.hh
@@ -39,9 +39,9 @@
#ifndef PairListAST_H
#define PairListAST_H
-#include "slicc_global.hh"
-#include "AST.hh"
-#include "PairAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
+#include "mem/slicc/ast/PairAST.hh"
class PairListAST : public AST {
diff --git a/src/mem/slicc/ast/PeekStatementAST.cc b/src/mem/slicc/ast/PeekStatementAST.cc
index 627e85ae8..96e97f18b 100644
--- a/src/mem/slicc/ast/PeekStatementAST.cc
+++ b/src/mem/slicc/ast/PeekStatementAST.cc
@@ -36,11 +36,11 @@
*
*/
-#include "PeekStatementAST.hh"
-#include "SymbolTable.hh"
-#include "StatementListAST.hh"
-#include "TypeAST.hh"
-#include "VarExprAST.hh"
+#include "mem/slicc/ast/PeekStatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
PeekStatementAST::PeekStatementAST(VarExprAST* queue_name_ptr,
TypeAST* type_ptr,
diff --git a/src/mem/slicc/ast/PeekStatementAST.hh b/src/mem/slicc/ast/PeekStatementAST.hh
index e51a0a6a4..da663a4ae 100644
--- a/src/mem/slicc/ast/PeekStatementAST.hh
+++ b/src/mem/slicc/ast/PeekStatementAST.hh
@@ -39,8 +39,8 @@
#ifndef PEEKSTATEMENTAST_H
#define PEEKSTATEMENTAST_H
-#include "slicc_global.hh"
-#include "StatementAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
class StatementListAST;
class TypeAST;
diff --git a/src/mem/slicc/ast/ReturnStatementAST.cc b/src/mem/slicc/ast/ReturnStatementAST.cc
index 68e81b834..acc6fcd88 100644
--- a/src/mem/slicc/ast/ReturnStatementAST.cc
+++ b/src/mem/slicc/ast/ReturnStatementAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "ReturnStatementAST.hh"
+#include "mem/slicc/ast/ReturnStatementAST.hh"
ReturnStatementAST::ReturnStatementAST(ExprAST* expr_ptr)
: StatementAST()
diff --git a/src/mem/slicc/ast/ReturnStatementAST.hh b/src/mem/slicc/ast/ReturnStatementAST.hh
index f8c4812cf..86717bf31 100644
--- a/src/mem/slicc/ast/ReturnStatementAST.hh
+++ b/src/mem/slicc/ast/ReturnStatementAST.hh
@@ -39,9 +39,9 @@
#ifndef ReturnStatementAST_H
#define ReturnStatementAST_H
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
class ReturnStatementAST : public StatementAST {
public:
diff --git a/src/mem/slicc/ast/StatementAST.cc b/src/mem/slicc/ast/StatementAST.cc
index 1f3c02474..f15c5f011 100644
--- a/src/mem/slicc/ast/StatementAST.cc
+++ b/src/mem/slicc/ast/StatementAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "StatementAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
static int indentation_depth = 1;
diff --git a/src/mem/slicc/ast/StatementAST.hh b/src/mem/slicc/ast/StatementAST.hh
index 16a1ecafe..d4ff54193 100644
--- a/src/mem/slicc/ast/StatementAST.hh
+++ b/src/mem/slicc/ast/StatementAST.hh
@@ -39,8 +39,8 @@
#ifndef STATEMENTAST_H
#define STATEMENTAST_H
-#include "slicc_global.hh"
-#include "AST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
void inc_indent();
void dec_indent();
diff --git a/src/mem/slicc/ast/StatementListAST.cc b/src/mem/slicc/ast/StatementListAST.cc
index f70d5b1fa..dfdcc2d26 100644
--- a/src/mem/slicc/ast/StatementListAST.cc
+++ b/src/mem/slicc/ast/StatementListAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "StatementListAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
StatementListAST::StatementListAST(Vector<StatementAST*>* vec_ptr)
: AST()
diff --git a/src/mem/slicc/ast/StatementListAST.hh b/src/mem/slicc/ast/StatementListAST.hh
index 3b3968211..c77cb8c65 100644
--- a/src/mem/slicc/ast/StatementListAST.hh
+++ b/src/mem/slicc/ast/StatementListAST.hh
@@ -39,9 +39,9 @@
#ifndef STATEMENTLISTAST_H
#define STATEMENTLISTAST_H
-#include "slicc_global.hh"
-#include "AST.hh"
-#include "StatementAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
class Var;
class StatementListAST : public AST {
diff --git a/src/mem/slicc/ast/TransitionDeclAST.cc b/src/mem/slicc/ast/TransitionDeclAST.cc
index 83361e233..a1826041a 100644
--- a/src/mem/slicc/ast/TransitionDeclAST.cc
+++ b/src/mem/slicc/ast/TransitionDeclAST.cc
@@ -36,8 +36,8 @@
*
*/
-#include "TransitionDeclAST.hh"
-#include "Transition.hh"
+#include "mem/slicc/ast/TransitionDeclAST.hh"
+#include "mem/slicc/symbols/Transition.hh"
TransitionDeclAST::TransitionDeclAST(Vector<string>* state_list_ptr,
Vector<string>* event_list_ptr,
diff --git a/src/mem/slicc/ast/TransitionDeclAST.hh b/src/mem/slicc/ast/TransitionDeclAST.hh
index 10ca067d3..95bf0b48c 100644
--- a/src/mem/slicc/ast/TransitionDeclAST.hh
+++ b/src/mem/slicc/ast/TransitionDeclAST.hh
@@ -39,9 +39,9 @@
#ifndef TransitionDeclAST_H
#define TransitionDeclAST_H
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "StatementListAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
class TransitionDeclAST : public DeclAST {
public:
diff --git a/src/mem/slicc/ast/TypeAST.cc b/src/mem/slicc/ast/TypeAST.cc
index 82364732b..284e917df 100644
--- a/src/mem/slicc/ast/TypeAST.cc
+++ b/src/mem/slicc/ast/TypeAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "TypeAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
TypeAST::TypeAST(string* ident_ptr)
: AST()
diff --git a/src/mem/slicc/ast/TypeAST.hh b/src/mem/slicc/ast/TypeAST.hh
index a0fea56c3..a1aa13ad4 100644
--- a/src/mem/slicc/ast/TypeAST.hh
+++ b/src/mem/slicc/ast/TypeAST.hh
@@ -39,8 +39,8 @@
#ifndef TYPEAST_H
#define TYPEAST_H
-#include "slicc_global.hh"
-#include "AST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
class TypeAST : public AST {
public:
diff --git a/src/mem/slicc/ast/TypeDeclAST.cc b/src/mem/slicc/ast/TypeDeclAST.cc
index 5d2b19bac..1af2beb1c 100644
--- a/src/mem/slicc/ast/TypeDeclAST.cc
+++ b/src/mem/slicc/ast/TypeDeclAST.cc
@@ -36,9 +36,9 @@
*
*/
-#include "TypeDeclAST.hh"
-#include "main.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/TypeDeclAST.hh"
+#include "mem/slicc/main.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
TypeDeclAST::TypeDeclAST(TypeAST* type_ast_ptr,
PairListAST* pairs_ptr,
diff --git a/src/mem/slicc/ast/TypeDeclAST.hh b/src/mem/slicc/ast/TypeDeclAST.hh
index 1928c1bde..bb0ea2935 100644
--- a/src/mem/slicc/ast/TypeDeclAST.hh
+++ b/src/mem/slicc/ast/TypeDeclAST.hh
@@ -39,10 +39,10 @@
#ifndef TypeDeclAST_H
#define TypeDeclAST_H
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "TypeAST.hh"
-#include "TypeFieldAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
class TypeDeclAST : public DeclAST {
public:
diff --git a/src/mem/slicc/ast/TypeFieldAST.cc b/src/mem/slicc/ast/TypeFieldAST.cc
index 9dfe45397..9b3c77ef3 100644
--- a/src/mem/slicc/ast/TypeFieldAST.cc
+++ b/src/mem/slicc/ast/TypeFieldAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "TypeFieldAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
TypeFieldAST::TypeFieldAST(PairListAST* pairs_ptr)
: AST(pairs_ptr->getPairs()) {
diff --git a/src/mem/slicc/ast/TypeFieldAST.hh b/src/mem/slicc/ast/TypeFieldAST.hh
index 69d6d8b87..9979121f5 100644
--- a/src/mem/slicc/ast/TypeFieldAST.hh
+++ b/src/mem/slicc/ast/TypeFieldAST.hh
@@ -39,11 +39,11 @@
#ifndef TypeFieldAST_H
#define TypeFieldAST_H
-#include "slicc_global.hh"
-#include "StateMachine.hh"
-#include "StatementListAST.hh"
-#include "PairListAST.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
class TypeFieldAST : public AST {
public:
diff --git a/src/mem/slicc/ast/TypeFieldEnumAST.cc b/src/mem/slicc/ast/TypeFieldEnumAST.cc
index dbb27c3ae..47a42d8eb 100644
--- a/src/mem/slicc/ast/TypeFieldEnumAST.cc
+++ b/src/mem/slicc/ast/TypeFieldEnumAST.cc
@@ -36,9 +36,9 @@
*
*/
-#include "TypeFieldEnumAST.hh"
-#include "State.hh"
-#include "Event.hh"
+#include "mem/slicc/ast/TypeFieldEnumAST.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Event.hh"
TypeFieldEnumAST::TypeFieldEnumAST(string* field_id_ptr,
PairListAST* pairs_ptr)
diff --git a/src/mem/slicc/ast/TypeFieldEnumAST.hh b/src/mem/slicc/ast/TypeFieldEnumAST.hh
index f9c111762..c17f3cfab 100644
--- a/src/mem/slicc/ast/TypeFieldEnumAST.hh
+++ b/src/mem/slicc/ast/TypeFieldEnumAST.hh
@@ -39,11 +39,11 @@
#ifndef TypeFieldEnumAST_H
#define TypeFieldEnumAST_H
-#include "slicc_global.hh"
-#include "StateMachine.hh"
-#include "TypeFieldAST.hh"
-#include "StatementListAST.hh"
-#include "PairListAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
class TypeFieldEnumAST : public TypeFieldAST {
public:
diff --git a/src/mem/slicc/ast/TypeFieldMemberAST.cc b/src/mem/slicc/ast/TypeFieldMemberAST.cc
index 40109851b..67b90b44e 100644
--- a/src/mem/slicc/ast/TypeFieldMemberAST.cc
+++ b/src/mem/slicc/ast/TypeFieldMemberAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "TypeFieldMemberAST.hh"
+#include "mem/slicc/ast/TypeFieldMemberAST.hh"
TypeFieldMemberAST::TypeFieldMemberAST(TypeAST* type_ast_ptr,
string* field_id_ptr,
diff --git a/src/mem/slicc/ast/TypeFieldMemberAST.hh b/src/mem/slicc/ast/TypeFieldMemberAST.hh
index 5e275bb96..9f8df0520 100644
--- a/src/mem/slicc/ast/TypeFieldMemberAST.hh
+++ b/src/mem/slicc/ast/TypeFieldMemberAST.hh
@@ -39,13 +39,13 @@
#ifndef TypeFieldMemberAST_H
#define TypeFieldMemberAST_H
-#include "slicc_global.hh"
-#include "TypeFieldAST.hh"
-#include "StateMachine.hh"
-#include "StatementListAST.hh"
-#include "PairListAST.hh"
-#include "ExprAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class TypeFieldMemberAST : public TypeFieldAST {
public:
diff --git a/src/mem/slicc/ast/TypeFieldMethodAST.cc b/src/mem/slicc/ast/TypeFieldMethodAST.cc
index 5229d4a08..71c7a8fd1 100644
--- a/src/mem/slicc/ast/TypeFieldMethodAST.cc
+++ b/src/mem/slicc/ast/TypeFieldMethodAST.cc
@@ -36,7 +36,7 @@
*
*/
-#include "TypeFieldMethodAST.hh"
+#include "mem/slicc/ast/TypeFieldMethodAST.hh"
TypeFieldMethodAST::TypeFieldMethodAST(TypeAST* return_type_ast_ptr,
string* ident_ptr,
diff --git a/src/mem/slicc/ast/TypeFieldMethodAST.hh b/src/mem/slicc/ast/TypeFieldMethodAST.hh
index a276cc5f8..c429b7ef6 100644
--- a/src/mem/slicc/ast/TypeFieldMethodAST.hh
+++ b/src/mem/slicc/ast/TypeFieldMethodAST.hh
@@ -39,9 +39,9 @@
#ifndef TYPEFIELDMETHODAST_H
#define TYPEFIELDMETHODAST_H
-#include "slicc_global.hh"
-#include "TypeFieldAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
class TypeFieldMethodAST : public TypeFieldAST {
public:
diff --git a/src/mem/slicc/ast/VarExprAST.cc b/src/mem/slicc/ast/VarExprAST.cc
index 865cc71b0..878d0d641 100644
--- a/src/mem/slicc/ast/VarExprAST.cc
+++ b/src/mem/slicc/ast/VarExprAST.cc
@@ -36,9 +36,9 @@
*
*/
-#include "VarExprAST.hh"
-#include "StatementAST.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
VarExprAST::~VarExprAST()
{
diff --git a/src/mem/slicc/ast/VarExprAST.hh b/src/mem/slicc/ast/VarExprAST.hh
index ce2f68875..65829de8f 100644
--- a/src/mem/slicc/ast/VarExprAST.hh
+++ b/src/mem/slicc/ast/VarExprAST.hh
@@ -39,8 +39,8 @@
#ifndef VAREXPRAST_H
#define VAREXPRAST_H
-#include "slicc_global.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
class Var;
class VarExprAST : public ExprAST {
diff --git a/src/mem/slicc/generator/fileio.cc b/src/mem/slicc/generator/fileio.cc
index 1707e5b7a..273c76bfd 100644
--- a/src/mem/slicc/generator/fileio.cc
+++ b/src/mem/slicc/generator/fileio.cc
@@ -36,7 +36,7 @@
*
* */
-#include "fileio.hh"
+#include "mem/slicc/generator/fileio.hh"
void conditionally_write_file(string filename, ostringstream& sstr)
{
diff --git a/src/mem/slicc/generator/fileio.hh b/src/mem/slicc/generator/fileio.hh
index 3cca7ccaa..fa1cc3493 100644
--- a/src/mem/slicc/generator/fileio.hh
+++ b/src/mem/slicc/generator/fileio.hh
@@ -39,7 +39,7 @@
#ifndef FILEIO_H
#define FILEIO_H
-#include "slicc_global.hh"
+#include "mem/slicc/slicc_global.hh"
void conditionally_write_file(string filename, ostringstream& sstr);
diff --git a/src/mem/slicc/generator/html_gen.cc b/src/mem/slicc/generator/html_gen.cc
index 3d17018e1..ebe02db92 100644
--- a/src/mem/slicc/generator/html_gen.cc
+++ b/src/mem/slicc/generator/html_gen.cc
@@ -36,9 +36,9 @@
*
* */
-#include "html_gen.hh"
-#include "fileio.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
string formatHTMLShorthand(const string shorthand);
diff --git a/src/mem/slicc/generator/html_gen.hh b/src/mem/slicc/generator/html_gen.hh
index 3f0de8df9..e90836b33 100644
--- a/src/mem/slicc/generator/html_gen.hh
+++ b/src/mem/slicc/generator/html_gen.hh
@@ -39,8 +39,8 @@
#ifndef HTML_GEN_H
#define HTML_GEN_H
-#include "slicc_global.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
string formatHTMLShorthand(const string shorthand);
void createHTMLindex(string title, ostream& out);
diff --git a/src/mem/slicc/generator/mif_gen.cc b/src/mem/slicc/generator/mif_gen.cc
index 0e6253654..2dca149b4 100644
--- a/src/mem/slicc/generator/mif_gen.cc
+++ b/src/mem/slicc/generator/mif_gen.cc
@@ -32,11 +32,11 @@
*
*/
-#include "mif_gen.hh"
-#include "State.hh"
-#include "Event.hh"
-#include "Action.hh"
-#include "Transition.hh"
+#include "mem/slicc/generator/mif_gen.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/slicc/symbols/Transition.hh"
// -- Helper functions
string formatShorthand(const string shorthand);
diff --git a/src/mem/slicc/generator/mif_gen.hh b/src/mem/slicc/generator/mif_gen.hh
index ba1dc0b0b..9cc5e1ea3 100644
--- a/src/mem/slicc/generator/mif_gen.hh
+++ b/src/mem/slicc/generator/mif_gen.hh
@@ -35,7 +35,7 @@
#ifndef MIF_GEN_H
#define MIF_GEN_H
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
void printStateTableMIF(const StateMachine& sm, ostream& out);
void printEventTableMIF(const StateMachine& sm, ostream& out);
diff --git a/src/mem/slicc/main.cc b/src/mem/slicc/main.cc
index acd9e73f9..294925ee1 100644
--- a/src/mem/slicc/main.cc
+++ b/src/mem/slicc/main.cc
@@ -32,18 +32,18 @@
*
* */
-#include "main.hh"
-#include "StateMachine.hh"
-#include "mif_gen.hh"
-#include "html_gen.hh"
-#include "fileio.hh"
-#include "DeclListAST.hh"
-#include "Type.hh"
-#include "SymbolTable.hh"
-#include "Event.hh"
-#include "State.hh"
-#include "Action.hh"
-#include "Transition.hh"
+#include "mem/slicc/main.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/generator/mif_gen.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/ast/DeclListAST.hh"
+#include "mem/slicc/symbols/Type.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/slicc/symbols/Transition.hh"
// -- Main conversion functions
diff --git a/src/mem/slicc/main.hh b/src/mem/slicc/main.hh
index e9fdee034..3e09c58f9 100644
--- a/src/mem/slicc/main.hh
+++ b/src/mem/slicc/main.hh
@@ -39,9 +39,9 @@
#ifndef MAIN_H
#define MAIN_H
-#include "slicc_global.hh"
-#include "DeclListAST.hh"
-#include "Map.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclListAST.hh"
+#include "mem/gems_common/Map.hh"
extern DeclListAST* g_decl_list_ptr;
diff --git a/src/mem/slicc/parser/lexer.ll b/src/mem/slicc/parser/lexer.ll
index 7903b0ee7..a4af2ac51 100644
--- a/src/mem/slicc/parser/lexer.ll
+++ b/src/mem/slicc/parser/lexer.ll
@@ -29,8 +29,8 @@
%{
#include <assert.h>
-#include "ASTs.hh"
-#include "parser.h"
+#include "mem/slicc/ast/ASTs.hh"
+#include "mem/slicc/parser/parser.hh"
#include <string>
extern "C" int yylex();
diff --git a/src/mem/slicc/parser/parser.yy b/src/mem/slicc/parser/parser.yy
index f4d9a1a62..8090b88f7 100644
--- a/src/mem/slicc/parser/parser.yy
+++ b/src/mem/slicc/parser/parser.yy
@@ -30,7 +30,7 @@
#include <string>
#include <stdio.h>
#include <assert.h>
-#include "ASTs.hh"
+#include "mem/slicc/ast/ASTs.hh"
#define YYMAXDEPTH 100000
#define YYERROR_VERBOSE
diff --git a/src/mem/slicc/slicc_global.hh b/src/mem/slicc/slicc_global.hh
index 72af5be58..caa5509f8 100644
--- a/src/mem/slicc/slicc_global.hh
+++ b/src/mem/slicc/slicc_global.hh
@@ -34,8 +34,8 @@
* ../common directory.
*/
-#include "std-includes.hh"
-#include "Map.hh"
+#include "mem/gems_common/std-includes.hh"
+#include "mem/gems_common/Map.hh"
typedef unsigned char uint8;
typedef unsigned int uint32;
diff --git a/src/mem/slicc/symbols/Action.hh b/src/mem/slicc/symbols/Action.hh
index 0f6e49290..dbb0c836a 100644
--- a/src/mem/slicc/symbols/Action.hh
+++ b/src/mem/slicc/symbols/Action.hh
@@ -34,7 +34,7 @@
#ifndef ACTION_H
#define ACTION_H
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
class Action : public Symbol {
public:
diff --git a/src/mem/slicc/symbols/Event.hh b/src/mem/slicc/symbols/Event.hh
index f272e8eb1..40cefc982 100644
--- a/src/mem/slicc/symbols/Event.hh
+++ b/src/mem/slicc/symbols/Event.hh
@@ -34,7 +34,7 @@
#ifndef EVENT_H
#define EVENT_H
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
class Event : public Symbol {
public:
diff --git a/src/mem/slicc/symbols/Func.cc b/src/mem/slicc/symbols/Func.cc
index 1af1e299c..0ccca7598 100644
--- a/src/mem/slicc/symbols/Func.cc
+++ b/src/mem/slicc/symbols/Func.cc
@@ -36,10 +36,10 @@
*
*/
-#include "Func.hh"
-#include "SymbolTable.hh"
-#include "fileio.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/Func.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
Func::Func(string id, const Location& location,
Type* type_ptr, const Vector<Type*>& param_type_vec,
@@ -98,8 +98,8 @@ void Func::writeCFiles(string path) const
// Header
out << "/** Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< " */" << endl;
out << endl;
- out << "#include \"Types.hh\"" << endl;
- out << "#include \"Chip.hh\"" << endl;
+ out << "#include \"mem/protocol/Types.hh\"" << endl;
+ out << "#include \"mem/protocol/Chip.hh\"" << endl;
if (m_isInternalMachineFunc) {
out << "#include \"" << m_machineStr << "_Controller.hh\"" << endl;
}
diff --git a/src/mem/slicc/symbols/Func.hh b/src/mem/slicc/symbols/Func.hh
index 763827701..c7e78838e 100644
--- a/src/mem/slicc/symbols/Func.hh
+++ b/src/mem/slicc/symbols/Func.hh
@@ -39,8 +39,8 @@
#ifndef FUNC_H
#define FUNC_H
-#include "slicc_global.hh"
-#include "Type.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/Type.hh"
class StateMachine;
class Func : public Symbol {
diff --git a/src/mem/slicc/symbols/State.hh b/src/mem/slicc/symbols/State.hh
index cac743e57..39900d506 100644
--- a/src/mem/slicc/symbols/State.hh
+++ b/src/mem/slicc/symbols/State.hh
@@ -34,7 +34,7 @@
#ifndef STATE_H
#define STATE_H
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
class State : public Symbol {
public:
diff --git a/src/mem/slicc/symbols/StateMachine.cc b/src/mem/slicc/symbols/StateMachine.cc
index d4436870e..6aaa0ebca 100644
--- a/src/mem/slicc/symbols/StateMachine.cc
+++ b/src/mem/slicc/symbols/StateMachine.cc
@@ -32,17 +32,17 @@
*
* */
-#include "StateMachine.hh"
-#include "fileio.hh"
-#include "html_gen.hh"
-#include "Action.hh"
-#include "Event.hh"
-#include "State.hh"
-#include "Transition.hh"
-#include "Var.hh"
-#include "SymbolTable.hh"
-#include "util.hh"
-#include "Vector.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Transition.hh"
+#include "mem/slicc/symbols/Var.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/gems_common/Vector.hh"
StateMachine::StateMachine(string ident, const Location& location, const Map<string, string>& pairs)
: Symbol(ident, location, pairs)
@@ -230,11 +230,11 @@ void StateMachine::printControllerH(ostream& out, string component) const
out << "#ifndef " << component << "_CONTROLLER_H" << endl;
out << "#define " << component << "_CONTROLLER_H" << endl;
out << endl;
- out << "#include \"Global.hh\"" << endl;
- out << "#include \"Consumer.hh\"" << endl;
- out << "#include \"TransitionResult.hh\"" << endl;
- out << "#include \"Types.hh\"" << endl;
- out << "#include \"" << component << "_Profiler.hh\"" << endl;
+ out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+ out << "#include \"mem/ruby/common/Consumer.hh\"" << endl;
+ out << "#include \"mem/protocol/TransitionResult.hh\"" << endl;
+ out << "#include \"mem/protocol/Types.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_Profiler.hh\"" << endl;
out << endl;
// for adding information to the protocol debug trace
@@ -302,14 +302,14 @@ void StateMachine::printControllerC(ostream& out, string component) const
out << " * Created by slicc definition of Module \"" << getShorthand() << "\"" << endl;
out << " */" << endl;
out << endl;
- out << "#include \"Global.hh\"" << endl;
- out << "#include \"RubySlicc_includes.hh\"" << endl;
- out << "#include \"" << component << "_Controller.hh\"" << endl;
- out << "#include \"" << component << "_State.hh\"" << endl;
- out << "#include \"" << component << "_Event.hh\"" << endl;
- out << "#include \"Types.hh\"" << endl;
- out << "#include \"System.hh\"" << endl;
- out << "#include \"Chip.hh\"" << endl;
+ out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+ out << "#include \"mem/ruby/slicc_interface/RubySlicc_includes.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_Controller.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
+ out << "#include \"mem/protocol/Types.hh\"" << endl;
+ out << "#include \"mem/ruby/system/System.hh\"" << endl;
+ out << "#include \"mem/protocol/Chip.hh\"" << endl;
out << endl;
// for adding information to the protocol debug trace
@@ -399,14 +399,14 @@ void StateMachine::printCWakeup(ostream& out, string component) const
out << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
out << "// " << getIdent() << ": " << getShorthand() << endl;
out << endl;
- out << "#include \"Global.hh\"" << endl;
- out << "#include \"RubySlicc_includes.hh\"" << endl;
- out << "#include \"" << component << "_Controller.hh\"" << endl;
- out << "#include \"" << component << "_State.hh\"" << endl;
- out << "#include \"" << component << "_Event.hh\"" << endl;
- out << "#include \"Types.hh\"" << endl;
- out << "#include \"System.hh\"" << endl;
- out << "#include \"Chip.hh\"" << endl;
+ out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+ out << "#include \"mem/ruby/slicc_interface/RubySlicc_includes.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_Controller.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
+ out << "#include \"mem/protocol/Types.hh\"" << endl;
+ out << "#include \"mem/ruby/system/System.hh\"" << endl;
+ out << "#include \"mem/protocol/Chip.hh\"" << endl;
out << endl;
out << "void " << component << "_Controller::wakeup()" << endl;
out << "{" << endl;
@@ -447,13 +447,13 @@ void StateMachine::printCSwitch(ostream& out, string component) const
out << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
out << "// " << getIdent() << ": " << getShorthand() << endl;
out << endl;
- out << "#include \"Global.hh\"" << endl;
- out << "#include \"" << component << "_Controller.hh\"" << endl;
- out << "#include \"" << component << "_State.hh\"" << endl;
- out << "#include \"" << component << "_Event.hh\"" << endl;
- out << "#include \"Types.hh\"" << endl;
- out << "#include \"System.hh\"" << endl;
- out << "#include \"Chip.hh\"" << endl;
+ out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_Controller.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
+ out << "#include \"mem/protocol/Types.hh\"" << endl;
+ out << "#include \"mem/ruby/system/System.hh\"" << endl;
+ out << "#include \"mem/protocol/Chip.hh\"" << endl;
out << endl;
out << "#define HASH_FUN(state, event) ((int(state)*" << component
<< "_Event_NUM)+int(event))" << endl;
@@ -650,9 +650,9 @@ void StateMachine::printProfilerH(ostream& out, string component) const
out << "#ifndef " << component << "_PROFILER_H" << endl;
out << "#define " << component << "_PROFILER_H" << endl;
out << endl;
- out << "#include \"Global.hh\"" << endl;
- out << "#include \"" << component << "_State.hh\"" << endl;
- out << "#include \"" << component << "_Event.hh\"" << endl;
+ out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
out << endl;
out << "class " << component << "_Profiler {" << endl;
out << "public:" << endl;
@@ -674,7 +674,7 @@ void StateMachine::printProfilerC(ostream& out, string component) const
out << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
out << "// " << getIdent() << ": " << getShorthand() << endl;
out << endl;
- out << "#include \"" << component << "_Profiler.hh\"" << endl;
+ out << "#include \"mem/protocol/" << component << "_Profiler.hh\"" << endl;
out << endl;
// Constructor
diff --git a/src/mem/slicc/symbols/StateMachine.hh b/src/mem/slicc/symbols/StateMachine.hh
index 9f3663ed4..02ab12881 100644
--- a/src/mem/slicc/symbols/StateMachine.hh
+++ b/src/mem/slicc/symbols/StateMachine.hh
@@ -35,10 +35,10 @@
#ifndef STATEMACHINE_H
#define STATEMACHINE_H
-#include "slicc_global.hh"
-#include "Vector.hh"
-#include "Map.hh"
-#include "Symbol.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/symbols/Symbol.hh"
class Transition;
class Event;
diff --git a/src/mem/slicc/symbols/Symbol.cc b/src/mem/slicc/symbols/Symbol.cc
index 3365c94eb..25af5ad47 100644
--- a/src/mem/slicc/symbols/Symbol.cc
+++ b/src/mem/slicc/symbols/Symbol.cc
@@ -32,7 +32,7 @@
*
*/
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
Symbol::Symbol(string id, const Location& location, const Map<string, string>& pairs)
{
diff --git a/src/mem/slicc/symbols/Symbol.hh b/src/mem/slicc/symbols/Symbol.hh
index bca7d32db..1b4bd517a 100644
--- a/src/mem/slicc/symbols/Symbol.hh
+++ b/src/mem/slicc/symbols/Symbol.hh
@@ -34,9 +34,9 @@
#ifndef SYMBOL_H
#define SYMBOL_H
-#include "slicc_global.hh"
-#include "Map.hh"
-#include "Location.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/ast/Location.hh"
class Symbol {
public:
diff --git a/src/mem/slicc/symbols/SymbolTable.cc b/src/mem/slicc/symbols/SymbolTable.cc
index 37e233e88..70391f838 100644
--- a/src/mem/slicc/symbols/SymbolTable.cc
+++ b/src/mem/slicc/symbols/SymbolTable.cc
@@ -27,11 +27,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "SymbolTable.hh"
-#include "fileio.hh"
-#include "html_gen.hh"
-#include "mif_gen.hh"
-#include "Action.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/generator/mif_gen.hh"
+#include "mem/slicc/symbols/Action.hh"
SymbolTable g_sym_table;
@@ -163,15 +163,15 @@ void SymbolTable::writeCFiles(string path) const
{
int size = m_sym_vec.size();
{
- // Write the Types.hh include file for the types
+ // Write the mem/protocol/Types.hh include file for the types
ostringstream sstr;
sstr << "/** Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< " */" << endl;
sstr << endl;
- sstr << "#include \"RubySlicc_includes.hh\"" << endl;
+ sstr << "#include \"mem/ruby/slicc_interface/RubySlicc_includes.hh\"" << endl;
for(int i=0; i<size; i++) {
Type* type = dynamic_cast<Type*>(m_sym_vec[i]);
if (type != NULL && !type->isPrimitive()) {
- sstr << "#include \"" << type->cIdent() << ".hh" << "\"" << endl;
+ sstr << "#include \"mem/protocol/" << type->cIdent() << ".hh" << "\"" << endl;
}
}
conditionally_write_file(path + "/Types.hh", sstr);
@@ -187,7 +187,7 @@ void SymbolTable::writeCFiles(string path) const
void SymbolTable::writeChipFiles(string path) const
{
- // Create Chip.cc and Chip.hh
+ // Create Chip.cc and mem/protocol/Chip.hh
// FIXME - Note: this method is _really_ ugly. Most of this
// functionality should be pushed into each type of symbol and use
@@ -208,9 +208,9 @@ void SymbolTable::writeChipFiles(string path) const
sstr << endl;
// Includes
- sstr << "#include \"Global.hh\"" << endl;
- sstr << "#include \"Types.hh\"" << endl;
- sstr << "#include \"AbstractChip.hh\"" << endl;
+ sstr << "#include \"mem/ruby/common/Global.hh\"" << endl;
+ sstr << "#include \"mem/protocol/Types.hh\"" << endl;
+ sstr << "#include \"mem/ruby/slicc_interface/AbstractChip.hh\"" << endl;
sstr << "class Network;" << endl;
sstr << endl;
@@ -331,16 +331,16 @@ void SymbolTable::writeChipFiles(string path) const
{
ostringstream sstr;
sstr << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<<endl<<endl;
- sstr << "#include \"Chip.hh\"" << endl;
- sstr << "#include \"Network.hh\"" << endl;
- sstr << "#include \"CacheRecorder.hh\"" << endl;
+ sstr << "#include \"mem/protocol/Chip.hh\"" << endl;
+ sstr << "#include \"mem/ruby/network/Network.hh\"" << endl;
+ sstr << "#include \"mem/ruby/recorder/CacheRecorder.hh\"" << endl;
sstr << "" << endl;
sstr << "// Includes for controllers" << endl;
for(int i=0; i<size; i++) {
StateMachine* machine = dynamic_cast<StateMachine*>(m_sym_vec[i]);
if (machine != NULL) {
- sstr << "#include \"" << machine->getIdent() << "_Controller.hh\"" << endl;
+ sstr << "#include \"mem/protocol/" << machine->getIdent() << "_Controller.hh\"" << endl;
}
}
diff --git a/src/mem/slicc/symbols/SymbolTable.hh b/src/mem/slicc/symbols/SymbolTable.hh
index 8f40fe8c5..5e032e65d 100644
--- a/src/mem/slicc/symbols/SymbolTable.hh
+++ b/src/mem/slicc/symbols/SymbolTable.hh
@@ -39,15 +39,15 @@
#ifndef SYMBOLTABLE_H
#define SYMBOLTABLE_H
-#include "slicc_global.hh"
-#include "Map.hh"
-#include "Vector.hh"
-
-#include "Symbol.hh"
-#include "Type.hh"
-#include "Var.hh"
-#include "Func.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/gems_common/Vector.hh"
+
+#include "mem/slicc/symbols/Symbol.hh"
+#include "mem/slicc/symbols/Type.hh"
+#include "mem/slicc/symbols/Var.hh"
+#include "mem/slicc/symbols/Func.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
class SymbolTable;
diff --git a/src/mem/slicc/symbols/Transition.cc b/src/mem/slicc/symbols/Transition.cc
index 7c144c101..d6d348166 100644
--- a/src/mem/slicc/symbols/Transition.cc
+++ b/src/mem/slicc/symbols/Transition.cc
@@ -32,12 +32,12 @@
*
* */
-#include "Transition.hh"
-#include "State.hh"
-#include "Event.hh"
-#include "Action.hh"
-#include "util.hh"
-#include "Var.hh"
+#include "mem/slicc/symbols/Transition.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/slicc/symbols/Var.hh"
Transition::Transition(string state, string event, string nextState,
const Vector<string>& actionList,
diff --git a/src/mem/slicc/symbols/Transition.hh b/src/mem/slicc/symbols/Transition.hh
index af8eb3a05..7d39447b0 100644
--- a/src/mem/slicc/symbols/Transition.hh
+++ b/src/mem/slicc/symbols/Transition.hh
@@ -39,9 +39,9 @@
#ifndef TRANSITION_H
#define TRANSITION_H
-#include "slicc_global.hh"
-#include "Vector.hh"
-#include "Symbol.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/slicc/symbols/Symbol.hh"
class State;
class Event;
diff --git a/src/mem/slicc/symbols/Type.cc b/src/mem/slicc/symbols/Type.cc
index a49e9d7ba..a1de381ec 100644
--- a/src/mem/slicc/symbols/Type.cc
+++ b/src/mem/slicc/symbols/Type.cc
@@ -27,10 +27,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "Type.hh"
-#include "fileio.hh"
-#include "Map.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/Type.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
Type::Type(string id, const Location& location,
const Map<string, string>& pairs,
@@ -198,18 +198,18 @@ void Type::printTypeH(string path) const
out << endl;
// Include all of the #includes needed
- out << "#include \"Global.hh\"" << endl;
- out << "#include \"Allocator.hh\"" << endl;
+ out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+ out << "#include \"mem/gems_common/Allocator.hh\"" << endl;
for (int i=0; i < size; i++) {
Type* type = m_data_member_type_vec[i];
if (!type->isPrimitive()) {
- out << "#include \"" << type->cIdent() << ".hh" << "\"" << endl;
+ out << "#include \"mem/protocol/" << type->cIdent() << ".hh" << "\"" << endl;
}
}
string interface = "";
if(existPair("interface")) {
interface = lookupPair("interface");
- out << "#include \"" << interface << ".hh\"" << endl;
+ out << "#include \"mem/protocol/" << interface << ".hh\"" << endl;
}
// Class definition
@@ -445,7 +445,7 @@ void Type::printTypeC(string path) const
out << " * Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
out << " */" << endl;
out << endl;
- out << "#include \"" << type_name << ".hh\"" << endl;
+ out << "#include \"mem/protocol/" << type_name << ".hh\"" << endl;
out << endl;
if (isMessage()) {
out << "Allocator<" << type_name << ">* " << type_name << "::s_allocator_ptr = NULL;" << endl;
@@ -490,9 +490,9 @@ void Type::printEnumH(string path) const
out << "#define " << type_name << "_H" << endl;
out << endl;
// Include all of the #includes needed
- out << "#include \"Global.hh\"" << endl;
+ out << "#include \"mem/ruby/common/Global.hh\"" << endl;
if (m_isMachineType) {
- out << "#include \"RubyConfig.hh\"" << endl << endl;
+ out << "#include \"mem/ruby/config/RubyConfig.hh\"" << endl << endl;
}
out << endl;
@@ -568,7 +568,7 @@ void Type::printEnumC(string path) const
out << " */" << endl;
out << endl;
- out << "#include \"" << type_name << ".hh\"" << endl;
+ out << "#include \"mem/protocol/" << type_name << ".hh\"" << endl;
out << endl;
// Code for output operator
@@ -629,7 +629,7 @@ void Type::printEnumC(string path) const
out << "/** \\brief returns the base vector index for each machine type to be used by NetDest " << endl;
out << " * " << endl;
out << " * \\return the base vector index for each machine type to be used by NetDest" << endl;
- out << " * \\see NetDest.hh" << endl;
+ out << " * \\see mem/ruby/common/NetDest.hh" << endl;
out << " */" << endl;
out << "int " << type_name << "_base_level(const " << type_name << "& obj)" << endl;
out << "{" << endl;
diff --git a/src/mem/slicc/symbols/Type.hh b/src/mem/slicc/symbols/Type.hh
index c6f891326..4187d8ad5 100644
--- a/src/mem/slicc/symbols/Type.hh
+++ b/src/mem/slicc/symbols/Type.hh
@@ -39,9 +39,9 @@
#ifndef TYPE_H
#define TYPE_H
-#include "slicc_global.hh"
-#include "Map.hh"
-#include "Symbol.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/symbols/Symbol.hh"
class StateMachine;
diff --git a/src/mem/slicc/symbols/Var.cc b/src/mem/slicc/symbols/Var.cc
index a16c86967..a6e8dfd55 100644
--- a/src/mem/slicc/symbols/Var.cc
+++ b/src/mem/slicc/symbols/Var.cc
@@ -32,8 +32,8 @@
*
* */
-#include "Var.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/Var.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
Var::Var(string id, const Location& location,
Type* type_ptr, string code,
diff --git a/src/mem/slicc/symbols/Var.hh b/src/mem/slicc/symbols/Var.hh
index 277be0f74..7b1a2c77d 100644
--- a/src/mem/slicc/symbols/Var.hh
+++ b/src/mem/slicc/symbols/Var.hh
@@ -39,9 +39,9 @@
#ifndef VAR_H
#define VAR_H
-#include "slicc_global.hh"
-#include "Symbol.hh"
-#include "Type.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/Symbol.hh"
+#include "mem/slicc/symbols/Type.hh"
class StateMachine;