From: Brad Beckmann Date: Thu, 11 Jul 2013 18:56:05 +0000 (-0500) Subject: ruby: removed the very old double trigger hack X-Git-Tag: stable_2013_10_14 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e54c93222cd69dd4c388adc37cded7b7eebef76;p=gem5.git ruby: removed the very old double trigger hack Committed by: Nilay Vaish --- diff --git a/src/mem/slicc/ast/FuncCallExprAST.py b/src/mem/slicc/ast/FuncCallExprAST.py index fc42a8a3e..ff9ab6f3d 100644 --- a/src/mem/slicc/ast/FuncCallExprAST.py +++ b/src/mem/slicc/ast/FuncCallExprAST.py @@ -147,37 +147,6 @@ class FuncCallExprAST(ExprAST): // Cannot do anything with this transition, go check next doable transition (mostly likely of next port) } } -''') - elif self.proc_name == "doubleTrigger": - # NOTE: Use the doubleTrigger call with extreme caution - # the key to double trigger is the second event triggered - # cannot fail becuase the first event cannot be undone - assert len(cvec) == 4 - code(''' -{ - Address addr1 = ${{cvec[1]}}; - TransitionResult result1 = - doTransition(${{cvec[0]}}, ${machine}_getState(addr1), addr1); - - if (result1 == TransitionResult_Valid) { - //this second event cannont fail because the first event - // already took effect - Address addr2 = ${{cvec[3]}}; - TransitionResult result2 = doTransition(${{cvec[2]}}, ${machine}_getState(addr2), addr2); - - // ensure the event suceeded - assert(result2 == TransitionResult_Valid); - - counter++; - continue; // Check the first port again - } - - if (result1 == TransitionResult_ResourceStall) { - scheduleEvent(Cycles(1)); - // Cannot do anything with this transition, go check next - // doable transition (mostly likely of next port) - } -} ''') elif self.proc_name == "error": code("$0", self.exprs[0].embedError(cvec[0]))