Changeset 791 for soft/giet_vm/applications/rosenfeld

Timestamp:

Feb 17, 2016, 4:12:02 PM (9 years ago)

Author:

meunier

Message:

• Added function realloc
• Started to put the bootloader on 2 Big Pages (warning: does not work yet)
• Fixed errors in the rosenfeld application

Location:

soft/giet_vm/applications/rosenfeld

Files:

• Makefile (modified) (2 diffs)
• nrc2/include/nrc_os_config.h (modified) (1 diff)
• rosenfeld.ld (modified) (1 diff)
• rosenfeld.py (modified) (4 diffs)
• src/ecc_examples.c (modified) (2 diffs)
• src/ecc_generation.c (modified) (1 diff)
• src/ecc_main_rosenfeld_sa.c (modified) (5 diffs)

soft/giet_vm/applications/rosenfeld/Makefile

@@ -19 +19 @@
 
 
-APP_NAME = rosenfeld
+APP_NAME = appli.elf
 
 SRC_FILE = $(wildcard $(SRC_PATH)/*.c)
@@ -32 +32 @@
 CFLAGS := $(CFLAGS) -g -Wall -fomit-frame-pointer $(CFLAGSW) $(CFLAGSCPU) -I$(INC_PATH) -fno-builtin -ffreestanding
 
-LDFLAGS := -Lnrc2 -L../../build/libs -T$(APP_NAME).ld --start-group -lnrc2x -luser -lmath --end-group
+LDFLAGS := -Lnrc2 -L../../build/libs -Trosenfeld.ld --start-group -lnrc2x -luser -lmath --end-group
 
 

soft/giet_vm/applications/rosenfeld/nrc2/include/nrc_os_config.h

@@ -10 +10 @@
     #define write(x, y, z)  giet_fat_write(x, y, z)
     #define fprintf(x, ...) giet_fat_fprintf(x, __VA_ARGS__)
-    #define exit(x)         giet_pthread_exit("exit...")
+    #define fscanf(x, ...)  ;
+    #define exit(x)         giet_pthread_exit(NULL)
 #endif
 

soft/giet_vm/applications/rosenfeld/rosenfeld.ld

@@ -3 +3 @@
 *****************************************************************************/
 
-seg_code_base      = 0x00400000;
-seg_data_base      = 0x00500000;
+seg_code_base      = 0x10000000;
+seg_data_base      = 0x20000000;
 
 /***************************************************************************

soft/giet_vm/applications/rosenfeld/rosenfeld.py

@@ -35 +35 @@
     # define vsegs base & size
     code_base  = 0x10000000
-    code_size  = 0x00010000     # 64 Kbytes (replicated in each cluster)
+    code_size  = 0x00030000     # 192 Kbytes (replicated in each cluster)
     
     data_base  = 0x20000000
@@ -41 +41 @@
 
     stack_base = 0x40000000 
-    stack_size = 0x00200000     # 2 Mbytes (per cluster)
+    stack_size = 0x00800000     # 8 Mbytes (per cluster)
 
     heap_base  = 0x60000000 
@@ -47 +47 @@
 
     # create vspace
-    vspace = mapping.addVspace( name = 'rosenfled', startname = 'rosen_data' )
+    vspace = mapping.addVspace( name = 'rosenfeld', startname = 'rosen_data' )
     
     # data vseg : shared (only in cluster[0,0])
     mapping.addVseg( vspace, 'rosen_data', data_base, data_size, 
                      'C_WU', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM', 
-                     binpath = 'bin/rosenfled/appli.elf',
+                     binpath = 'bin/rosenfeld/appli.elf',
                      local = False )
 
@@ -64 +64 @@
                                  code_base , code_size,
                                  'CXWU', vtype = 'ELF', x = x, y = y, pseg = 'RAM', 
-                                 binpath = 'bin/rosenfled/appli.elf',
+                                 binpath = 'bin/rosenfeld/appli.elf',
                                  local = True )
 

soft/giet_vm/applications/rosenfeld/src/ecc_examples.c

@@ -22 +22 @@
 #include "ecc_features.h"
 #include "ecc_generation.h"
+
 
 // --------------------------------------------------------------
@@ -1416 +1417 @@
     set_ui8vector_str(X[i++], 0, w-1, "                              "); // 27
     
-    display_ui8matrix_positive(X, 0, h-1, 0, w-1, 4, "forme_boulon1"); printf("");
-    write_ui8matrix_positive(  X, 0, h-1, 0, w-1, 4, "forme_boulon1.txt");
-}
+    display_ui8matrix_positive(X, 0, h-1, 0, w-1, 4, "forme_boulon1");
+    printf("");
+    write_ui8matrix_positive(X, 0, h-1, 0, w-1, 4, "forme_boulon1.txt");
+}

soft/giet_vm/applications/rosenfeld/src/ecc_generation.c

@@ -21 +21 @@
 #include "mt19937.h" // Mersenne Twister generator
 #include "ecc_generation.h"
+
 
 // -------------------------------------------------------------------------------------------------------------------------

soft/giet_vm/applications/rosenfeld/src/ecc_main_rosenfeld_sa.c

@@ -92 +92 @@
     init_forme_boulon1(&X0, &i0, &i1, &j0, &j1);
 
-    // allocatin memoire
+    // allocation memoire
     X   = ui8matrix (i0-border, i1+border, j0-border, j1+border);
     E8  = ui8matrix (i0-border, i1+border, j0-border, j1+border);
     E32 = ui32matrix(i0-border, i1+border, j0-border, j1+border);
-    
-    // initialisation de la memoir
+ 
+    // initialisation de la memoire
     zero_ui32matrix(E32, i0-border, i1+border, j0-border, j1+border);
     zero_ui8matrix (E8,  i0-border, i1+border, j0-border, j1+border);
     zero_ui8matrix (X,   i0-border, i1+border, j0-border, j1+border);
-    
+
     // pre-traitements
     binarisation_ui8matrix(X0, i0, i1, j0, j1, 1, 1, X);    // pour le traitement
@@ -182 +182 @@
     int na;
     
-    RegionStats *Stats = NULL;
+    RegionStats * Stats = NULL;
 
     RGBQuad palette[256];
@@ -191 +191 @@
 
     // chargement d'une image depuis le disque
-    X0 = LoadPGM_ui8matrix(complete_filename, &i0, &i1, &j0, &j1);
-    
-    // allocatin memoire
-    X   = ui8matrix (i0-border, i1+border, j0-border, j1+border);
-    E8  = ui8matrix (i0-border, i1+border, j0-border, j1+border);
-    E32 = ui32matrix(i0-border, i1+border, j0-border, j1+border); 
-
-    // initialisation de la memoir
-    zero_ui32matrix(E32, i0-border, i1+border, j0-border, j1+border);
-    zero_ui8matrix (E8,  i0-border, i1+border, j0-border, j1+border);
-    zero_ui8matrix (X,   i0-border, i1+border, j0-border, j1+border);
+    //X0 = LoadPGM_ui8matrix(complete_filename, &i0, &i1, &j0, &j1);
+    init_forme_boulon1(&X0, &i0, &i1, &j0, &j1);
+    
+    // allocation memoire
+    X   = ui8matrix (i0 - border, i1 + border, j0 - border, j1 + border);
+    E8  = ui8matrix (i0 - border, i1 + border, j0 - border, j1 + border);
+    E32 = ui32matrix(i0 - border, i1 + border, j0 - border, j1 + border); 
+
+    // initialisation de la memoire
+    zero_ui32matrix(E32, i0 - border, i1 + border, j0 - border, j1 + border);
+    zero_ui8matrix (E8,  i0 - border, i1 + border, j0 - border, j1 + border);
+    zero_ui8matrix (X,   i0 - border, i1 + border, j0 - border, j1 + border);
 
     // pre-traitements
     binarisation_ui8matrix(X0, i0, i1, j0, j1, 20, 1, X); // pour le traitement
-    binarisation_ui8matrix(X0, i0, i1, j0, j1, 20, 255, X0); // pour la verif visuelle
-    generate_path_filename(pathDst, "verif.pgm", complete_filename, 1024);
-    SavePGM_ui8matrix(X0, i0, i1, j0, j1, complete_filename);
-
-    height = i1-i0+1; width = j1-j0+1; 
-    
-    nemax = ((height+1)*(width+1)) / 2; // majorant strict
-    nermax = (width+1) / 2;
+    //binarisation_ui8matrix(X0, i0, i1, j0, j1, 20, 255, X0); // pour la verif visuelle
+    //generate_path_filename(pathDst, "verif.pgm", complete_filename, 1024);
+    //SavePGM_ui8matrix(X0, i0, i1, j0, j1, complete_filename);
+
+    height = i1 - i0 + 1;
+    width  = j1 - j0 + 1;
+    
+    nemax = ((height + 1) * (width + 1)) / 2; // majorant strict
+    nermax = (width + 1) / 2;
     
     // alloc init des tables d'equivalences pour UF, Suzuki et Bailey
@@ -234 +236 @@
     na = Rosenfeld_UF_Org1_8C(X, height, width, E32, T, A, nemax, Stats);
     printf("na = %d\n", na);
-    filename = "Rosenfeld_UF_Org1_8C.bmp";
+    //filename = "Rosenfeld_UF_Org1_8C.bmp";
     mod_ui32matrix_ui8matrix(E32, i0, i1, j0, j1, E8);
-    generate_path_filename(pathDst, filename, complete_filename, 1024);
-    SaveBMP2_ui8matrix(E8, width, height, palette, complete_filename);
+    //generate_path_filename(pathDst, filename, complete_filename, 1024);
+    //SaveBMP2_ui8matrix(E8, width, height, palette, complete_filename);
     zero_ui32matrix(E32, i0 - border, i1 + border, j0 - border, j1 + border);
     display_RegionStatsVector(Stats, 1, na, "Stats");
@@ -313 +315 @@
 // -----------------------------
 {
+#if TARGET_OS==GIET_VM
+    giet_tty_alloc(1);
+#endif
     display_arg(argc, argv);
     ecc_info_define();