0.3 release

jamesjiang52 · Jan 27, 2019 · dabe8f5 · dabe8f5
1 parent aa91c53
commit dabe8f5
Show file tree

Hide file tree

Showing 32 changed files with 139 additions and 70 deletions.
diff --git a/bitwise/_version.py b/bitwise/_version.py
@@ -1 +1 @@
-__version__ = "0.2"
+__version__ = "0.3"
diff --git a/bitwise/processor/PROC.py b/bitwise/processor/PROC.py
@@ -103,9 +103,10 @@ def __init__(self, clock, instruction, instruction_available, data):
         p = Wire()
         q = Wire()
 
-        self.datapath = _ProcessorDatapath(
+        self.controlpath = _ProcessorControlpath(
             clock,
-            data,
+            instruction,
+            instruction_available,
             extern,
             reg_0_in,
             reg_0_out,
@@ -123,10 +124,9 @@ def __init__(self, clock, instruction, instruction_available, data):
             q
         )
 
-        self.controlpath = _ProcessorControlpath(
+        self.datapath = _ProcessorDatapath(
             clock,
-            instruction,
-            instruction_available,
+            data,
             extern,
             reg_0_in,
             reg_0_out,
@@ -332,6 +332,8 @@ def __init__(
         and_T1_A__or_I1_to_I12_4 = Bus4()
         and_T2_B__or_I2_to_I10_4 = Bus4()
 
+        state.RingCounter4(vcc, clear_n, clock, T_reversed)
+
         _Register10(instruction, func_reg_in, clock, instruction_reg)
 
         signal.Decoder1Of16(vcc, op, I_reversed)
@@ -383,8 +385,6 @@ def __init__(
         gate.ANDGate2(clock, aclear, clear)
         gate.NOTGate(clear, clear_n)
 
-        state.RingCounter4(vcc, clear_n, clock, T_reversed)
-
         gate.Buffer(and_T1_I7, alu_function_select[3])
 
         gate.ORGate2(and_T2__or_I2_I4_I6, and_T1_I7, alu_function_select[2])

diff --git a/docs/_build/doctrees/api.doctree b/docs/_build/doctrees/api.doctree
diff --git a/docs/_build/doctrees/arithmetic.doctree b/docs/_build/doctrees/arithmetic.doctree
diff --git a/docs/_build/doctrees/changelog.doctree b/docs/_build/doctrees/changelog.doctree
diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
diff --git a/docs/_build/doctrees/gate.doctree b/docs/_build/doctrees/gate.doctree
diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree
diff --git a/docs/_build/doctrees/install.doctree b/docs/_build/doctrees/install.doctree
diff --git a/docs/_build/doctrees/logic.doctree b/docs/_build/doctrees/logic.doctree
diff --git a/docs/_build/doctrees/signal.doctree b/docs/_build/doctrees/signal.doctree
diff --git a/docs/_build/doctrees/state.doctree b/docs/_build/doctrees/state.doctree
diff --git a/docs/_build/doctrees/storage.doctree b/docs/_build/doctrees/storage.doctree
diff --git a/docs/_build/doctrees/wire.doctree b/docs/_build/doctrees/wire.doctree
diff --git a/docs/_build/html/_sources/install.rst.txt b/docs/_build/html/_sources/install.rst.txt
@@ -25,7 +25,7 @@ If there are no errors, you can open a Python session and verify the installatio
 
     >> import bitwise as bw
     >> bw.__version__
-    '0.1.1'
+    '0.3'
     
 Refer to the :doc:`changelog <changelog>` for version details. In this documentation, it is canonical to have imported Bitwise as ``bw``.
 

diff --git a/docs/_build/html/_static/alabaster.css b/docs/_build/html/_static/alabaster.css
@@ -1,61 +1,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 @import url("basic.css");
 
 /* -- page layout ----------------------------------------------------------- */
 
 body {
-    font-family: 'goudy old style', 'minion pro', 'bell mt', Georgia, 'Hiragino Mincho Pro', serif;
+    font-family: Georgia, serif;
     font-size: 17px;
     background-color: #fff;
     color: #000;
@@ -159,7 +107,7 @@ div.sphinxsidebarwrapper p.blurb {
 
 div.sphinxsidebar h3,
 div.sphinxsidebar h4 {
-    font-family: 'Garamond', 'Georgia', serif;
+    font-family: Georgia, serif;
     color: #444;
     font-size: 24px;
     font-weight: normal;
@@ -203,7 +151,7 @@ div.sphinxsidebar ul li.toctree-l2 > a {
 
 div.sphinxsidebar input {
     border: 1px solid #CCC;
-    font-family: 'goudy old style', 'minion pro', 'bell mt', Georgia, 'Hiragino Mincho Pro', serif;
+    font-family: Georgia, serif;
     font-size: 1em;
 }
 
@@ -218,6 +166,19 @@ div.sphinxsidebar hr {
     width: 50%;
 }
 
+div.sphinxsidebar .badge {
+    border-bottom: none;
+}
+
+div.sphinxsidebar .badge:hover {
+    border-bottom: none;
+}
+
+/* To address an issue with donation coming after search */
+div.sphinxsidebar h3.donation {
+    margin-top: 10px;
+}
+
 /* -- body styles ----------------------------------------------------------- */
 
 a {
@@ -236,7 +197,7 @@ div.body h3,
 div.body h4,
 div.body h5,
 div.body h6 {
-    font-family: 'Garamond', 'Georgia', serif;
+    font-family: Georgia, serif;
     font-weight: normal;
     margin: 30px 0px 10px 0px;
     padding: 0;
@@ -277,7 +238,7 @@ div.admonition tt.xref, div.admonition code.xref, div.admonition a tt {
 }
 
 div.admonition p.admonition-title {
-    font-family: 'Garamond', 'Georgia', serif;
+    font-family: Georgia, serif;
     font-weight: normal;
     font-size: 24px;
     margin: 0 0 10px 0;
@@ -366,7 +327,7 @@ p.admonition-title:after {
 }
 
 pre, tt, code {
-    font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+    font-family: 'Consolas', 'Menlo', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
     font-size: 0.9em;
 }
 
@@ -696,4 +657,51 @@ table.docutils.citation, table.docutils.citation td, table.docutils.citation th
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
+}
+
+
+/* relbar */
+
+.related {
+    line-height: 30px;
+    width: 100%;
+    font-size: 0.9rem;
+}
+
+.related.top {
+    border-bottom: 1px solid #EEE;
+    margin-bottom: 20px;
+}
+
+.related.bottom {
+    border-top: 1px solid #EEE;
+}
+
+.related ul {
+    padding: 0;
+    margin: 0;
+    list-style: none;
+}
+
+.related li {
+    display: inline;
+}
+
+nav#rellinks {
+    float: right;
+}
+
+nav#rellinks li+li:before {
+    content: "|";
+}
+
+nav#breadcrumbs li+li:before {
+    content: "\00BB";
+}
+
+/* Hide certain items when printing */
+@media print {
+    div.related {
+        display: none;
+    }
 }
diff --git a/docs/_build/html/api.html b/docs/_build/html/api.html
@@ -100,6 +100,8 @@ <h3>Quick search</h3>
       </div>
       <div class="documentwrapper">
         <div class="bodywrapper">
+
+
           <div class="body" role="main">
 
   <div class="section" id="api-documentation">
@@ -260,6 +262,7 @@ <h2><a class="reference internal" href="wire.html"><span class="doc">Wire</span>
 
 
           </div>
+
         </div>
       </div>
     <div class="clearer"></div>

diff --git a/docs/_build/html/arithmetic.html b/docs/_build/html/arithmetic.html
@@ -104,6 +104,8 @@ <h3>Quick search</h3>
       </div>
       <div class="documentwrapper">
         <div class="bodywrapper">
+
+
           <div class="body" role="main">
 
   <div class="section" id="arithmetic">
@@ -503,6 +505,7 @@ <h4>Raises:</h4>
 
 
           </div>
+
         </div>
       </div>
     <div class="clearer"></div>

diff --git a/docs/_build/html/changelog.html b/docs/_build/html/changelog.html
@@ -96,6 +96,8 @@ <h3>Quick search</h3>
       </div>
       <div class="documentwrapper">
         <div class="bodywrapper">
+
+
           <div class="body" role="main">
 
   <div class="section" id="changelog">
@@ -250,6 +252,7 @@ <h3>Changed</h3>
 
 
           </div>
+
         </div>
       </div>
     <div class="clearer"></div>

diff --git a/docs/_build/html/gate.html b/docs/_build/html/gate.html
@@ -110,6 +110,8 @@ <h3>Quick search</h3>
       </div>
       <div class="documentwrapper">
         <div class="bodywrapper">
+
+
           <div class="body" role="main">
 
   <div class="section" id="gate">
@@ -597,6 +599,7 @@ <h4>Args:</h4>
 
 
           </div>
+
         </div>
       </div>
     <div class="clearer"></div>

diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html
@@ -85,6 +85,8 @@ <h3>Quick search</h3>
       </div>
       <div class="documentwrapper">
         <div class="bodywrapper">
+
+
           <div class="body" role="main">
 
 
@@ -96,6 +98,7 @@ <h1 id="index">Index</h1>
 
 
           </div>
+
         </div>
       </div>
     <div class="clearer"></div>

diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
@@ -93,6 +93,8 @@ <h3>Quick search</h3>
       </div>
       <div class="documentwrapper">
         <div class="bodywrapper">
+
+
           <div class="body" role="main">
 
   <div class="toctree-wrapper compound">
@@ -153,6 +155,7 @@ <h2>Quick Example</h2>
 
 
           </div>
+
         </div>
       </div>
     <div class="clearer"></div>

diff --git a/docs/_build/html/install.html b/docs/_build/html/install.html
@@ -103,6 +103,8 @@ <h3>Quick search</h3>
       </div>
       <div class="documentwrapper">
         <div class="bodywrapper">
+
+
           <div class="body" role="main">
 
   <div class="section" id="getting-started">
@@ -122,7 +124,7 @@ <h2>Installation</h2>
 <p>If there are no errors, you can open a Python session and verify the installation by checking the version number:</p>
 <div class="highlight-none"><div class="highlight"><pre><span></span>&gt;&gt; import bitwise as bw
 &gt;&gt; bw.__version__
-&#39;0.1.1&#39;
+&#39;0.3&#39;
 </pre></div>
 </div>
 <p>Refer to the <a class="reference internal" href="changelog.html"><span class="doc">changelog</span></a> for version details. In this documentation, it is canonical to have imported Bitwise as <code class="docutils literal"><span class="pre">bw</span></code>.</p>
@@ -392,6 +394,7 @@ <h2>Issues</h2>
 
 
           </div>
+
         </div>
       </div>
     <div class="clearer"></div>

diff --git a/docs/_build/html/logic.html b/docs/_build/html/logic.html
@@ -123,6 +123,8 @@ <h3>Quick search</h3>
       </div>
       <div class="documentwrapper">
         <div class="bodywrapper">
+
+
           <div class="body" role="main">
 
   <div class="section" id="logic">
@@ -1121,6 +1123,7 @@ <h4>Raises:</h4>
 
 
           </div>
+
         </div>
       </div>
     <div class="clearer"></div>

diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html
@@ -82,6 +82,8 @@ <h3>Navigation</h3>
       </div>
       <div class="documentwrapper">
         <div class="bodywrapper">
+
+
           <div class="body" role="main">
 
   <h1 id="search-documentation">Search</h1>
@@ -109,6 +111,7 @@ <h1 id="search-documentation">Search</h1>
   </div>
 
           </div>
+
         </div>
       </div>
     <div class="clearer"></div>