diff --git a/instructions.xlsx b/instructions.xlsx index f51f05f..44d3e27 100644 Binary files a/instructions.xlsx and b/instructions.xlsx differ diff --git a/machine_alpha/machine_alpha.bdf b/machine_alpha/machine_alpha.bdf index eecd854..bbe069f 100644 --- a/machine_alpha/machine_alpha.bdf +++ b/machine_alpha/machine_alpha.bdf @@ -124,7 +124,7 @@ applicable agreement for further details. ) (pin (input) - (rect 2128 1312 2296 1328) + (rect 1920 1312 2088 1328) (text "INPUT" (rect 133 0 161 10)(font "Arial" (font_size 6))) (text "uIR7" (rect 5 0 28 12)(font "Arial" )) (pt 168 8) @@ -3145,6 +3145,31 @@ applicable agreement for further details. (rectangle (rect 16 16 112 400)(line_width 1)) ) ) +(symbol + (rect 2176 1304 2224 1336) + (text "NOT" (rect 1 0 21 10)(font "Arial" (font_size 6))) + (text "inst3" (rect 3 21 26 33)(font "Arial" )) + (port + (pt 0 16) + (input) + (text "IN" (rect 2 7 13 19)(font "Courier New" (bold))(invisible)) + (text "IN" (rect 2 7 13 19)(font "Courier New" (bold))(invisible)) + (line (pt 0 16)(pt 13 16)(line_width 1)) + ) + (port + (pt 48 16) + (output) + (text "OUT" (rect 32 7 49 19)(font "Courier New" (bold))(invisible)) + (text "OUT" (rect 32 7 49 19)(font "Courier New" (bold))(invisible)) + (line (pt 39 16)(pt 48 16)(line_width 1)) + ) + (drawing + (line (pt 13 25)(pt 13 7)(line_width 1)) + (line (pt 13 7)(pt 31 16)(line_width 1)) + (line (pt 13 25)(pt 31 16)(line_width 1)) + (circle (rect 31 12 39 20)(line_width 1)) + ) +) (connector (pt 2952 1408) (pt 3016 1408) @@ -4393,14 +4418,6 @@ applicable agreement for further details. (pt 2840 1072) (color 0 0 0) ) -(connector - (pt 2328 1416) - (pt 2328 1320) -) -(connector - (pt 2328 1320) - (pt 2296 1320) -) (connector (pt 3160 896) (pt 3000 896) @@ -5315,6 +5332,18 @@ applicable agreement for further details. (pt 800 216) (pt 848 216) ) +(connector + (pt 2328 1416) + (pt 2328 1320) +) +(connector + (pt 2088 1320) + (pt 2176 1320) +) +(connector + (pt 2224 1320) + (pt 2328 1320) +) (junction (pt 2856 1120)) (junction (pt 2872 1136)) (junction (pt 2888 1152)) @@ -5396,15 +5425,15 @@ applicable agreement for further details. (text "Clock" (rect 1544 408 1647 444)(font "Arial" (color 0 128 0)(font_size 24)(bold_italic))) (text "Clear" (rect 1544 312 1638 348)(font "Arial" (color 0 0 0)(font_size 24)(bold_italic))) (text "BUS: Data from Z" (rect 1992 1232 2305 1268)(font "Arial" (color 128 0 128)(font_size 24)(bold_italic))) -(text "BUS: Data from MDR" (rect 1992 648 2368 684)(font "Arial" (color 128 0 128)(font_size 24)(bold_italic))) (text "BUS: Data from PC" (rect 1000 2144 1342 2180)(font "Arial" (color 128 0 128)(font_size 24)(bold_italic))) (text "BUS: Data from General Registers" (rect 832 1776 1447 1812)(font "Arial" (color 128 0 128)(font_size 24)(bold_italic))) (text "Clock" (rect 1544 200 1647 236)(font "Arial" (color 0 128 0)(font_size 24)(bold_italic))) (text "Clock" (rect 1076 576 1112 679)(font "Arial" (color 0 128 0)(font_size 24)(bold_italic))(vertical)) (text "Clear" (rect 1196 574 1232 668)(font "Arial" (color 0 0 0)(font_size 24)(bold_italic))(vertical)) -(rectangle (rect 408 864 1640 1776)(color 255 70 153)(line_width 5)(fill (color 255 225 239))) -(rectangle (rect 2848 840 3536 1480)(color 255 152 60)(line_width 5)(fill (color 255 235 217))) -(rectangle (rect 2848 1488 3488 1856)(color 106 200 255)(line_width 5)(fill (color 208 238 255))) -(rectangle (rect 448 176 1032 648)(color 106 200 255)(line_width 5)(fill (color 208 238 255))) -(rectangle (rect 1656 1392 2312 1792)(color 22 254 162)(line_width 5)(fill (color 174 255 223))) -(rectangle (rect 2320 1248 2832 1792)(color 130 94 255)(line_width 5)(fill (color 237 232 255))) +(text "BUS: Data from MDR" (rect 1992 648 2368 684)(font "Arial" (color 128 0 128)(font_size 24)(bold_italic))) +(rectangle (rect 2848 840 3536 1480)(color 255 152 60)(line_width 5)) +(rectangle (rect 2848 1488 3488 1856)(color 106 200 255)(line_width 5)) +(rectangle (rect 2320 1248 2832 1792)(color 130 94 255)(line_width 5)) +(rectangle (rect 1656 1392 2312 1792)(color 22 254 162)(line_width 5)) +(rectangle (rect 408 864 1640 1776)(color 255 70 153)(line_width 5)) +(rectangle (rect 448 176 1032 648)(color 106 200 255)(line_width 5))