make simple functions static inline to save the jump instructions

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

Author: Henning Kiel

SimulationRuntime/c/util/utility.c

@@ -32,73 +32,6 @@
 
 #include "utility.h"
 
-int in_range_integer(modelica_integer i,
-         modelica_integer start,
-         modelica_integer stop)
-{
-  if (start <= stop) {
-      if ((i >= start) && (i <= stop)) {
-          return 1;
-      }
-  } else {
-      if ((i >= stop) && (i <= start)) {
-          return 1;
-      }
-  }
-  return 0;
-}
-
-int in_range_real(modelica_real i,
-      modelica_real start,
-      modelica_real stop)
-{
-  if (start <= stop) {
-      if ((i >= start) && (i <= stop)) {
-          return 1;
-      }
-  } else {
-      if ((i >= stop) && (i <= start)) {
-          return 1;
-      }
-  }
-  return 0;
-}
-
-modelica_real modelica_div(modelica_real x, modelica_real y)
-{
-  return (modelica_real)((modelica_integer)(x/y));
-}
-
-modelica_real modelica_mod_real(modelica_real x, modelica_real y)
-{
-  return (x - (floor(x/y) * y));
-}
-
-modelica_integer modelica_mod_integer(modelica_integer x, modelica_integer y)
-{
-  return x % y;
-}
-
-modelica_real modelica_rem_real(modelica_real x, modelica_real y)
-{
-  return x - (y * (modelica_div(x,y)));
-}
-
-modelica_integer modelica_rem_integer(modelica_integer x, modelica_integer y)
-{
-  return x - (y * ((x / y)));
-}
-
-modelica_integer modelica_integer_min(modelica_integer x,modelica_integer y)
-{
-  return (x < y) ? x : y;
-}
-
-modelica_integer modelica_integer_max(modelica_integer x,modelica_integer y)
-{
-  return (x > y) ? x : y;
-}
-
 modelica_real real_int_pow(modelica_real base, modelica_integer n)
 {
   modelica_real result = 1.0;

SimulationRuntime/c/util/utility.h

@@ -36,26 +36,81 @@
 #include <math.h>
 #include "openmodelica.h"
 
-extern int in_range_integer(modelica_integer i,
+
+static inline int in_range_integer(modelica_integer i,
          modelica_integer start,
-         modelica_integer stop);
+         modelica_integer stop)
+{
+  if (start <= stop) {
+      if ((i >= start) && (i <= stop)) {
+          return 1;
+      }
+  } else {
+      if ((i >= stop) && (i <= start)) {
+          return 1;
+      }
+  }
+  return 0;
+}
 
-extern int in_range_real(modelica_real i,
+static inline int in_range_real(modelica_real i,
       modelica_real start,
-      modelica_real stop);
+      modelica_real stop)
+{
+  if (start <= stop) {
+      if ((i >= start) && (i <= stop)) {
+          return 1;
+      }
+  } else {
+      if ((i >= stop) && (i <= start)) {
+          return 1;
+      }
+  }
+  return 0;
+}
+
 
 /* div is already defined in stdlib, so it's redefined here to modelica_div */
-extern modelica_real modelica_div(modelica_real x, modelica_real y);
+static inline modelica_real modelica_div(modelica_real x, modelica_real y)
+{
+  return (modelica_real)((modelica_integer)(x/y));
+}
+
+
 /* fmod in math.h does not work in the same way as mod defined by modelica, so
  * we need to define our own mod. */
-extern modelica_real modelica_mod_real(modelica_real x, modelica_real y);
-extern modelica_integer modelica_mod_integer(modelica_integer x, modelica_integer y);
+static inline modelica_real modelica_mod_real(modelica_real x, modelica_real y)
+{
+  return (x - (floor(x/y) * y));
+}
+
+static inline modelica_integer modelica_mod_integer(modelica_integer x, modelica_integer y)
+{
+  return x % y;
+}
+
+
+static inline modelica_real modelica_rem_real(modelica_real x, modelica_real y)
+{
+  return x - (y * (modelica_div(x,y)));
+}
+
+static inline modelica_integer modelica_rem_integer(modelica_integer x, modelica_integer y)
+{
+  return x - (y * ((x / y)));
+}
+
+
+static inline modelica_integer modelica_integer_min(modelica_integer x,modelica_integer y)
+{
+  return (x < y) ? x : y;
+}
 
-extern modelica_real modelica_rem_real(modelica_real x, modelica_real y);
-extern modelica_integer modelica_rem_integer(modelica_integer x, modelica_integer y);
+static inline modelica_integer modelica_integer_max(modelica_integer x,modelica_integer y)
+{
+  return (x > y) ? x : y;
+}
 
-extern modelica_integer modelica_integer_min(modelica_integer x, modelica_integer y);
-extern modelica_integer modelica_integer_max(modelica_integer x, modelica_integer y);
 
 #define reduction_sum(X,Y) ((X)+(Y))
 #define reduction_product(X,Y) ((X)*(Y))

c_runtime/utility.c

@@ -32,72 +32,6 @@
 
 #include "utility.h"
 
-int in_range_integer(modelica_integer i,
-         modelica_integer start,
-         modelica_integer stop)
-{
-  if (start <= stop) {
-      if ((i >= start) && (i <= stop)) {
-          return 1;
-      }
-  } else {
-      if ((i >= stop) && (i <= start)) {
-          return 1;
-      }
-  }
-  return 0;
-}
-
-int in_range_real(modelica_real i,
-      modelica_real start,
-      modelica_real stop)
-{
-  if (start <= stop) {
-      if ((i >= start) && (i <= stop)) {
-          return 1;
-      }
-  } else {
-      if ((i >= stop) && (i <= start)) {
-          return 1;
-      }
-  }
-  return 0;
-}
-
-modelica_real modelica_div(modelica_real x, modelica_real y)
-{
-  return (modelica_real)((modelica_integer)(x/y));
-}
-
-modelica_real modelica_mod_real(modelica_real x, modelica_real y)
-{
-  return (x - (floor(x/y) * y));
-}
-
-modelica_integer modelica_mod_integer(modelica_integer x, modelica_integer y)
-{
-  return x % y;
-}
-
-modelica_real modelica_rem_real(modelica_real x, modelica_real y)
-{
-  return x - (y*(modelica_div(x,y)));
-}
-
-modelica_integer modelica_rem_integer(modelica_integer x, modelica_integer y)
-{
-  return x - (y*((x/y)));
-}
-
-modelica_integer modelica_integer_min(modelica_integer x,modelica_integer y)
-{
-  return (x<y) ? x : y;
-}
-
-modelica_integer modelica_integer_max(modelica_integer x,modelica_integer y)
-{
-  return (x>y) ? x : y;
-}
 
 modelica_real real_int_pow(modelica_real base, modelica_integer n)
 {

c_runtime/utility.h

@@ -35,26 +35,82 @@
 
 #include "modelica.h"
 
-extern int in_range_integer(modelica_integer i,
+
+
+static inline int in_range_integer(modelica_integer i,
          modelica_integer start,
-         modelica_integer stop);
+         modelica_integer stop)
+{
+  if (start <= stop) {
+      if ((i >= start) && (i <= stop)) {
+          return 1;
+      }
+  } else {
+      if ((i >= stop) && (i <= start)) {
+          return 1;
+      }
+  }
+  return 0;
+}
 
-extern int in_range_real(modelica_real i,
+static inline int in_range_real(modelica_real i,
       modelica_real start,
-      modelica_real stop);
+      modelica_real stop)
+{
+  if (start <= stop) {
+      if ((i >= start) && (i <= stop)) {
+          return 1;
+      }
+  } else {
+      if ((i >= stop) && (i <= start)) {
+          return 1;
+      }
+  }
+  return 0;
+}
+
 
 /* div is already defined in stdlib, so it's redefined here to modelica_div */
-extern modelica_real modelica_div(modelica_real x, modelica_real y);
+static inline modelica_real modelica_div(modelica_real x, modelica_real y)
+{
+  return (modelica_real)((modelica_integer)(x/y));
+}
+
+
 /* fmod in math.h does not work in the same way as mod defined by modelica, so
  * we need to define our own mod. */
-extern modelica_real modelica_mod_real(modelica_real x, modelica_real y);
-extern modelica_integer modelica_mod_integer(modelica_integer x, modelica_integer y);
+static inline modelica_real modelica_mod_real(modelica_real x, modelica_real y)
+{
+  return (x - (floor(x/y) * y));
+}
+
+static inline modelica_integer modelica_mod_integer(modelica_integer x, modelica_integer y)
+{
+  return x % y;
+}
+
+
+static inline modelica_real modelica_rem_real(modelica_real x, modelica_real y)
+{
+  return x - (y*(modelica_div(x,y)));
+}
+
+static inline modelica_integer modelica_rem_integer(modelica_integer x, modelica_integer y)
+{
+  return x - (y*((x/y)));
+}
+
+
+static inline modelica_integer modelica_integer_min(modelica_integer x,modelica_integer y)
+{
+  return (x<y) ? x : y;
+}
 
-extern modelica_real modelica_rem_real(modelica_real x, modelica_real y);
-extern modelica_integer modelica_rem_integer(modelica_integer x, modelica_integer y);
+static inline modelica_integer modelica_integer_max(modelica_integer x,modelica_integer y)
+{
+  return (x>y) ? x : y;
+}
 
-extern modelica_integer modelica_integer_min(modelica_integer x, modelica_integer y);
-extern modelica_integer modelica_integer_max(modelica_integer x, modelica_integer y);
 
 #define reduction_sum(X,Y) ((X)+(Y))
 #define reduction_product(X,Y) ((X)*(Y))