From 1efd07a9676d63cd5ffe6535ee45101e87f89c86 Mon Sep 17 00:00:00 2001
From: unknown <s0042331@.dynamic.ewi.utwente.nl>
Date: Thu, 27 Mar 2008 13:43:19 +0100
Subject: [PATCH]  * Cleanup main.cpp a bit.  * Let the libmontiumc
 implementation allocate its memories itself, because the    montiumcc version
 doesn't use global variables for that anymore.

---
 FFT_support.cpp | 15 +++++++++++----
 main.cpp        | 15 +--------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/FFT_support.cpp b/FFT_support.cpp
index 1876e36..6f21e5a 100644
--- a/FFT_support.cpp
+++ b/FFT_support.cpp
@@ -10,9 +10,7 @@
 #define WORDS_PER_LINE 4
 #define WORDS_PER_GROUP 1
 
-extern 	mem input_a_re, input_a_im, input_b_re, input_b_im, output_a_re, output_a_im, output_b_re, output_b_im, twiddle_re, twiddle_im; 
-
-
+mem input_a_re, input_a_im, input_b_re, input_b_im, output_a_re, output_a_im, output_b_re, output_b_im, twiddle_re, twiddle_im; 
 
 int to_fixed(float n)
 {
@@ -52,7 +50,16 @@ void print_mem(mem m, int offset, int size, bool fixed)
 void pre_run()
 {
 	int i;
-
+	/* Assign memories, at least for the first stage */
+	input_a_re   = alloc_mem(P0M0);
+	input_a_im   = alloc_mem(P1M0);
+	input_b_re   = alloc_mem(P2M0);
+	input_b_im   = alloc_mem(P3M0);
+	output_a_re  = alloc_mem(P0M1);
+	output_a_im  = alloc_mem(P1M1);
+	output_b_re  = alloc_mem(P2M1);
+	output_b_im  = alloc_mem(P3M1);
+	
 	/* TODO: Init memory and twiddles */
 	for (i=0;i<SIZE/2;i++)
 	{
diff --git a/main.cpp b/main.cpp
index 4fd8803..3c2d4a6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,20 +1,7 @@
-/*
-int main() {
-  init();
-  pre_run();
-  update_gpi();
-  run();
-  post_run();
-  return 0;
-}(*/
 #include "FFT.h"
 
 int main(int argc, char* argv[]) {
-	//CCU ccu;
-	//FileInputStream input(ccu, SI3, "input/input.bin");
-	//FileOutputStream output(ccu, SO3, "output_exe/output.bin");
-	//FFT fft(ccu);
-	init();
+
 	pre_run();
     set_gpi(0, 1);
 	run();
-- 
2.30.2