Нюансы профилировщика и некоторые другие нюансы

bmstu-iu9 · Mar 5, 2018 · 9fac618 · 9fac618
1 parent 0c90f23
commit 9fac618
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/src/compiler/HighLevelRASL-Condition.sref b/src/compiler/HighLevelRASL-Condition.sref
@@ -65,7 +65,10 @@ $ENTRY SentenceTail{
         )
       : e.CmdSentenceCommands
 
-    = e.CondResultCommands e.CmdSentenceCommands 
+    = e.CondResultCommands
+      (#CmdProfilerStopSentence)
+      (#CmdProfileFunction)
+      e.CmdSentenceCommands
       : e.SentenceCommands
 
     = s.StackTop e.SentenceCommands;

diff --git a/src/compiler/HighLevelRASL.sref b/src/compiler/HighLevelRASL.sref
@@ -46,7 +46,7 @@ $ENTRY HighLevelRASL {
               ((e.Pattern) e.Conditions (e.Result))
                 = <Map
                     {
-                      (#Condition (e.Name) (e.Result^) (e.Pattern^))
+                      (#Condition (e.Name^) (e.Result^) (e.Pattern^))
                         = (#CmdEnum #GN-Local e.Name);
                     }
                     e.Conditions

diff --git a/src/compiler/Opcodes.sref b/src/compiler/Opcodes.sref
@@ -118,6 +118,7 @@ $ENTRY NumberFromOpcode{
   #CmdPerformNative = 109;
   #CmdScale = 111;
   #CmdVariableDebugOffset = 112;
+  #CmdSpliceToFreeList-Range = 115;
 }
 
 $ENTRY NumberFromBracket{

diff --git a/src/srlib/refalrts.cpp b/src/srlib/refalrts.cpp
@@ -525,7 +525,8 @@ refalrts::Iter refalrts::call_left(
   refalrts::Iter right_bracket = last;
   refalrts::Iter function = next(left_bracket);
 
-  assert(left_bracket->link_info == right_bracket);
+  // TODO: проверить после завершения разработки условий
+  //assert(left_bracket->link_info == right_bracket);
 
   if (next(function) != right_bracket) {
     res_first = next(function);
@@ -2007,7 +2008,16 @@ int refalrts::profiler::reverse_compare(
 
 void refalrts::profiler::start_generated_function() {
   clock_t now = clock();
-  refalrts_profiler_assert_eq(g_current_state, cInRuntime);
+  // TODO: проверить после завершения разработки условий
+  //refalrts_profiler_assert_eq(g_current_state, cInRuntime);
+  switch (g_current_state) {
+    case cInRuntime:
+    case cInResultLinear:
+      break;
+
+    default:
+      refalrts_switch_default_violation(g_current_state);
+  }
   g_counters[cCounter_RuntimeTime] += (now - g_prev_cutoff);
   g_prev_cutoff = now;
   g_current_state = cInPatternLinear;