- Updated code for rtclock.{c,h}. The new stopwatch uses a clock inde…

…x outside the range of the user-accessible clocks instead of 13. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@6106 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 13, 2010 · 9f11b67 · 9f11b67
1 parent 1e6d000
commit 9f11b67
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Compiler/runtime/rtclock.c b/Compiler/runtime/rtclock.c
@@ -28,8 +28,6 @@
  *
  */
 
-#define NUM_RT_CLOCKS 16
-
 #if defined(__MINGW32__) || defined(_MSC_VER)
 
 #include <windows.h>

diff --git a/Compiler/runtime/rtclock.h b/Compiler/runtime/rtclock.h
@@ -31,6 +31,10 @@
 #ifndef __RTCLOCK__H
 #define __RTCLOCK__H
 
+#define NUM_RT_CLOCKS 17
+#define NUM_USER_RT_CLOCKS 16
+#define RT_CLOCK_SPECIAL_STOPWATCH 16 /* The 17th clock */
+
 void rt_tick(int ix);
 double rt_tock(int ix);
 

diff --git a/Compiler/runtime/systemimpl.c b/Compiler/runtime/systemimpl.c
@@ -2983,7 +2983,7 @@ RML_END_LABEL
 RML_BEGIN_LABEL(System__realtimeTick)
 {
   int ix = RML_UNTAGFIXNUM(rmlA0);
-  if (ix < 0 || ix > 15) RML_TAILCALLK(rmlFC);
+  if (ix < 0 || ix >= NUM_USER_RT_CLOCKS) RML_TAILCALLK(rmlFC);
   rt_tick(ix);
   RML_TAILCALLK(rmlSC);
 }
@@ -2992,7 +2992,7 @@ RML_END_LABEL
 RML_BEGIN_LABEL(System__realtimeTock)
 {
   int ix = RML_UNTAGFIXNUM(rmlA0);
-  if (ix < 0 || ix > 15) RML_TAILCALLK(rmlFC);
+  if (ix < 0 || ix >= NUM_USER_RT_CLOCKS) RML_TAILCALLK(rmlFC);
   rmlA0 = mk_rcon(rt_tock(ix));
   RML_TAILCALLK(rmlSC);
 }
@@ -3011,15 +3011,15 @@ RML_END_LABEL
 RML_BEGIN_LABEL(System__startTimer)
 {
   /* start the timer */
-  rt_tick(13);
+  rt_tick(RT_CLOCK_SPECIAL_STOPWATCH);
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL
 
 RML_BEGIN_LABEL(System__stopTimer)
 {
   /* cummulate the timer time */
-  timerTime += rt_tock(13);
+  timerTime += rt_tock(RT_CLOCK_SPECIAL_STOPWATCH);
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL