Fixed some things

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@724 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: henjo

c_runtime/index_spec.c

@@ -1,19 +1,57 @@
 #include "index_spec.h"
+#include "memory_pool.h"
 #include <stdlib.h>
+#include <stdarg.h>
 
 void alloc_index_spec(index_spec_t* s)
 {
     int i;
-    s->index = malloc(s->ndims*sizeof(int*));
+    s->index = index_alloc(s->ndims);
     for (i = 0; i < s->ndims; ++i)
     {
 	if (s->dim_size[i] > 0)
 	{
-	    s->index[i] = malloc(s->dim_size[i]*sizeof(int));
+	    s->index[i] = size_alloc(s->dim_size[i]);
 	}
 	else
 	{
 	    s->index[i] = 0;
 	}
     }
 }
+
+void create_index_spec(index_spec_t* dest, int nridx, ...)
+{ 
+  int i;
+  va_list ap;
+  va_start(ap,nridx);
+  
+  dest->ndims = nridx;
+  dest->dim_size = size_alloc(nridx);
+  dest->index = index_alloc(nridx);   
+  for (i = 0; i < nridx; ++i)
+    {
+      dest->dim_size[i] = va_arg(ap,int);
+      dest->index[i] = va_arg(ap,int*);
+    }
+  va_end(ap);
+  
+  
+}
+
+int* make_index_array(int nridx,...)
+{
+  int i;
+  int* res;
+  va_list ap;
+  va_start(ap,nridx);
+  
+  res = size_alloc(nridx);
+  for (i = 0; i < nridx; ++i)
+    {
+      res[i] = va_arg(ap,int);
+    }
+
+  return res;
+
+}

c_runtime/index_spec.h

@@ -11,5 +11,6 @@ struct index_spec_s
 typedef struct index_spec_s index_spec_t;
 
 void alloc_index_spec(index_spec_t* s);
-
+void create_index_spec(index_spec_t* dest, int nridx, ...);
+int* make_index_array(int nridx,...);
 #endif

c_runtime/memory_pool.c

@@ -6,12 +6,18 @@ state current_state = {
   0,/*real buffer*/
   0,/*integer buffer*/
   0,/*string buffer*/
-  0 /*boolean buffer*/
+  0,/*boolean buffer*/
+  0,/* size buffer */
+  0 /* index buffer */
 };
 
-size_mem current_buffer_index = {
-  0
-};
+real real_buffer[NR_REAL_ELEMENTS];
+integer integer_buffer[NR_INTEGER_ELEMENTS];
+string string_buffer[NR_STRING_ELEMENTS];
+boolean boolean_buffer[NR_BOOLEAN_ELEMENTS];
+integer size_buffer[NR_SIZE_ELEMENTS];
+int* index_buffer[NR_INDEX_ELEMENTS];
+
 
 state get_memory_state()
 {
@@ -117,15 +123,29 @@ int* size_alloc(int n)
   index_t start;
 
   assert(n>=0);
-  assert(n+current_buffer_index.size_buffer_ptr<NR_SIZE_ELEMENTS);
+  assert(n + current_state.size_buffer_ptr < NR_SIZE_ELEMENTS);
 
-  start = current_buffer_index.size_buffer_ptr;
-  current_buffer_index.size_buffer_ptr += n;
+  start = current_state.size_buffer_ptr;
+  current_state.size_buffer_ptr += n;
   return size_buffer+n;
 
   /*  return start;*/
 }
 
+int** index_alloc(int n)
+{
+  index_t start;
+  
+  assert(n>=0);
+  assert(n + current_state.index_buffer_ptr < NR_SIZE_ELEMENTS);
+ 
+  start = current_state.index_buffer_ptr;
+  current_state.index_buffer_ptr += n;
+  return index_buffer+n;
+
+  /*  return start;*/
+}
+
 index_t real_free(int n)
 {
   assert(n>=0);
@@ -165,8 +185,17 @@ index_t boolean_free(int n)
 index_t size_free(int n)
 {
   assert(n>=0);
-  assert(current_buffer_index.size_buffer_ptr-n>=0);
+  assert(current_state.size_buffer_ptr-n>=0);
+  
+  current_state.size_buffer_ptr -= n;
+  return current_state.size_buffer_ptr; 
+}
+
+index_t index_free(int n)
+{
+  assert(n>=0);
+  assert(current_state.index_buffer_ptr-n>=0);
 
-  current_buffer_index.size_buffer_ptr -= n;
-  return current_buffer_index.size_buffer_ptr; 
+  current_state.index_buffer_ptr -= n;
+  return current_state.index_buffer_ptr; 
 }

c_runtime/memory_pool.h

@@ -6,6 +6,7 @@
 #define NR_STRING_ELEMENTS 10000
 #define NR_BOOLEAN_ELEMENTS 10000
 #define NR_SIZE_ELEMENTS 10000
+#define NR_INDEX_ELEMENTS 10000
 
 typedef double real;
 typedef int integer;
@@ -14,25 +15,23 @@ typedef int boolean;
 
 typedef int index_t;
 
-real real_buffer[NR_REAL_ELEMENTS];
-integer integer_buffer[NR_INTEGER_ELEMENTS];
-string string_buffer[NR_STRING_ELEMENTS];
-boolean boolean_buffer[NR_BOOLEAN_ELEMENTS];
-integer size_buffer[NR_SIZE_ELEMENTS];
+extern real real_buffer[NR_REAL_ELEMENTS];
+extern integer integer_buffer[NR_INTEGER_ELEMENTS];
+extern string string_buffer[NR_STRING_ELEMENTS];
+extern boolean boolean_buffer[NR_BOOLEAN_ELEMENTS];
+extern integer size_buffer[NR_SIZE_ELEMENTS];
+extern int* index_buffer[NR_INDEX_ELEMENTS];
 
 struct state_s {
   index_t real_buffer_ptr;
   index_t integer_buffer_ptr;
   index_t string_buffer_ptr;
   index_t boolean_buffer_ptr;
-};
-
-struct size_s {
   index_t size_buffer_ptr;
+  index_t index_buffer_ptr;
 };
 
 typedef struct state_s state;
-typedef struct size_s size_mem;
 
 state get_memory_state();
 void restore_memory_state(state restore_state);
@@ -50,13 +49,13 @@ real* real_alloc(int n);
 integer* integer_alloc(int n);
 string* string_alloc(int n);
 boolean* boolean_alloc(int n);
-
 int* size_alloc(int n);
+int** index_alloc(int n);
 
 index_t real_free(int n);
 index_t integer_free(int n);
 index_t string_free(int n);
 index_t boolean_free(int n);
 index_t size_free(int n);
-
+index_t index_free(int n);
 #endif

c_runtime/real_array.c

@@ -407,9 +407,19 @@ void index_real_array(real_array_t* source,
 {
 
 }
+
+void index_alloc_real_array(real_array_t* source, 
+			       index_spec_t* spec, 
+			       real_array_t* dest)
+{
+  
+}
+
+
 /* Returns dest := source[i1,:,:...]*/
 void simple_index_alloc_real_array1(real_array_t* source,int i1,real_array_t* dest)
 {
+  
 
 }
 

c_runtime/real_array.h

@@ -71,7 +71,11 @@ void simple_indexed_assign_real_array2(real_array_t* source,
 */
 void index_real_array(real_array_t* source, 
 			       index_spec_t* spec, 
-			       real_array_t*);
+			       real_array_t* dest);
+void index_alloc_real_array(real_array_t* source, 
+			       index_spec_t* spec, 
+			       real_array_t* dest);
+
 void simple_index_alloc_real_array1(real_array_t* source,int i1,real_array_t* dest);
 
 void simple_index_real_array1(real_array_t* source,