Commit 4692cef0 by Marcus Winter

Merge branch 'embb452_dataflow_stream_operators' into development

parents 01100d6a 314b7e7c
...@@ -102,8 +102,9 @@ class Process< Slices, Serial, Inputs<Slices, I1, I2, I3, I4, I5>, ...@@ -102,8 +102,9 @@ class Process< Slices, Serial, Inputs<Slices, I1, I2, I3, I4, I5>,
} }
template <typename T> template <typename T>
void operator >> (T & target) { T & operator >> (T & target) {
GetOutput<0>() >> target.template GetInput<0>(); GetOutput<0>() >> target.template GetInput<0>();
return target;
} }
virtual void OnClock(int clock) { virtual void OnClock(int clock) {
......
...@@ -105,8 +105,9 @@ class Select ...@@ -105,8 +105,9 @@ class Select
} }
template <typename T> template <typename T>
void operator >> (T & target) { T & operator >> (T & target) {
GetOutput<0>() >> target.template GetInput<0>(); GetOutput<0>() >> target.template GetInput<0>();
return target;
} }
virtual void OnClock(int clock) { virtual void OnClock(int clock) {
......
...@@ -83,8 +83,9 @@ class Source< Slices, Outputs<Slices, O1, O2, O3, O4, O5> > ...@@ -83,8 +83,9 @@ class Source< Slices, Outputs<Slices, O1, O2, O3, O4, O5> >
} }
template <typename T> template <typename T>
void operator >> (T & target) { T & operator >> (T & target) {
GetOutput<0>() >> target.template GetInput<0>(); GetOutput<0>() >> target.template GetInput<0>();
return target;
} }
private: private:
......
...@@ -103,8 +103,9 @@ class Switch ...@@ -103,8 +103,9 @@ class Switch
} }
template <typename T> template <typename T>
void operator >> (T & target) { T & operator >> (T & target) {
GetOutput<0>() >> target.template GetInput<0>(); GetOutput<0>() >> target.template GetInput<0>();
return target;
} }
virtual void OnClock(int clock) { virtual void OnClock(int clock) {
......
...@@ -188,11 +188,14 @@ void SimpleTest::TestBasic() { ...@@ -188,11 +188,14 @@ void SimpleTest::TestBasic() {
source.GetOutput<0>() >> sw.GetInput<1>(); source.GetOutput<0>() >> sw.GetInput<1>();
source.GetOutput<0>() >> pred.GetInput<0>(); // connection chain representing the commented single connections below
pred.GetOutput<0>() >> sw.GetInput<0>(); source >> pred >> sw >> filter;
//source.GetOutput<0>() >> pred.GetInput<0>();
//pred.GetOutput<0>() >> sw.GetInput<0>();
pred.GetOutput<0>() >> sel.GetInput<0>(); pred.GetOutput<0>() >> sel.GetInput<0>();
sw.GetOutput<0>() >> filter.GetInput<0>(); //sw.GetOutput<0>() >> filter.GetInput<0>();
filter.GetOutput<0>() >> sel.GetInput<1>(); filter.GetOutput<0>() >> sel.GetInput<1>();
constant.GetOutput<0>() >> mult.GetInput<0>(); constant.GetOutput<0>() >> mult.GetInput<0>();
......
read >> replace; read >> replace >> write;
replace >> write;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment