aboutsummaryrefslogtreecommitdiff
path: root/src/main/stanza/compilers.stanza
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/stanza/compilers.stanza')
-rw-r--r--src/main/stanza/compilers.stanza7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/stanza/compilers.stanza b/src/main/stanza/compilers.stanza
index efa8c992..0c3978ab 100644
--- a/src/main/stanza/compilers.stanza
+++ b/src/main/stanza/compilers.stanza
@@ -13,7 +13,7 @@ public defstruct StandardFlo <: Compiler :
public defmethod passes (c:StandardFlo) -> List<Pass> :
to-list $ [
CheckHighForm(expand-delin)
- TempElimination()
+ ;; TempElimination()
ToWorkingIR()
MakeExplicitReset()
ResolveKinds()
@@ -41,8 +41,13 @@ public defstruct StandardVerilog <: Compiler :
file: String with: (as-method => true)
public defmethod passes (c:StandardVerilog) -> List<Pass> :
to-list $ [
+<<<<<<< HEAD
+ CheckHighForm()
+ ;; TempElimination()
+=======
CheckHighForm(expand-delin)
TempElimination()
+>>>>>>> upstream/master
ToWorkingIR()
MakeExplicitReset()
ResolveKinds()