From 76b75d8999b08c97765697f86bcff0fb5f0cf86b Mon Sep 17 00:00:00 2001 From: pjht Date: Sun, 31 Jul 2016 14:27:04 -0500 Subject: [PATCH] stuff --- comp(old)/in_to_out | 1 - {comp(old) => comp}/asm.rb | 0 {comp(old) => comp}/comp.circ | 0 {comp(old) => comp}/inc.asm | 0 {comp(old) => comp}/inc.code | 0 {comp(old) => comp}/inc.data | 0 {comp(old) => comp}/sim.rb | 0 multicycle cpu/cpu ins set.txt | 41 +- multicycle/multicycle.circ | 1724 ++++++++++++++++---------------- 9 files changed, 893 insertions(+), 873 deletions(-) delete mode 100644 comp(old)/in_to_out rename {comp(old) => comp}/asm.rb (100%) rename {comp(old) => comp}/comp.circ (100%) rename {comp(old) => comp}/inc.asm (100%) rename {comp(old) => comp}/inc.code (100%) rename {comp(old) => comp}/inc.data (100%) rename {comp(old) => comp}/sim.rb (100%) diff --git a/comp(old)/in_to_out b/comp(old)/in_to_out deleted file mode 100644 index 2754595..0000000 --- a/comp(old)/in_to_out +++ /dev/null @@ -1 +0,0 @@ -v2.0 raw diff --git a/comp(old)/asm.rb b/comp/asm.rb similarity index 100% rename from comp(old)/asm.rb rename to comp/asm.rb diff --git a/comp(old)/comp.circ b/comp/comp.circ similarity index 100% rename from comp(old)/comp.circ rename to comp/comp.circ diff --git a/comp(old)/inc.asm b/comp/inc.asm similarity index 100% rename from comp(old)/inc.asm rename to comp/inc.asm diff --git a/comp(old)/inc.code b/comp/inc.code similarity index 100% rename from comp(old)/inc.code rename to comp/inc.code diff --git a/comp(old)/inc.data b/comp/inc.data similarity index 100% rename from comp(old)/inc.data rename to comp/inc.data diff --git a/comp(old)/sim.rb b/comp/sim.rb similarity index 100% rename from comp(old)/sim.rb rename to comp/sim.rb diff --git a/multicycle cpu/cpu ins set.txt b/multicycle cpu/cpu ins set.txt index 401a2e6..cbef31d 100644 --- a/multicycle cpu/cpu ins set.txt +++ b/multicycle cpu/cpu ins set.txt @@ -1,27 +1,14 @@ -0 = lda - -1 = ldb - -2 = ldai - -3 = ldbi - -4 = add - -5 = sub - -6 = mult - -7 = div - -8 = sta - -9 = stb - -a = str - -b = jmp - -c = jmpc - -d = jmpz \ No newline at end of file +0=lda +1=ldb +2=ldai +3=ldbi +4=add +5=sub +6=mult +7=div +8=sta +9=stb +a=str +b=jmp +c=jmpc +d=jmpz \ No newline at end of file diff --git a/multicycle/multicycle.circ b/multicycle/multicycle.circ index edbda53..addd2d9 100644 --- a/multicycle/multicycle.circ +++ b/multicycle/multicycle.circ @@ -87,8 +87,8 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + @@ -128,12 +128,12 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - + + @@ -143,14 +143,15 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). + - + @@ -160,16 +161,16 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - + + + - + - @@ -183,14 +184,16 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). + + + - @@ -206,8 +209,10 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). + + @@ -217,30 +222,128 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). + - - + + - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + addr/data: 12 8 +5 a 0 9 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -261,96 +364,16 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - addr/data: 12 8 -5 a 0 13 1 - - - - - + @@ -415,10 +438,10 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - + + @@ -456,45 +479,45 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - - + + - + - + - - + - - + + + - - + + - + @@ -595,17 +618,17 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - - + + @@ -621,18 +644,18 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - - + + - + @@ -645,15 +668,182 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -674,208 +864,16 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -883,33 +881,58 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -917,7 +940,7 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + DIN DOUT ADDR @@ -931,6 +954,7 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). INS ADDR PC + PHASE @@ -944,6 +968,7 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). + @@ -961,14 +986,14 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - + + - - + + @@ -996,36 +1021,36 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - - - + + + - + - + - + @@ -1034,12 +1059,12 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - - - + + + + @@ -1145,24 +1170,24 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - - - + + + + - + - - + + - + @@ -1176,10 +1201,10 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - + + @@ -1194,18 +1219,20 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). + + - + - - - + + + @@ -1213,17 +1240,17 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - + - + @@ -1231,11 +1258,10 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - - + + - + @@ -1252,86 +1278,84 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - + - - + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1359,113 +1383,14 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1477,21 +1402,9 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - - - - - - - - - - - - - - + + + @@ -1522,12 +1435,133 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1575,14 +1609,14 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - - + + @@ -1610,29 +1644,29 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - + - + + - - + + - - + + - + @@ -1641,17 +1675,17 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - + - + @@ -1754,63 +1788,63 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - - + + - + - - + + - + - - + - - + + + - + - - + + - + - + - + @@ -1818,98 +1852,68 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + - - - + - - - + + - - + - - + + + - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + + + + - - - - @@ -1931,58 +1935,156 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1990,13 +2092,9 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - - - - - - + + + @@ -2004,96 +2102,10 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2101,36 +2113,58 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + @@ -2172,8 +2206,8 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + @@ -2203,50 +2237,7 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2254,7 +2245,16 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + + + + + + + + + + @@ -2264,9 +2264,43 @@ This file is intended to be loaded by Logisim (http://www.cburch.com/logisim/). - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +