From 9b6d8514a3be860562d8d524fa425c87d1537e8a Mon Sep 17 00:00:00 2001 From: azidar Date: Mon, 13 Jul 2015 16:22:43 -0700 Subject: Added tests for clocks. Added remove scope and special chars passes. Added tests. Made more tests pass --- test/passes/jacktest/ALUTop.fir | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'test/passes/jacktest/ALUTop.fir') diff --git a/test/passes/jacktest/ALUTop.fir b/test/passes/jacktest/ALUTop.fir index 562787a4..bc803e97 100644 --- a/test/passes/jacktest/ALUTop.fir +++ b/test/passes/jacktest/ALUTop.fir @@ -9,23 +9,23 @@ circuit ALUTop : input alu_op : UInt<4> node shamt = bits(B, 4, 0) - node T_157 = add-wrap(A, B) - node T_158 = sub-wrap(A, B) - node T_159 = convert(A) + node T_157 = addw(A, B) + node T_158 = subw(A, B) + node T_159 = cvt(A) node T_160 = dshr(T_159, shamt) - node T_161 = as-UInt(T_160) + node T_161 = asUInt(T_160) node T_162 = dshr(A, shamt) node T_163 = dshl(A, shamt) node T_164 = bits(T_163, 31, 0) - node T_165 = convert(A) - node T_166 = convert(B) + node T_165 = cvt(A) + node T_166 = cvt(B) node T_167 = lt(T_165, T_166) - node T_168 = as-UInt(T_167) + node T_168 = asUInt(T_167) node T_169 = lt(A, B) - node T_170 = as-UInt(T_169) - node T_171 = bit-and(A, B) - node T_172 = bit-or(A, B) - node T_173 = bit-xor(A, B) + node T_170 = asUInt(T_169) + node T_171 = and(A, B) + node T_172 = or(A, B) + node T_173 = xor(A, B) node T_174 = eq(UInt<4>(10), alu_op) node T_175 = mux(T_174, A, B) node T_176 = eq(UInt<4>(4), alu_op) @@ -51,9 +51,9 @@ circuit ALUTop : node T_195 = bits(oot, 31, 0) out := T_195 node T_196 = bit(alu_op, 0) - node T_197 = sub-wrap(UInt<1>(0), B) + node T_197 = subw(UInt<1>(0), B) node T_198 = mux(T_196, T_197, B) - node T_199 = add-wrap(A, T_198) + node T_199 = addw(A, T_198) sum := T_199 module ALUdec : input opcode : UInt<7> -- cgit v1.2.3