From 87b358b667a0c8d920697f2944c07baa9599be29 Mon Sep 17 00:00:00 2001
From: Yohan Boujon <yo.boujon@gmail.com>
Date: Tue, 21 Nov 2023 15:50:59 +0100
Subject: [PATCH] FIXED MEMORY

---
 cpu_project/cpu_project.xpr |  2 +-
 src/cpu.vhd                 | 18 +++---------------
 src/cpu_tb.vhd              | 16 ++++------------
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/cpu_project/cpu_project.xpr b/cpu_project/cpu_project.xpr
index 35af264..ae9aaf0 100644
--- a/cpu_project/cpu_project.xpr
+++ b/cpu_project/cpu_project.xpr
@@ -60,7 +60,7 @@
     <Option Name="IPStaticSourceDir" Val="$PIPUSERFILESDIR/ipstatic"/>
     <Option Name="EnableBDX" Val="FALSE"/>
     <Option Name="DSABoardId" Val="basys3"/>
-    <Option Name="WTXSimLaunchSim" Val="7"/>
+    <Option Name="WTXSimLaunchSim" Val="29"/>
     <Option Name="WTModelSimLaunchSim" Val="0"/>
     <Option Name="WTQuestaLaunchSim" Val="0"/>
     <Option Name="WTIesLaunchSim" Val="0"/>
diff --git a/src/cpu.vhd b/src/cpu.vhd
index 0ad4f6c..72c9645 100644
--- a/src/cpu.vhd
+++ b/src/cpu.vhd
@@ -5,13 +5,8 @@ use IEEE.STD_LOGIC_UNSIGNED.ALL;
 
 entity cpu is
     Port (
-        clk : in STD_LOGIC;
-        pc_out : out STD_LOGIC_VECTOR(7 downto 0);
-        op_out: out STD_LOGIC_VECTOR(3 DOWNTO 0);
-        a_out: out STD_LOGIC_VECTOR(7 DOWNTO 0);
-        b_out: out STD_LOGIC_VECTOR(7 DOWNTO 0);
-        c_out: out STD_LOGIC_VECTOR(7 DOWNTO 0)
-    );
+        clk : in STD_LOGIC
+  );
 end cpu;
 
 ARCHITECTURE cpu_arch OF cpu IS
@@ -91,18 +86,11 @@ begin
     step4_memre : pipeline_step PORT MAP(mem_A, mem_B, mem_C, mem_OP, clk, re_A, re_B, re_C, re_OP);
     
     instruction_memory_inst : instruction PORT MAP(PC, inst , clk);
-    memory_register_inst    : reg PORT MAP(empty_4, empty_4, re_A(3 downto 0), re_OP(0), re_B, '0', clk, empty_8, empty_8);
+    memory_register_inst    : reg PORT MAP(empty_4, empty_4, re_A(3 downto 0), '1', re_B, '1', clk, empty_8, empty_8);
     
     -- alu_inst                : alu PORT MAP();
     -- data_memory_inst        : data_memory PORT MAP();
 
-    a_out <= re_A;
-    b_out <= re_B;
-    c_out <= re_C;
-    OP_out <= re_OP;
-    pc_out <= PC;
-    
-
     process(clk)
         begin
             if clk'event and clk='1' then
diff --git a/src/cpu_tb.vhd b/src/cpu_tb.vhd
index 0679cba..0580893 100644
--- a/src/cpu_tb.vhd
+++ b/src/cpu_tb.vhd
@@ -8,12 +8,7 @@ end test_cpu;
 architecture bench of test_cpu is
     component cpu
         Port (
-            clk : in STD_LOGIC;
-            pc_out : out STD_LOGIC_VECTOR(7 downto 0);
-            op_out : out STD_LOGIC_VECTOR(3 DOWNTO 0);
-            a_out : out STD_LOGIC_VECTOR(7 DOWNTO 0);
-            b_out : out STD_LOGIC_VECTOR(7 DOWNTO 0);
-            c_out : out STD_LOGIC_VECTOR(7 DOWNTO 0)
+            clk : in STD_LOGIC
         );
     end component;
 
@@ -25,15 +20,12 @@ architecture bench of test_cpu is
     
 begin
     uut: cpu PORT MAP( 
-        inClock,
-        int_PC,
-        int_re_OP,
-        int_re_A,
-        int_re_B,
-        int_re_C
+        inClock
     );
 
     -- Clock generation
     inClock <= not inClock after 10 ns; -- Adjust clock period as necessary
 
 end bench;
+
+