oops accidentally hit all trees

This commit is contained in:
alexmadison 2022-03-02 13:50:04 +01:00
parent c5e582ff3e
commit 659cd2479c
1 changed files with 14 additions and 14 deletions

View File

@ -87,14 +87,14 @@ defproc ortree (bool? in[N]; bool! out; power supply)
] ]
[lenTree3Count > 0 -> [lenTree3Count > 0 ->
OR3_X1 and3s[lenTree3Count]; OR3_X1 C3Els[lenTree3Count];
] ]
(h:lenTree2Count:C2Els[h].vdd = supply.vdd;) (h:lenTree2Count:C2Els[h].vdd = supply.vdd;)
(h:lenTree3Count:and3s[h].vdd = supply.vdd;) (h:lenTree3Count:C3Els[h].vdd = supply.vdd;)
(h:lenTree2Count:C2Els[h].vss = supply.vss;) (h:lenTree2Count:C2Els[h].vss = supply.vss;)
(h:lenTree3Count:and3s[h].vss = supply.vss;) (h:lenTree3Count:C3Els[h].vss = supply.vss;)
/* Reset the variables we just stole lol */ /* Reset the variables we just stole lol */
i = 0; i = 0;
@ -124,10 +124,10 @@ defproc ortree (bool? in[N]; bool! out; power supply)
i = end; i = end;
[] i+2 >= end -> [] i+2 >= end ->
/*-- last piece: use either a 3 input C-element --*/ /*-- last piece: use either a 3 input C-element --*/
and3s[tree3Index].a = tmp[i]; C3Els[tree3Index].a = tmp[i];
and3s[tree3Index].b = tmp[i+1]; C3Els[tree3Index].b = tmp[i+1];
and3s[tree3Index].c = tmp[i+2]; C3Els[tree3Index].c = tmp[i+2];
and3s[tree3Index].y = tmp[end+j]; C3Els[tree3Index].y = tmp[end+j];
tree3Index = tree3Index +1; tree3Index = tree3Index +1;
i = end; i = end;
@ -311,15 +311,15 @@ defproc ctree (bool? in[N]; bool! out; power supply)
] ]
[lenTree3Count > 0 -> [lenTree3Count > 0 ->
A_3C_B_X1 and3s[lenTree3Count]; A_3C_B_X1 C3Els[lenTree3Count];
] ]
(h:lenTree2Count:C2Els[h].vdd = supply.vdd;) (h:lenTree2Count:C2Els[h].vdd = supply.vdd;)
(h:lenTree3Count:and3s[h].vdd = supply.vdd;) (h:lenTree3Count:C3Els[h].vdd = supply.vdd;)
(h:lenTree2Count:C2Els[h].vss = supply.vss;) (h:lenTree2Count:C2Els[h].vss = supply.vss;)
(h:lenTree3Count:and3s[h].vss = supply.vss;) (h:lenTree3Count:C3Els[h].vss = supply.vss;)
/* Reset the variables we just stole lol */ /* Reset the variables we just stole lol */
i = 0; i = 0;
@ -349,10 +349,10 @@ defproc ctree (bool? in[N]; bool! out; power supply)
i = end; i = end;
[] i+2 >= end -> [] i+2 >= end ->
/*-- last piece: use either a 3 input C-element --*/ /*-- last piece: use either a 3 input C-element --*/
and3s[tree3Index].c1 = tmp[i]; C3Els[tree3Index].c1 = tmp[i];
and3s[tree3Index].c2 = tmp[i+1]; C3Els[tree3Index].c2 = tmp[i+1];
and3s[tree3Index].c3 = tmp[i+2]; C3Els[tree3Index].c3 = tmp[i+2];
and3s[tree3Index].y = tmp[end+j]; C3Els[tree3Index].y = tmp[end+j];
tree3Index = tree3Index +1; tree3Index = tree3Index +1;
i = end; i = end;