Changeset 822 for soft/giet_vm/applications/rosenfeld/nrc2/src/nrio1xf.c

Timestamp:

Jun 1, 2016, 10:25:43 AM (8 years ago)

Author:

meunier

Message:

In rosenfeld:

• Updated nrio0, nrio1, nrio2, nrio1f, nrio2f, nrio1x, nrbool1, nrbool2 and nralloc1 in the nrc2 lib in order to use macro-typed functions
• Updated the simulation script to include performance evaluation with random images, and a script to generate graphs
• Updated the clock.h to use 64-bit integers, which potentially breaks the printing on the giet

File:

• soft/giet_vm/applications/rosenfeld/nrc2/src/nrio1xf.c (modified) (3 diffs)

soft/giet_vm/applications/rosenfeld/nrc2/src/nrio1xf.c

@@ -11 +11 @@
 #include <stdio.h>
 
+#include "nrc_os_config.h"
 #include "mypredef.h"
 #include "nrtype.h"
@@ -18 +19 @@
 
 #include "nralloc1.h"
-#include "nrio1xf.h"
+#include "nrio1x.h"
 
 
@@ -24 +25 @@
 /* -- write_vector_circular -- */
 /* --------------------------- */
-/* ------------------------------------------------------------------------------------------------------------ */
-IMAGE_EXPORT(void) write_bvector_circular(byte *v,long nl,long nh, long c0, long c1, char *format, char *filename)
-/* ------------------------------------------------------------------------------------------------------------ */
-{
-  long i, n=nh-nl+1;
-  FILE *f;
 
-  f = fopen(filename, "wt");
-  if(f == NULL) { nrerror("Can't open file in write_bvector_circular"); }
+#undef write_type_vector_circular
+#define write_type_vector_circular(t) \
+void short_name(t,write_,vector_circular)(t * v, int32_t nl, int32_t nh, int32_t c0, int32_t c1, char * format, char * filename) \
+{                                                                  \
+    int32_t n = nh - nl + 1;                                       \
+    FILE * f = fopen(filename, "wt");                              \
+    if (f == NULL) {                                               \
+        nrerror("Can't open file %s in %s\n", filename, __func__); \
+    }                                                              \
+    for (int32_t i = c0; i <= c1; i++) {                           \
+        fprintf(f, format, v[i % n + nl]);                         \
+    }                                                              \
+    fprintf(f, "\n");                                              \
+    fclose(f);                                                     \
+}
 
-  for(i=c0; i<=c1; i++) { fprintf(f, format, v[i%n+nl]);} fputc('\n', f);
-  fclose(f);
-}
+write_type_vector_circular(int8_t);
+write_type_vector_circular(uint8_t);
+write_type_vector_circular(int16_t);
+write_type_vector_circular(uint16_t);
+write_type_vector_circular(int32_t);
+write_type_vector_circular(uint32_t);
+write_type_vector_circular(int64_t);
+write_type_vector_circular(uint64_t);
+write_type_vector_circular(float);
+write_type_vector_circular(double);
+
+
+
+// Local Variables:
+// tab-width: 4
+// c-basic-offset: 4
+// c-file-offsets:((innamespace . 0)(inline-open . 0))
+// indent-tabs-mode: nil
+// End:
+
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
+