From 721ac0613a2104da4b21aa10407cbe7933e626d6 Mon Sep 17 00:00:00 2001
From: jonah <jf3g19@soton.ac.uk>
Date: Sun, 29 Nov 2020 13:26:43 +0000
Subject: [PATCH] cleaned up some comments
---
DA.sv | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/DA.sv b/DA.sv
index 8f32d69..e5b2f3b 100644
--- a/DA.sv
+++ b/DA.sv
@@ -48,7 +48,6 @@ always_ff@(posedge ck, posedge rst)
// ==== DA accumulator ====
-<<<<<<< HEAD
always_ff @(posedge ck)
if (reset_accumulator)
begin
@@ -68,28 +67,6 @@ always_ff @(posedge ck)
begin
shifted_out <= {partial_sum[0], shifted_out[N-1:1]};
partial_sum <= {partial_sum[(N-1)+8],partial_sum[(N-1)+8:1]} - multiplication_coefficients[multiplication_addresses[address]];
-=======
-always_ff @(posedge ck, posedge rst)
- if (reset_accumulator)
- begin
- partial_sum <= '0;
- shifted_out <= '0;
- end
- else
- begin
- if(compute)
- begin
- if(address < N-1)
- begin
- shifted_out <= {partial_sum[0], shifted_out[N-1:1]};
- partial_sum <= {partial_sum[(N-1)+8],partial_sum[(N-1)+8:1]} + multiplication_coefficients[multiplication_addresses[address]];
- end
- else
- begin
- shifted_out <= {partial_sum[0], shifted_out[N-1:1]};
- partial_sum <= {partial_sum[(N-1)+8],partial_sum[(N-1)+8:1]} - multiplication_coefficients[multiplication_addresses[address]];
- end
->>>>>>> c3e2c38a62bbbf0555b4b676ad01f703f9b1ee10
end
end
// ==== DA accumulator ====
--
GitLab