diff --git a/machine_alpha/ALU_3_in_1.bdf b/machine_alpha/ALU_3_in_1.bdf index 53488aa..ba0e563 100644 --- a/machine_alpha/ALU_3_in_1.bdf +++ b/machine_alpha/ALU_3_in_1.bdf @@ -2235,7 +2235,7 @@ applicable agreement for further details. (flipy) ) (symbol - (rect 1016 456 1048 488) + (rect 1048 432 1080 464) (text "GND" (rect 8 16 29 26)(font "Arial" (font_size 6))) (text "inst4" (rect 3 21 26 33)(font "Arial" )(invisible)) (port @@ -2252,7 +2252,7 @@ applicable agreement for further details. ) ) (symbol - (rect 1016 344 1048 360) + (rect 1048 344 1080 360) (text "VCC" (rect 7 0 27 10)(font "Arial" (font_size 6))) (text "inst18" (rect 3 5 32 17)(font "Arial" )(invisible)) (port @@ -2337,7 +2337,7 @@ applicable agreement for further details. (symbol (rect 1096 240 1144 304) (text "OR2" (rect 0 45 10 63)(font "Arial" (font_size 6))(vertical)) - (text "right" (rect 38 37 50 58)(font "Arial" )(vertical)) + (text "right" (rect 39 36 51 57)(font "Arial" )(vertical)) (port (pt 32 64) (input) @@ -2437,45 +2437,43 @@ applicable agreement for further details. (rotate90) ) (symbol - (rect 1008 -224 1104 -128) - (text "nano_selector" (rect 5 0 86 14)(font "Arial" (font_size 8))) - (text "OverflowSelect" (rect 8 80 83 92)(font "Arial" )) + (rect 976 -32 1008 0) + (text "GND" (rect 8 16 29 26)(font "Arial" (font_size 6))) + (text "inst7" (rect 3 21 26 33)(font "Arial" )(invisible)) (port - (pt 0 32) - (input) - (text "A" (rect 0 0 9 14)(font "Arial" (font_size 8))) - (text "A" (rect 21 27 30 41)(font "Arial" (font_size 8))) - (line (pt 0 32)(pt 16 32)(line_width 1)) - ) - (port - (pt 0 48) - (input) - (text "B" (rect 0 0 8 14)(font "Arial" (font_size 8))) - (text "B" (rect 21 43 29 57)(font "Arial" (font_size 8))) - (line (pt 0 48)(pt 16 48)(line_width 1)) - ) - (port - (pt 0 64) - (input) - (text "A_EN" (rect 0 0 31 14)(font "Arial" (font_size 8))) - (text "A_EN" (rect 21 59 52 73)(font "Arial" (font_size 8))) - (line (pt 0 64)(pt 16 64)(line_width 1)) - ) - (port - (pt 96 32) + (pt 16 0) (output) - (text "Q" (rect 0 0 9 14)(font "Arial" (font_size 8))) - (text "Q" (rect 66 27 75 41)(font "Arial" (font_size 8))) - (line (pt 96 32)(pt 80 32)(line_width 1)) + (text "1" (rect 18 0 23 12)(font "Courier New" (bold))(invisible)) + (text "1" (rect 18 0 23 12)(font "Courier New" (bold))(invisible)) + (line (pt 16 8)(pt 16 0)(line_width 1)) ) (drawing - (rectangle (rect 16 16 80 80)(line_width 1)) + (line (pt 8 8)(pt 16 16)(line_width 1)) + (line (pt 16 16)(pt 24 8)(line_width 1)) + (line (pt 8 8)(pt 24 8)(line_width 1)) + ) +) +(symbol + (rect 1160 -40 1192 -8) + (text "GND" (rect 8 16 29 26)(font "Arial" (font_size 6))) + (text "inst10" (rect 3 21 32 33)(font "Arial" )(invisible)) + (port + (pt 16 0) + (output) + (text "1" (rect 18 0 23 12)(font "Courier New" (bold))(invisible)) + (text "1" (rect 18 0 23 12)(font "Courier New" (bold))(invisible)) + (line (pt 16 8)(pt 16 0)(line_width 1)) + ) + (drawing + (line (pt 8 8)(pt 16 16)(line_width 1)) + (line (pt 16 16)(pt 24 8)(line_width 1)) + (line (pt 8 8)(pt 24 8)(line_width 1)) ) ) (symbol (rect 992 56 1088 152) (text "nano_selector" (rect 5 0 86 14)(font "Arial" (font_size 8))) - (text "CarrySelect" (rect 8 80 67 92)(font "Arial" )) + (text "CarrySelect_OnlyWhenAdding" (rect 8 80 157 92)(font "Arial" )) (port (pt 0 32) (input) @@ -2511,7 +2509,7 @@ applicable agreement for further details. (symbol (rect 1008 -128 1104 -32) (text "nano_selector" (rect 5 0 86 14)(font "Arial" (font_size 8))) - (text "NegativeSelect" (rect 8 80 83 92)(font "Arial" )) + (text "NegativeSelect_OnlyWhenSigned" (rect 8 80 174 92)(font "Arial" )) (port (pt 0 32) (input) @@ -2545,37 +2543,39 @@ applicable agreement for further details. ) ) (symbol - (rect 976 -32 1008 0) - (text "GND" (rect 8 16 29 26)(font "Arial" (font_size 6))) - (text "inst7" (rect 3 21 26 33)(font "Arial" )(invisible)) + (rect 1008 -224 1104 -128) + (text "nano_selector" (rect 5 0 86 14)(font "Arial" (font_size 8))) + (text "OverflowSelect_OnlyWhenSigned" (rect 8 80 174 92)(font "Arial" )) (port - (pt 16 0) + (pt 0 32) + (input) + (text "A" (rect 0 0 9 14)(font "Arial" (font_size 8))) + (text "A" (rect 21 27 30 41)(font "Arial" (font_size 8))) + (line (pt 0 32)(pt 16 32)(line_width 1)) + ) + (port + (pt 0 48) + (input) + (text "B" (rect 0 0 8 14)(font "Arial" (font_size 8))) + (text "B" (rect 21 43 29 57)(font "Arial" (font_size 8))) + (line (pt 0 48)(pt 16 48)(line_width 1)) + ) + (port + (pt 0 64) + (input) + (text "A_EN" (rect 0 0 31 14)(font "Arial" (font_size 8))) + (text "A_EN" (rect 21 59 52 73)(font "Arial" (font_size 8))) + (line (pt 0 64)(pt 16 64)(line_width 1)) + ) + (port + (pt 96 32) (output) - (text "1" (rect 18 0 23 12)(font "Courier New" (bold))(invisible)) - (text "1" (rect 18 0 23 12)(font "Courier New" (bold))(invisible)) - (line (pt 16 8)(pt 16 0)(line_width 1)) + (text "Q" (rect 0 0 9 14)(font "Arial" (font_size 8))) + (text "Q" (rect 66 27 75 41)(font "Arial" (font_size 8))) + (line (pt 96 32)(pt 80 32)(line_width 1)) ) (drawing - (line (pt 8 8)(pt 16 16)(line_width 1)) - (line (pt 16 16)(pt 24 8)(line_width 1)) - (line (pt 8 8)(pt 24 8)(line_width 1)) - ) -) -(symbol - (rect 1160 -40 1192 -8) - (text "GND" (rect 8 16 29 26)(font "Arial" (font_size 6))) - (text "inst10" (rect 3 21 32 33)(font "Arial" )(invisible)) - (port - (pt 16 0) - (output) - (text "1" (rect 18 0 23 12)(font "Courier New" (bold))(invisible)) - (text "1" (rect 18 0 23 12)(font "Courier New" (bold))(invisible)) - (line (pt 16 8)(pt 16 0)(line_width 1)) - ) - (drawing - (line (pt 8 8)(pt 16 16)(line_width 1)) - (line (pt 16 16)(pt 24 8)(line_width 1)) - (line (pt 8 8)(pt 24 8)(line_width 1)) + (rectangle (rect 16 16 80 80)(line_width 1)) ) ) (connector @@ -3194,22 +3194,6 @@ applicable agreement for further details. (pt 544 -400) (pt 904 -400) ) -(connector - (pt 920 -432) - (pt 920 192) -) -(connector - (pt 904 -400) - (pt 904 208) -) -(connector - (pt 888 -360) - (pt 888 -296) -) -(connector - (pt 888 -296) - (pt 888 224) -) (connector (pt 1160 336) (pt 1176 336) @@ -3218,22 +3202,6 @@ applicable agreement for further details. (pt 1112 336) (pt 1064 336) ) -(connector - (pt 1168 192) - (pt 1168 240) -) -(connector - (pt 1216 176) - (pt 1216 240) -) -(connector - (pt 1120 208) - (pt 1120 240) -) -(connector - (pt 1072 224) - (pt 1072 240) -) (connector (pt 1144 472) (pt 1144 320) @@ -3242,22 +3210,6 @@ applicable agreement for further details. (pt 1160 472) (pt 1160 336) ) -(connector - (pt 920 192) - (pt 1168 192) -) -(connector - (pt 936 176) - (pt 1216 176) -) -(connector - (pt 904 208) - (pt 1120 208) -) -(connector - (pt 888 224) - (pt 1072 224) -) (connector (pt 1080 320) (pt 1144 320) @@ -3302,14 +3254,6 @@ applicable agreement for further details. (pt 1208 304) (pt 1208 352) ) -(connector - (pt 1008 584) - (pt 1008 240) -) -(connector - (pt 1008 240) - (pt 856 240) -) (connector (pt 616 232) (pt 672 232) @@ -3390,22 +3334,10 @@ applicable agreement for further details. (pt 912 352) (pt 912 416) ) -(connector - (pt 1032 456) - (pt 1032 416) -) -(connector - (pt 912 416) - (pt 1032 416) -) (connector (pt 880 416) (pt 896 416) ) -(connector - (pt 896 416) - (pt 912 416) -) (connector (pt 672 416) (pt 704 416) @@ -3458,22 +3390,10 @@ applicable agreement for further details. (pt 848 352) (pt 848 400) ) -(connector - (pt 1032 360) - (pt 1032 400) -) (connector (pt 816 400) (pt 832 400) ) -(connector - (pt 832 400) - (pt 848 400) -) -(connector - (pt 848 400) - (pt 1032 400) -) (connector (pt 688 400) (pt 736 400) @@ -3498,30 +3418,6 @@ applicable agreement for further details. (pt 1208 472) (pt 1208 464) ) -(connector - (pt 928 368) - (pt 1224 368) -) -(connector - (pt 1192 456) - (pt 1216 456) -) -(connector - (pt 1232 464) - (pt 1232 448) -) -(connector - (pt 1216 456) - (pt 1216 448) -) -(connector - (pt 1224 304) - (pt 1224 368) -) -(connector - (pt 1224 368) - (pt 1224 384) -) (connector (pt 1176 384) (pt 944 384) @@ -3538,46 +3434,10 @@ applicable agreement for further details. (pt 1176 384) (pt 1176 472) ) -(connector - (pt 1208 464) - (pt 1232 464) -) -(connector - (pt 1232 464) - (pt 1256 464) -) -(connector - (pt 936 120) - (pt 992 120) -) -(connector - (pt 936 -416) - (pt 936 120) -) -(connector - (pt 936 120) - (pt 936 176) -) -(connector - (pt 1256 160) - (pt 1256 464) -) -(connector - (pt 1256 160) - (pt 976 160) -) (connector (pt 976 -64) (pt 1008 -64) ) -(connector - (pt 976 -160) - (pt 976 -64) -) -(connector - (pt 976 -64) - (pt 976 160) -) (connector (pt 816 -192) (pt 1008 -192) @@ -3602,21 +3462,6 @@ applicable agreement for further details. (pt 344 -464) (color 255 101 9) ) -(connector - (pt 952 -480) - (pt 344 -480) - (color 255 101 9) -) -(connector - (pt 952 104) - (pt 992 104) - (color 255 101 9) -) -(connector - (pt 952 -480) - (pt 952 104) - (color 255 101 9) -) (connector (pt 1104 -192) (pt 1120 -192) @@ -3734,22 +3579,10 @@ applicable agreement for further details. (pt 1176 -200) (pt 1176 -184) ) -(connector - (pt 856 -232) - (pt 856 240) -) (connector (pt 296 -496) (pt 296 -232) ) -(connector - (pt 296 -232) - (pt 856 -232) -) -(connector - (pt 856 -232) - (pt 1192 -232) -) (connector (pt 152 568) (pt 152 -248) @@ -3835,6 +3668,185 @@ applicable agreement for further details. (pt 1120 -136) (color 138 138 138) ) +(connector + (pt 1064 400) + (pt 1064 360) +) +(connector + (pt 832 400) + (pt 848 400) +) +(connector + (pt 848 400) + (pt 1064 400) +) +(connector + (pt 976 -160) + (pt 976 -64) +) +(connector + (pt 976 -64) + (pt 976 16) +) +(connector + (pt 1264 464) + (pt 1264 16) +) +(connector + (pt 976 16) + (pt 1264 16) +) +(connector + (pt 920 -432) + (pt 920 176) +) +(connector + (pt 904 -400) + (pt 904 192) +) +(connector + (pt 1168 240) + (pt 1168 176) +) +(connector + (pt 1216 240) + (pt 1216 160) +) +(connector + (pt 1120 240) + (pt 1120 192) +) +(connector + (pt 1072 240) + (pt 1072 208) +) +(connector + (pt 920 176) + (pt 1168 176) +) +(connector + (pt 936 160) + (pt 1216 160) +) +(connector + (pt 904 192) + (pt 1120 192) +) +(connector + (pt 888 208) + (pt 1072 208) +) +(connector + (pt 936 -416) + (pt 936 160) +) +(connector + (pt 888 -360) + (pt 888 -296) +) +(connector + (pt 888 -296) + (pt 888 208) +) +(connector + (pt 992 120) + (pt 976 120) +) +(connector + (pt 1024 368) + (pt 1024 224) +) +(connector + (pt 976 120) + (pt 976 224) +) +(connector + (pt 1024 224) + (pt 976 224) +) +(connector + (pt 928 368) + (pt 1024 368) +) +(connector + (pt 1008 584) + (pt 1008 240) +) +(connector + (pt 1008 240) + (pt 856 240) +) +(connector + (pt 856 -232) + (pt 856 240) +) +(connector + (pt 296 -232) + (pt 856 -232) +) +(connector + (pt 856 -232) + (pt 1192 -232) +) +(connector + (pt 1192 456) + (pt 1216 456) +) +(connector + (pt 1232 464) + (pt 1232 448) +) +(connector + (pt 1216 456) + (pt 1216 448) +) +(connector + (pt 1208 464) + (pt 1232 464) +) +(connector + (pt 1232 464) + (pt 1264 464) +) +(connector + (pt 1024 368) + (pt 1224 368) +) +(connector + (pt 1224 304) + (pt 1224 368) +) +(connector + (pt 1224 368) + (pt 1224 384) +) +(connector + (pt 1064 416) + (pt 1064 432) +) +(connector + (pt 896 416) + (pt 912 416) +) +(connector + (pt 912 416) + (pt 1064 416) +) +(connector + (pt 344 -480) + (pt 960 -480) + (color 255 101 9) +) +(connector + (pt 992 104) + (pt 960 104) + (color 255 101 9) +) +(connector + (pt 960 -480) + (pt 960 104) + (color 255 101 9) +) (junction (pt 472 568)) (junction (pt 232 568)) (junction (pt 264 552)) @@ -3868,10 +3880,7 @@ applicable agreement for further details. (junction (pt 832 400)) (junction (pt 848 400)) (junction (pt 736 400)) -(junction (pt 1224 368)) (junction (pt 1176 384)) -(junction (pt 1232 464)) -(junction (pt 936 120)) (junction (pt 488 -96)) (junction (pt 976 -64)) (junction (pt 992 -80)) @@ -3881,6 +3890,9 @@ applicable agreement for further details. (junction (pt 1304 -136)) (junction (pt 856 -232)) (junction (pt 208 -248)) +(junction (pt 1024 368)) +(junction (pt 1232 464)) +(junction (pt 1224 368)) (text "B" (rect 504 -208 512 -194)(font "Arial" (font_size 8))) (text "A" (rect 504 -224 513 -210)(font "Arial" (font_size 8))) (text "Q" (rect 504 -184 513 -170)(font "Arial" (font_size 8)))