From 21cf70e2ef7e02dde580c37c386bd680e1dd3c0c Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Tue, 10 Sep 2019 14:51:29 +1000
Subject: [PATCH] Cleanup ffs/fls_32/64 functions

This just cleans up the code a bit. No functional change.

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
 helpers.vhdl | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/helpers.vhdl b/helpers.vhdl
index f0bce95..1e0f781 100644
--- a/helpers.vhdl
+++ b/helpers.vhdl
@@ -29,59 +29,47 @@ end package helpers;
 
 package body helpers is
 	function fls_32 (val: std_ulogic_vector(31 downto 0)) return integer is
-		variable ret: integer;
 	begin
-		ret := 32;
 		for i in val'range loop
 			if val(i) = '1' then
-				ret := 31 - i;
-				exit;
+				return 31 - i;
 			end if;
 		end loop;
 
-		return ret;
+		return 32;
 	end;
 
 	function ffs_32 (val: std_ulogic_vector(31 downto 0)) return integer is
-		variable ret: integer;
 	begin
-		ret := 32;
 		for i in val'reverse_range loop
 			if val(i) = '1' then
-				ret := i;
-				exit;
+				return i;
 			end if;
 		end loop;
 
-		return ret;
+		return 32;
 	end;
 
 	function fls_64 (val: std_ulogic_vector(63 downto 0)) return integer is
-		variable ret: integer;
 	begin
-		ret := 64;
 		for i in val'range loop
 			if val(i) = '1' then
-				ret := 63 - i;
-				exit;
+				return 63 - i;
 			end if;
 		end loop;
 
-		return ret;
+		return 64;
 	end;
 
 	function ffs_64 (val: std_ulogic_vector(63 downto 0)) return integer is
-		variable ret: integer;
 	begin
-		ret := 64;
 		for i in val'reverse_range loop
 			if val(i) = '1' then
-				ret := i;
-				exit;
+				return i;
 			end if;
 		end loop;
 
-		return ret;
+		return 64;
 	end;
 
 	function popcnt8(val: std_ulogic_vector(7 downto 0)) return std_ulogic_vector is