* 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.

diff --git a/FFT_support.cpp b/FFT_support.cpp
index 1876e36ce4302e6cae6511d7113c976b637bcdc6..6f21e5a24afa1e9cca6fe74a37bfa4965ff6d2ea 100644 (file)
--- a/FFT_support.cpp
+++ b/FFT_support.cpp
@@ -10,9 +10,7 @@
 #define WORDS_PER_LINE 4\r
 #define WORDS_PER_GROUP 1\r
 \r
-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; \r
-\r
-\r
+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; \r
 \r
 int to_fixed(float n)\r
 {\r
@@ -52,7 +50,16 @@ void print_mem(mem m, int offset, int size, bool fixed)
 void pre_run()\r
 {\r
        int i;\r
-\r
+       /* Assign memories, at least for the first stage */\r
+       input_a_re   = alloc_mem(P0M0);\r
+       input_a_im   = alloc_mem(P1M0);\r
+       input_b_re   = alloc_mem(P2M0);\r
+       input_b_im   = alloc_mem(P3M0);\r
+       output_a_re  = alloc_mem(P0M1);\r
+       output_a_im  = alloc_mem(P1M1);\r
+       output_b_re  = alloc_mem(P2M1);\r
+       output_b_im  = alloc_mem(P3M1);\r
+       \r
        /* TODO: Init memory and twiddles */\r
        for (i=0;i<SIZE/2;i++)\r
        {\r

diff --git a/main.cpp b/main.cpp
index 4fd8803e94b231da08793412dd9d9955c87abc97..3c2d4a6b246584d4753bc27270bcfc3e277f269b 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,20 +1,7 @@
-/*\r
-int main() {\r
-  init();\r
-  pre_run();\r
-  update_gpi();\r
-  run();\r
-  post_run();\r
-  return 0;\r
-}(*/\r
 #include "FFT.h"\r
 \r
 int main(int argc, char* argv[]) {\r
-       //CCU ccu;\r
-       //FileInputStream input(ccu, SI3, "input/input.bin");\r
-       //FileOutputStream output(ccu, SO3, "output_exe/output.bin");\r
-       //FFT fft(ccu);\r
-       init();\r
+\r
        pre_run();\r
     set_gpi(0, 1);\r
        run();\r