From 2595e3881e0904fc6ecb162775a149f5b0121848 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 9 Jan 2014 18:10:54 +0100 Subject: restored the functionnal version of mul --- cpu/alu.ml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'cpu') diff --git a/cpu/alu.ml b/cpu/alu.ml index 9f83369..aa82a6d 100644 --- a/cpu/alu.ml +++ b/cpu/alu.ml @@ -120,7 +120,6 @@ let rec split_list = function | x::y::tl -> let a, b = split_list tl in x::a, y::b (* n must be a power of two *) -(* let nmul n a b = let summands = List.map (fun i -> @@ -137,23 +136,9 @@ let nmul n a b = let s1, s2 = split_list l in nadder (2*n) (sum_list s1) (sum_list s2) - in let r = List.fold_left (nadder (2*n)) (List.hd summands) (List.tl summands) in - - - (*in - let r = sum_list summands in*) + in + let r = sum_list summands in (r % (0, n-1)), (r % (n, 2*n - 1)) - *) - -let nmul n a b = - let nn = 2*n in - let result = ref (zeroes (nn)) in - for i = 0 to n-1 do - result := mux (b ** i) !result (nadder nn !result ((zeroes i) ++ a ++ (zeroes (n-i)))) - done; - let r = !result in - r % (0, n-1), r % (n, nn-1) - -- cgit v1.2.3