From c336ca328f97df3ca194ac428d4ec3788eeb049f Mon Sep 17 00:00:00 2001
From: Alessandro Mauri <alemauri001@gmail.com>
Date: Sat, 29 Oct 2022 23:29:17 +0200
Subject: [PATCH] Sat Oct 29 11:29:17 PM CEST 2022

---
 INSTRUCTIONS.md | 15 +++++++++++++
 alu.dig         | 12 ++---------
 registers.dig   | 56 ++++++++++++++++++++++++++++++-------------------
 3 files changed, 52 insertions(+), 31 deletions(-)
 create mode 100644 INSTRUCTIONS.md

diff --git a/INSTRUCTIONS.md b/INSTRUCTIONS.md
new file mode 100644
index 0000000..bc6d726
--- /dev/null
+++ b/INSTRUCTIONS.md
@@ -0,0 +1,15 @@
+# RISC combined instruction set
+
+goal: a semi-efficient insatruction set that offers few instructions that offer
+the combined functions of conventional risc instuctions.
+
+as such most instructions could be pipelined, I don't know how to feel about that
+
+| mnemonic   | function       | opcode |
+|------------|----------------|--------|
+| Arithmetic |                |        |
+|------------|----------------|--------|
+| Memory     |                |        |
+|------------|----------------|--------|
+| LD Rd, Ra:Rb|
+| ST         |
diff --git a/alu.dig b/alu.dig
index b32a592..99aea1f 100644
--- a/alu.dig
+++ b/alu.dig
@@ -11,24 +11,16 @@
     <visualElement>
       <elementName>Add</elementName>
       <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>ADD/C</string>
-        </entry>
         <entry>
           <string>Bits</string>
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="420" y="340"/>
+      <pos x="420" y="360"/>
     </visualElement>
     <visualElement>
       <elementName>Sub</elementName>
       <elementAttributes>
-        <entry>
-          <string>Label</string>
-          <string>SUB/C</string>
-        </entry>
         <entry>
           <string>Bits</string>
           <int>16</int>
@@ -39,7 +31,7 @@
     <visualElement>
       <elementName>signed_mul.dig</elementName>
       <elementAttributes/>
-      <pos x="420" y="220"/>
+      <pos x="420" y="240"/>
     </visualElement>
   </visualElements>
   <wires/>
diff --git a/registers.dig b/registers.dig
index 041f198..c43af62 100644
--- a/registers.dig
+++ b/registers.dig
@@ -466,7 +466,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>RE</string>
+          <string>W</string>
         </entry>
       </elementAttributes>
       <pos x="-360" y="460"/>
@@ -528,7 +528,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>Rd</string>
+          <string>Ra</string>
         </entry>
         <entry>
           <string>Bits</string>
@@ -542,7 +542,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>Rr</string>
+          <string>Rb</string>
         </entry>
         <entry>
           <string>Bits</string>
@@ -556,24 +556,24 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>DS</string>
+          <string>Sa</string>
         </entry>
         <entry>
           <string>Bits</string>
           <int>5</int>
         </entry>
       </elementAttributes>
-      <pos x="-360" y="840"/>
+      <pos x="-360" y="980"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>ds</string>
+          <string>sa</string>
         </entry>
       </elementAttributes>
-      <pos x="-120" y="840"/>
+      <pos x="-120" y="980"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -584,7 +584,7 @@
         </entry>
         <entry>
           <string>NetName</string>
-          <string>ds</string>
+          <string>sa</string>
         </entry>
       </elementAttributes>
       <pos x="1920" y="2520"/>
@@ -594,24 +594,24 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>RS</string>
+          <string>Sb</string>
         </entry>
         <entry>
           <string>Bits</string>
           <int>5</int>
         </entry>
       </elementAttributes>
-      <pos x="-360" y="920"/>
+      <pos x="-360" y="1060"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>rs</string>
+          <string>sb</string>
         </entry>
       </elementAttributes>
-      <pos x="-120" y="920"/>
+      <pos x="-120" y="1060"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -622,11 +622,25 @@
         </entry>
         <entry>
           <string>NetName</string>
-          <string>rs</string>
+          <string>sb</string>
         </entry>
       </elementAttributes>
       <pos x="1920" y="3280"/>
     </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>Sw</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>5</int>
+        </entry>
+      </elementAttributes>
+      <pos x="-360" y="840"/>
+    </visualElement>
   </visualElements>
   <wires>
     <wire>
@@ -693,6 +707,10 @@
       <p1 x="800" y="2340"/>
       <p2 x="1900" y="2340"/>
     </wire>
+    <wire>
+      <p1 x="-360" y="1060"/>
+      <p2 x="-120" y="1060"/>
+    </wire>
     <wire>
       <p1 x="220" y="2600"/>
       <p2 x="1900" y="2600"/>
@@ -821,10 +839,6 @@
       <p1 x="-360" y="840"/>
       <p2 x="-140" y="840"/>
     </wire>
-    <wire>
-      <p1 x="-140" y="840"/>
-      <p2 x="-120" y="840"/>
-    </wire>
     <wire>
       <p1 x="100" y="1100"/>
       <p2 x="140" y="1100"/>
@@ -1173,10 +1187,6 @@
       <p1 x="1220" y="2200"/>
       <p2 x="1900" y="2200"/>
     </wire>
-    <wire>
-      <p1 x="-360" y="920"/>
-      <p2 x="-120" y="920"/>
-    </wire>
     <wire>
       <p1 x="1740" y="2460"/>
       <p2 x="1900" y="2460"/>
@@ -1393,6 +1403,10 @@
       <p1 x="260" y="2000"/>
       <p2 x="1900" y="2000"/>
     </wire>
+    <wire>
+      <p1 x="-360" y="980"/>
+      <p2 x="-120" y="980"/>
+    </wire>
     <wire>
       <p1 x="100" y="980"/>
       <p2 x="140" y="980"/>