diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2012-08-27 01:00:55 -0500 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2012-08-27 01:00:55 -0500 |
commit | 9190940511b5783811bc6288dd4f22f8d18c9d26 (patch) | |
tree | 72a07f80a772d7c6f2a6f0255cee173ac631cb35 /src/mem/slicc/ast | |
parent | 7122b83d8f92d77bccae432b4e90ba12f1babad5 (diff) | |
download | gem5-9190940511b5783811bc6288dd4f22f8d18c9d26.tar.xz |
Ruby: Remove RubyEventQueue
This patch removes RubyEventQueue. Consumer objects now rely on RubySystem
or themselves for scheduling events.
Diffstat (limited to 'src/mem/slicc/ast')
-rw-r--r-- | src/mem/slicc/ast/AST.py | 2 | ||||
-rw-r--r-- | src/mem/slicc/ast/FuncCallExprAST.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/slicc/ast/AST.py b/src/mem/slicc/ast/AST.py index b74867114..b99451019 100644 --- a/src/mem/slicc/ast/AST.py +++ b/src/mem/slicc/ast/AST.py @@ -56,7 +56,7 @@ class AST(PairContainer): code(''' char c; cerr << "Runtime Error at ${{self.location}}, Ruby Time: " - << g_eventQueue_ptr->getTime() << ": " + << g_system_ptr->getTime() << ": " << $message << ", PID: " << getpid() << endl << "press return to continue." << endl; diff --git a/src/mem/slicc/ast/FuncCallExprAST.py b/src/mem/slicc/ast/FuncCallExprAST.py index 3747d0dfd..ab6261de2 100644 --- a/src/mem/slicc/ast/FuncCallExprAST.py +++ b/src/mem/slicc/ast/FuncCallExprAST.py @@ -142,7 +142,7 @@ class FuncCallExprAST(ExprAST): } if (result == TransitionResult_ResourceStall) { - g_eventQueue_ptr->scheduleEvent(this, 1); + scheduleEvent(this, 1); // Cannot do anything with this transition, go check next doable transition (mostly likely of next port) } @@ -173,7 +173,7 @@ class FuncCallExprAST(ExprAST): } if (result1 == TransitionResult_ResourceStall) { - g_eventQueue_ptr->scheduleEvent(this, 1); + scheduleEvent(this, 1); // Cannot do anything with this transition, go check next // doable transition (mostly likely of next port) } |