TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-15 15:58:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed the ALU shape

Browse Source
This commit is contained in:
hneemann 2018-12-03 10:54:27 +01:00
parent 641dca22da
commit 0c36b048a7
3 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/dig/processor/ALU/ALU.dig
View File

@ -29,63 +29,63 @@ bei der Speicheradressierung verwendet.}}</string>
<entry> <entry>
<string>A</string> <string>A</string>
<pin> <pin>
<pos x="0" y="-20"/> <pos x="0" y="0"/>
<showLabel>false</showLabel> <showLabel>false</showLabel>
</pin> </pin>
</entry> </entry>
<entry> <entry>
<string>Op</string> <string>Op</string>
<pin> <pin>
<pos x="60" y="80"/> <pos x="60" y="100"/>
<showLabel>false</showLabel> <showLabel>false</showLabel>
</pin> </pin>
</entry> </entry>
<entry> <entry>
<string>Neg</string> <string>Neg</string>
<pin> <pin>
<pos x="80" y="40"/> <pos x="80" y="60"/>
<showLabel>false</showLabel> <showLabel>false</showLabel>
</pin> </pin>
</entry> </entry>
<entry> <entry>
<string>B</string> <string>B</string>
<pin> <pin>
<pos x="0" y="80"/> <pos x="0" y="100"/>
<showLabel>false</showLabel> <showLabel>false</showLabel>
</pin> </pin>
</entry> </entry>
<entry> <entry>
<string>Zero</string> <string>Zero</string>
<pin> <pin>
<pos x="80" y="20"/> <pos x="80" y="40"/>
<showLabel>false</showLabel> <showLabel>false</showLabel>
</pin> </pin>
</entry> </entry>
<entry> <entry>
<string>Ci</string> <string>Ci</string>
<pin> <pin>
<pos x="0" y="100"/> <pos x="0" y="120"/>
<showLabel>false</showLabel> <showLabel>false</showLabel>
</pin> </pin>
</entry> </entry>
<entry> <entry>
<string>Carry</string> <string>Carry</string>
<pin> <pin>
<pos x="80" y="60"/> <pos x="80" y="80"/>
<showLabel>false</showLabel> <showLabel>false</showLabel>
</pin> </pin>
</entry> </entry>
<entry> <entry>
<string>Y</string> <string>Y</string>
<pin> <pin>
<pos x="80" y="0"/> <pos x="80" y="20"/>
<showLabel>false</showLabel> <showLabel>false</showLabel>
</pin> </pin>
</entry> </entry>
</pins> </pins>
<drawables> <drawables>
<poly> <poly>
<poly path="M 0,-50 L 80,-10 L 80,70 L 0,110 L 0,40 L 30,30 L 0,20 Z" evenOdd="false"/> <poly path="M 0,-30 L 80,10 L 80,90 L 0,130 L 0,60 L 30,50 L 0,40 Z" evenOdd="false"/>
<thickness>4</thickness> <thickness>4</thickness>
<filled>true</filled> <filled>true</filled>
<color> <color>
@ -107,8 +107,8 @@ bei der Speicheradressierung verwendet.}}</string>
</color> </color>
</poly> </poly>
<text> <text>
<p1 x="4" y="-15"/> <p1 x="4" y="6"/>
<p2 x="5" y="-15"/> <p2 x="5" y="6"/>
<text>A</text> <text>A</text>
<orientation>LEFTBOTTOM</orientation> <orientation>LEFTBOTTOM</orientation>
<size>18</size> <size>18</size>
@ -120,8 +120,8 @@ bei der Speicheradressierung verwendet.}}</string>
</color> </color>
</text> </text>
<text> <text>
<p1 x="4" y="86"/> <p1 x="4" y="106"/>
<p2 x="5" y="86"/> <p2 x="5" y="106"/>
<text>B</text> <text>B</text>
<orientation>LEFTBOTTOM</orientation> <orientation>LEFTBOTTOM</orientation>
<size>18</size> <size>18</size>
@ -133,8 +133,8 @@ bei der Speicheradressierung verwendet.}}</string>
</color> </color>
</text> </text>
<text> <text>
<p1 x="23" y="82"/> <p1 x="23" y="102"/>
<p2 x="24" y="82"/> <p2 x="24" y="102"/>
<text>Op</text> <text>Op</text>
<orientation>LEFTBOTTOM</orientation> <orientation>LEFTBOTTOM</orientation>
<size>18</size> <size>18</size>
@ -146,8 +146,8 @@ bei der Speicheradressierung verwendet.}}</string>
</color> </color>
</text> </text>
<text> <text>
<p1 x="4" y="105"/> <p1 x="4" y="126"/>
<p2 x="5" y="105"/> <p2 x="5" y="126"/>
<text>Ci</text> <text>Ci</text>
<orientation>LEFTBOTTOM</orientation> <orientation>LEFTBOTTOM</orientation>
<size>18</size> <size>18</size>
@ -159,8 +159,8 @@ bei der Speicheradressierung verwendet.}}</string>
</color> </color>
</text> </text>
<text> <text>
<p1 x="76" y="6"/> <p1 x="76" y="27"/>
<p2 x="77" y="6"/> <p2 x="77" y="27"/>
<text>Y</text> <text>Y</text>
<orientation>RIGHTBOTTOM</orientation> <orientation>RIGHTBOTTOM</orientation>
<size>18</size> <size>18</size>
@ -172,8 +172,8 @@ bei der Speicheradressierung verwendet.}}</string>
</color> </color>
</text> </text>
<text> <text>
<p1 x="76" y="26"/> <p1 x="76" y="47"/>
<p2 x="77" y="26"/> <p2 x="77" y="47"/>
<text>Zero</text> <text>Zero</text>
<orientation>RIGHTBOTTOM</orientation> <orientation>RIGHTBOTTOM</orientation>
<size>18</size> <size>18</size>
@ -185,8 +185,8 @@ bei der Speicheradressierung verwendet.}}</string>
</color> </color>
</text> </text>
<text> <text>
<p1 x="76" y="46"/> <p1 x="76" y="67"/>
<p2 x="77" y="46"/> <p2 x="77" y="67"/>
<text>Neg</text> <text>Neg</text>
<orientation>RIGHTBOTTOM</orientation> <orientation>RIGHTBOTTOM</orientation>
<size>18</size> <size>18</size>
@ -198,8 +198,8 @@ bei der Speicheradressierung verwendet.}}</string>
</color> </color>
</text> </text>
<text> <text>
<p1 x="76" y="66"/> <p1 x="76" y="87"/>
<p2 x="77" y="66"/> <p2 x="77" y="87"/>
<text>Carry</text> <text>Carry</text>
<orientation>RIGHTBOTTOM</orientation> <orientation>RIGHTBOTTOM</orientation>
<size>18</size> <size>18</size>

25
src/main/dig/processor/ALU/ALU.svg
View File

@ -29,8 +29,8 @@
showgrid="true" showgrid="true"
id="namedview4" id="namedview4"
inkscape:zoom="3.5454545" inkscape:zoom="3.5454545"
inkscape:cx="121.41026" inkscape:cx="120"
inkscape:cy="110" inkscape:cy="87.435899"
inkscape:window-width="1680" inkscape:window-width="1680"
inkscape:window-height="1002" inkscape:window-height="1002"
inkscape:window-x="0" inkscape:window-x="0"
@ -46,13 +46,12 @@
</sodipodi:namedview> </sodipodi:namedview>
<path <path
style="fill:#ffffb4;fill-opacity:0.78431373;stroke:#000000;stroke-width:3" style="fill:#ffffb4;fill-opacity:0.78431373;stroke:#000000;stroke-width:3"
d="m 0,-50 80,40 V 70 L 0,110 V 40 L 30,30 0,20 Z" d="M 0,-30 80,10 V 90 L 0,130 V 60 L 30,50 0,40 Z"
id="rect6" id="rect6"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc" /> sodipodi:nodetypes="cccccccc" />
<g <g
id="g11" id="g11">
transform="translate(0,-20.589744)">
<circle <circle
id="pin:A" id="pin:A"
cx="0" cx="0"
@ -68,7 +67,7 @@
</g> </g>
<g <g
id="g16" id="g16"
transform="translate(0.28205128,59.512821)"> transform="translate(0.28205128,80.102565)">
<circle <circle
id="pin:B" id="pin:B"
cx="0" cx="0"
@ -85,18 +84,18 @@
<circle <circle
style="fill:#0000b2" style="fill:#0000b2"
r="3" r="3"
cy="79.886063" cy="100.47581"
cx="59.743538" cx="59.743538"
id="pin:Op" /> id="pin:Op" />
<text <text
style="font-size:17px;fill:#808080" style="font-size:17px;fill:#808080"
id="text19" id="text19"
y="81.598099" y="102.18784"
x="22.559103" x="22.559103"
font-size="17">Op</text> font-size="17">Op</text>
<g <g
id="g26" id="g26"
transform="translate(-0.28205129,39.48718)"> transform="translate(-0.28205129,60.076924)">
<circle <circle
id="pin:Ci" id="pin:Ci"
cx="0" cx="0"
@ -112,7 +111,7 @@
</g> </g>
<g <g
id="g31" id="g31"
transform="translate(-2.5641015e-8,0.28205128)"> transform="translate(-2.5641015e-8,20.871795)">
<circle <circle
id="pin:Y" id="pin:Y"
cx="80" cx="80"
@ -128,7 +127,7 @@
</g> </g>
<g <g
id="g36" id="g36"
transform="translate(-2.5641015e-8,0.28205128)"> transform="translate(-2.5641015e-8,20.871795)">
<circle <circle
id="pin:Zero" id="pin:Zero"
cx="80" cx="80"
@ -144,7 +143,7 @@
</g> </g>
<g <g
id="g41" id="g41"
transform="translate(-2.5641015e-8,0.28205128)"> transform="translate(-2.5641015e-8,20.871795)">
<circle <circle
id="pin:Neg" id="pin:Neg"
cx="80" cx="80"
@ -160,7 +159,7 @@
</g> </g>
<g <g
id="g46" id="g46"
transform="translate(-2.5641015e-8,0.28205128)"> transform="translate(-2.5641015e-8,20.871795)">
<circle <circle
id="pin:Carry" id="pin:Carry"
cx="80" cx="80"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

2
src/main/dig/processor/Processor.dig
View File

@ -107,7 +107,7 @@ Single-Cycle CPU.}}</string>
<visualElement> <visualElement>
<elementName>ALU.dig</elementName> <elementName>ALU.dig</elementName>
<elementAttributes/> <elementAttributes/>
<pos x="1080" y="100"/> <pos x="1080" y="80"/>
</visualElement> </visualElement>
<visualElement> <visualElement>
<elementName>Driver</elementName> <elementName>Driver</elementName>