Update figure of higher-order ALU, and fix some miner spelling mistakes

diff --git a/cλash.lhs b/cλash.lhs
index 3f8507803f854344791797d11fdfa051309a9199..e4a570ed3354d9f8b9af55ab5a34034255f4b3bb 100644 (file)
--- a/cλash.lhs
+++ b/cλash.lhs
@@ -1456,7 +1456,7 @@ cpu (State s) input addrs opc = (State s', out)
               , fu mul            inputs (addrs!3)
               ]
     inputs    =   0 +> (1 +> (input +> s))
-    out       =   head s'
+    out       =   last s
 \end{code}
 \end{minipage}
 \begin{minipage}{0.07\linewidth}

diff --git a/highordcpu.svg b/highordcpu.svg
index d95d658d7611c12d4630a626d76d613c27d3fc64..6d5bee31aab6a9574f7b3ed305d374f482e4d593 100644 (file)
--- a/highordcpu.svg
+++ b/highordcpu.svg
@@ -23,9 +23,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.1964286"
-     inkscape:cx="82.818524"
-     inkscape:cy="113.6145"
+     inkscape:zoom="1.8842873"
+     inkscape:cx="120.61935"
+     inkscape:cy="81.310286"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -147,49 +147,45 @@
        width="231"
        id="rect9258"
        style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" />
-    <g
-       id="g8209"
-       transform="translate(16.500229,0)">
-      <path
-         id="path3366"
-         d="m 391.065,879.80127 -0.112,-33.19995 168.189,0 -0.022,33.19994"
-         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend)"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend)"
-         d="m 396.565,879.80127 -0.181,-37.19995 168.22,0 -0.061,37.19994"
-         id="path3368" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3370"
-         d="m 402.099,879.80127 0,-41.19995 168.00498,0 -0.061,41.19994"
-         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend)" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart)"
-         d="m 407.665,879.80127 0.044,-45.19995 174.66677,0 0,106.79994 -12.133,-0.1"
-         id="path3373" />
-    </g>
+    <path
+       sodipodi:nodetypes="cccc"
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend)"
+       d="m 407.909,879.80127 0,-45.19995 167.73323,0 -0.022,45.19994"
+       id="path3366" />
+    <path
+       id="path3368"
+       d="m 417.875,879.80127 0,-37.19995 168.899,0 0,37.19994"
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend)"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend)"
+       d="m 412.899,879.80127 0,-41.19995 168.275,0 0,41.19994"
+       id="path3370"
+       sodipodi:nodetypes="cccc" />
+    <path
+       id="path3373"
+       d="m 422.987,879.80127 0,-33.19995 175.889,0 0,94.79994 -12.133,-0.1"
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart)"
+       sodipodi:nodetypes="ccccc" />
     <path
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)"
-       d="m 384.165,838.60132 -0.096,-8 174.504,0 0,49.19994"
+       d="m 378.165,838.60132 -0.096,-16 180.504,0 0,57.19994"
        id="path3375"
        sodipodi:nodetypes="cccc" />
     <path
        id="path3377"
-       d="m 378.065,833.30126 -0.0206,-6.69994 186.07961,0 0,53.19994"
+       d="m 384.065,838.50112 -0.0206,-11.8998 180.07961,0 0,53.19994"
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)"
        sodipodi:nodetypes="cccc" />
     <path
        id="path3381"
-       d="m 347.96478,822.60132 222.15922,0 0,57.19994"
+       d="m 347.96478,830.60132 222.15922,0 0,49.19994"
        style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)"
        sodipodi:nodetypes="ccc" />
     <path
        sodipodi:nodetypes="ccc"
        id="path3197"
-       d="m 418.12999,941.60132 12.99001,0 0,-94.7"
+       d="m 418.12999,941.60132 12.99001,0 0,-106.7"
        style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:none" />
     <rect
        style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
@@ -245,7 +241,7 @@
        style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
     <g
        id="g8349"
-       transform="translate(-22,0)">
+       transform="matrix(-1,0,0,1,815.24,0)">
       <g
          id="g8323">
         <path
@@ -313,7 +309,7 @@
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:none"
-       d="m 474.12999,941.60132 12.99001,0 0,-98.7"
+       d="m 474.12999,941.60132 12.99001,0 0,-102.7"
        id="path5237"
        sodipodi:nodetypes="ccc" />
     <rect
@@ -370,7 +366,7 @@
        sodipodi:nodetypes="cc" />
     <g
        id="g8263"
-       transform="translate(16.500229,0)">
+       transform="matrix(-1,0,0,1,927.24023,0)">
       <g
          id="g5255"
          transform="translate(283.4,190.70953)">
@@ -448,7 +444,7 @@
     </g>
     <g
        id="g8338"
-       transform="translate(-22,0)">
+       transform="matrix(-1,0,0,1,927.24,0)">
       <g
          id="g8311">
         <path
@@ -561,7 +557,7 @@
        transform="translate(16.4,0)">
       <path
          style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
-         d="m 575.62,834.60132 0,45.2"
+         d="m 575.62,846.60132 0,33.2"
          id="path5319"
          sodipodi:nodetypes="cc" />
       <path
@@ -573,11 +569,11 @@
          sodipodi:rx="5.4800777"
          sodipodi:ry="5.4800777"
          d="m -46.315493,32.435127 c 0,3.026564 -2.453514,5.480078 -5.480077,5.480078 -3.026564,0 -5.480078,-2.453514 -5.480078,-5.480078 0,-3.026563 2.453514,-5.480077 5.480078,-5.480077 3.026563,0 5.480077,2.453514 5.480077,5.480077 z"
-         transform="matrix(0.31195247,0,0,0.31195247,591.83726,824.43354)" />
+         transform="matrix(0.31195247,0,0,0.31195247,591.83726,836.43354)" />
     </g>
     <path
        style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:none"
-       d="m 530.12999,941.60132 12.99001,0 0,-102.7"
+       d="m 530.12999,941.60132 12.99001,0 0,-98.7"
        id="path5337"
        sodipodi:nodetypes="ccc" />
     <rect
@@ -634,7 +630,7 @@
        sodipodi:nodetypes="cc" />
     <g
        id="g8277"
-       transform="translate(16.500229,0)">
+       transform="matrix(-1,0,0,1,1039.2402,0)">
       <g
          id="g5355"
          transform="translate(339.4,190.70953)">
@@ -712,7 +708,7 @@
     </g>
     <g
        id="g8327"
-       transform="translate(-22,0)">
+       transform="matrix(-1,0,0,1,1039.24,0)">
       <g
          id="g8291">
         <path
@@ -816,7 +812,7 @@
     <path
        sodipodi:nodetypes="cc"
        id="path7223"
-       d="m 576.46904,917.46097 38,0"
+       d="m 598.46904,941.46097 16,0"
        style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
     <path
        sodipodi:type="arc"
@@ -827,7 +823,7 @@
        sodipodi:rx="5.4800777"
        sodipodi:ry="5.4800777"
        d="m -46.315493,32.435127 c 0,3.026564 -2.453514,5.480078 -5.480077,5.480078 -3.026564,0 -5.480078,-2.453514 -5.480078,-5.480078 0,-3.026563 2.453514,-5.480077 5.480078,-5.480077 3.026563,0 5.480077,2.453514 5.480077,5.480077 z"
-       transform="matrix(0.31195247,0,0,0.31195247,591.93726,907.33355)" />
+       transform="matrix(0.31195247,0,0,0.31195247,614.93726,931.33355)" />
     <path
        sodipodi:type="arc"
        style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
@@ -837,9 +833,9 @@
        sodipodi:rx="5.4800777"
        sodipodi:ry="5.4800777"
        d="m -46.315493,32.435127 c 0,3.026564 -2.453514,5.480078 -5.480077,5.480078 -3.026564,0 -5.480078,-2.453514 -5.480078,-5.480078 0,-3.026563 2.453514,-5.480077 5.480078,-5.480077 3.026563,0 5.480077,2.453514 5.480077,5.480077 z"
-       transform="matrix(0.31195247,0,0,0.31195247,447.28726,836.4831)" />
+       transform="matrix(0.31195247,0,0,0.31195247,447.28726,824.4831)" />
     <path
-       transform="matrix(0.31195247,0,0,0.31195247,503.28726,832.4831)"
+       transform="matrix(0.31195247,0,0,0.31195247,503.28726,828.4831)"
        d="m -46.315493,32.435127 c 0,3.026564 -2.453514,5.480078 -5.480077,5.480078 -3.026564,0 -5.480078,-2.453514 -5.480078,-5.480078 0,-3.026563 2.453514,-5.480077 5.480078,-5.480077 3.026563,0 5.480077,2.453514 5.480077,5.480077 z"
        sodipodi:ry="5.4800777"
        sodipodi:rx="5.4800777"
@@ -857,7 +853,7 @@
        sodipodi:rx="5.4800777"
        sodipodi:ry="5.4800777"
        d="m -46.315493,32.435127 c 0,3.026564 -2.453514,5.480078 -5.480077,5.480078 -3.026564,0 -5.480078,-2.453514 -5.480078,-5.480078 0,-3.026563 2.453514,-5.480077 5.480078,-5.480077 3.026563,0 5.480077,2.453514 5.480077,5.480077 z"
-       transform="matrix(0.31195247,0,0,0.31195247,559.28726,828.4831)" />
+       transform="matrix(0.31195247,0,0,0.31195247,559.28726,832.4831)" />
     <path
        sodipodi:nodetypes="cc"
        id="path8366"
@@ -903,7 +899,7 @@
        font-style="normal"
        stroke-miterlimit="10.433"
        xml:space="preserve"
-       transform="matrix(1,0,0,-1,125.08119,1476.4737)"
+       transform="matrix(1,0,0,-1,125.08119,1484.4737)"
        id="g8796">
 <path
    id="path8798"
@@ -977,7 +973,7 @@
        font-style="normal"
        stroke-miterlimit="10.433"
        xml:space="preserve"
-       transform="matrix(1,0,0,-1,158.33474,1503.2669)"
+       transform="matrix(1,0,0,-1,152.33474,1503.5671)"
        id="g9419">
 <path
    style="fill:#000000;stroke-width:0"
@@ -985,7 +981,7 @@
    d="m 228.01,660.42 0,0.15 0,0.15 0,0.15 -0.01,0.15 -0.01,0.15 -0.01,0.14 -0.01,0.15 -0.02,0.15 -0.03,0.15 -0.02,0.14 -0.04,0.15 -0.03,0.14 -0.05,0.14 -0.05,0.14 -0.05,0.14 -0.03,0.07 -0.03,0.07 c -0.46,0.96 -1.28,1.12 -1.7,1.12 -0.6,0 -1.32,-0.26 -1.73,-1.19 -0.32,-0.69 -0.37,-1.46 -0.37,-2.26 0,-0.75 0.04,-1.64 0.45,-2.4 0.43,-0.81 1.16,-1.01 1.64,-1.01 v 0.22 c -0.39,0 -0.97,0.25 -1.15,1.21 -0.11,0.6 -0.11,1.51 -0.11,2.1 0,0.64 0,1.3 0.08,1.83 0.19,1.19 0.93,1.28 1.18,1.28 0.33,0 0.99,-0.18 1.18,-1.17 0.1,-0.56 0.1,-1.31 0.1,-1.94 0,-0.75 0,-1.43 -0.11,-2.06 -0.15,-0.95 -0.72,-1.25 -1.17,-1.25 h 0 v -0.22 c 0.54,0 1.3,0.21 1.74,1.16 0.31,0.69 0.36,1.46 0.36,2.25 z" />
 </g>    <g
        id="g9731"
-       transform="matrix(1,0,0,-1,152.13,1498.0902)"
+       transform="matrix(1,0,0,-1,158.13,1503.6771)"
        xml:space="preserve"
        stroke-miterlimit="10.433"
        font-style="normal"