diff options
| author | azidar | 2015-07-16 11:10:03 -0700 |
|---|---|---|
| committer | azidar | 2015-07-16 11:10:03 -0700 |
| commit | 98bb81d9d99150a80c77ed8f22d44748a02df628 (patch) | |
| tree | 1146bb50c693786b93c910b6af564abf1576f2b8 /src | |
| parent | b75047591886a8281ca6cba2b2c7daa877cb3ce1 (diff) | |
| parent | 9b6d8514a3be860562d8d524fa425c87d1537e8a (diff) | |
Merge branch 'new-low-firrtl' of github.com:ucb-bar/firrtl into new-low-firrtl
Conflicts:
src/main/stanza/firrtl-ir.stanza
src/main/stanza/passes.stanza
src/main/stanza/verilog.stanza
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/stanza/verilog.stanza | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/main/stanza/verilog.stanza b/src/main/stanza/verilog.stanza index d4165bb4..8d6bfecf 100644 --- a/src/main/stanza/verilog.stanza +++ b/src/main/stanza/verilog.stanza @@ -185,23 +185,13 @@ defn emit-module (m:InModule) : val my-clk-update = get?(updates,get-name(clock(s)),Vector<Streamable>()) if key?(ens,sym) : add(my-clk-update,["if(" emit(ens[sym]) ") begin"]) - println(STANDARD-ERROR, "In key?, after first update") val x = cons[sym] - println(STANDARD-ERROR, "In key?, after cons[sym]") - println(STANDARD-ERROR,x) val y = emit(x) - println(STANDARD-ERROR, "In key?, after emit") add(my-clk-update,[" " sym " <= " y ";"]) - println(STANDARD-ERROR, "In key?, after second update") add(my-clk-update,["end"]) - println(STANDARD-ERROR, "In key?, after all updates") else : - println(STANDARD-ERROR, "In else, before update") add(my-clk-update,[sym " <= " emit(cons[sym]) ";"]) - println(STANDARD-ERROR, "In else, after update") - println(STANDARD-ERROR, "After ifelse, befure update") updates[get-name(clock(s))] = my-clk-update - println(STANDARD-ERROR, "After ifelse, after update") (s:DefMemory) : println(STANDARD-ERROR, s) val vtype = type(s) as VectorType @@ -223,7 +213,6 @@ defn emit-module (m:InModule) : if flip(f) == REVERSE : add(assigns,["assign " n* " = " emit(cons[n*]) ";"]) (s:DefAccessor) : - println(STANDARD-ERROR, s) val mem-declaration = decs[name(source(s) as Ref)] as DefMemory switch {_ == acc-dir(s)} : READ : |