diff options
| author | jackbackrack | 2015-04-29 20:59:03 -0700 |
|---|---|---|
| committer | jackbackrack | 2015-04-29 20:59:03 -0700 |
| commit | 4efcba3c46c4f1a138e5f3e8861734e084b07fb5 (patch) | |
| tree | 38a05b34ebc1533fd6c1d3554e09d380329ef1d9 /src | |
| parent | 15fb94d4d96c075fc2419ed7f6a8bdd86fb36dbf (diff) | |
merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/stanza/passes.stanza | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza index e26c82be..81ddc7f9 100644 --- a/src/main/stanza/passes.stanza +++ b/src/main/stanza/passes.stanza @@ -1935,13 +1935,8 @@ defn emit-s (s:Stmt, v:List<Symbol>, top:Symbol) : (s:DefNode) : if value(s) typeof WritePort : val e = value(s) as WritePort -<<<<<<< HEAD - val n = gensym(`F) - emit-all([top "::" n " = wr'" prim-width(type(e)) " " enable(e) " " mem(e) " " index(e) " " top "::" name(s) "\n"], top) -======= val n = firrtl-gensym(`F) emit-all([top "::" n " = wr'" prim-width(type(e)) " " enable(e) " " mem(e) " " index(e) " " name(s) "\n"], top) ->>>>>>> upstream/master else : emit-all([top "::" name(s) " = " maybe-mov(value(s)) value(s) "\n"], top) (s:Begin) : do(emit-s{_, v, top}, body(s)) |