renamed gates in or tree
This commit is contained in:
		| @@ -83,18 +83,18 @@ defproc ortree (bool? in[N]; bool! out; power supply) | ||||
|   /* array to hold the actual C-elments, either A2C or A3C */ | ||||
|    | ||||
|   [lenTree2Count > 0 -> | ||||
|     OR2_X1 C2Els[lenTree2Count]; | ||||
|     OR2_X1 or2s[lenTree2Count]; | ||||
|   ] | ||||
|    | ||||
|   [lenTree3Count > 0 -> | ||||
|     OR3_X1 C3Els[lenTree3Count]; | ||||
|     OR3_X1 or3s[lenTree3Count]; | ||||
|   ] | ||||
|    | ||||
|   (h:lenTree2Count:C2Els[h].vdd = supply.vdd;) | ||||
|   (h:lenTree3Count:C3Els[h].vdd = supply.vdd;) | ||||
|   (h:lenTree2Count:or2s[h].vdd = supply.vdd;) | ||||
|   (h:lenTree3Count:or3s[h].vdd = supply.vdd;) | ||||
|  | ||||
|   (h:lenTree2Count:C2Els[h].vss = supply.vss;) | ||||
|   (h:lenTree3Count:C3Els[h].vss = supply.vss;) | ||||
|   (h:lenTree2Count:or2s[h].vss = supply.vss;) | ||||
|   (h:lenTree3Count:or3s[h].vss = supply.vss;) | ||||
|  | ||||
|   /* Reset the variables we just stole lol */ | ||||
|   i = 0; | ||||
| @@ -117,25 +117,25 @@ defproc ortree (bool? in[N]; bool! out; power supply) | ||||
|         j = j + 1; | ||||
|         [ i+1 >= end -> | ||||
|           /*-- last piece: use either a 2 input C-element --*/ | ||||
|           C2Els[tree2Index].a = tmp[i]; | ||||
|           C2Els[tree2Index].b = tmp[i+1]; | ||||
|           C2Els[tree2Index].y = tmp[end+j]; | ||||
|           or2s[tree2Index].a = tmp[i]; | ||||
|           or2s[tree2Index].b = tmp[i+1]; | ||||
|           or2s[tree2Index].y = tmp[end+j]; | ||||
|           tree2Index = tree2Index +1; | ||||
|           i = end; | ||||
|         [] i+2 >= end -> | ||||
|           /*-- last piece: use either a 3 input C-element --*/ | ||||
|           C3Els[tree3Index].a = tmp[i]; | ||||
|           C3Els[tree3Index].b = tmp[i+1]; | ||||
|           C3Els[tree3Index].c = tmp[i+2]; | ||||
|           C3Els[tree3Index].y = tmp[end+j]; | ||||
|           or3s[tree3Index].a = tmp[i]; | ||||
|           or3s[tree3Index].b = tmp[i+1]; | ||||
|           or3s[tree3Index].c = tmp[i+2]; | ||||
|           or3s[tree3Index].y = tmp[end+j]; | ||||
|  | ||||
|           tree3Index = tree3Index +1; | ||||
|           i = end; | ||||
|         [] else -> | ||||
|           /*-- more to come; so use a two input C-element --*/ | ||||
|           C2Els[tree2Index].a = tmp[i]; | ||||
|           C2Els[tree2Index].b = tmp[i+1]; | ||||
|           C2Els[tree2Index].y = tmp[end+j]; | ||||
|           or2s[tree2Index].a = tmp[i]; | ||||
|           or2s[tree2Index].b = tmp[i+1]; | ||||
|           or2s[tree2Index].y = tmp[end+j]; | ||||
|           tree2Index = tree2Index +1; | ||||
|           i = i + 2; | ||||
|         ] | ||||
|   | ||||
		Reference in New Issue
	
	Block a user