From: unknown <s0042331@.dynamic.ewi.utwente.nl>
Date: Tue, 1 Apr 2008 10:37:34 +0000 (+0200)
Subject:  * Change loops back to do while, MontiumCC can't handle while loops.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=7a5f3f2a9974d0fa0f3c888944d9120b22f254eb;p=matthijs%2Fprojects%2Fmontium-fft.git

 * Change loops back to do while, MontiumCC can't handle while loops.
---

diff --git a/FFT.mc b/FFT.mc
index 6688275..5969315 100644
--- a/FFT.mc
+++ b/FFT.mc
@@ -188,8 +188,8 @@ INLINE void do_half_regular_stage(struct mems m, bool stage_odd, bool second_hal
 	/* Now, do half a single stage. That means N_t / 4 cycles. Since we do 2
 	 * cycles on every iteration, plus one before and after the loop,
 	 * we will loop N_t / 8 - 1 times. We add an extra - 1 because this is a do while loop... */
-	init_loop(LC2, (PARAM_N_t / 8) - 1);
-	while (loop_next(LC2)) {
+	init_loop(LC2, (PARAM_N_t / 8) - 1 - 1);
+	do {
 		/* Write outputs of previous cycle */
 		write_output_regular(m, out, second_half);
 
@@ -204,7 +204,7 @@ INLINE void do_half_regular_stage(struct mems m, bool stage_odd, bool second_hal
 		/* Even cycle */
 		in = read_input_regular(m, EVEN_CYCLE, second_half);
 		out = butterfly(in);
-	}
+	} while (loop_next(LC2));
 	
 	/* Write outputs of previous cycle */
 	write_output_regular(m, out, second_half);
@@ -254,9 +254,9 @@ void run() {
 	struct mems m;
 
 	/* We need to do n_t regular stages. Since we do two stages each
-	 * iteration, we'll do n_t / 2 iterations. */
-	init_loop(LC1, (PARAM_n_t / 2));
-	while (loop_next(LC1)) {
+	 * iteration, we'll do n_t / 2 iterations (and a -1 because we check after looping) */
+	init_loop(LC1, (PARAM_n_t / 2) - 1);
+	do {
 		m = init_mem_mapping(EVEN_STAGE);
 		init_input_addresses_regular(m, EVEN_STAGE);
 		/* do_half_regular_stage will init output addresses */
@@ -271,5 +271,5 @@ void run() {
 		do_half_regular_stage(m, ODD_STAGE, FIRST_HALF);
 		do_half_regular_stage(m, ODD_STAGE, SECOND_HALF);
 		stage++;
-	}
+	} while (loop_next(LC1));
 }