Added offset calculation in to_signal expression.

astand · astand · commit 44e2db26f783 · 2020-11-26T14:46:23.000+03:00
diff --git a/src/codegen/c-sigprinter.cpp b/src/codegen/c-sigprinter.cpp
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include "c-sigprinter.h"
 
 // work buffer for all snprintf operations
@@ -176,7 +177,6 @@ std::string CSigPrinter::PrintSignalExpr(SignalDescriptor_t* sig,
         snprintf(workbuff, WBUFF_LEN, "(%s(_d[%d] & (%s)) << %d)", t64.c_str(), bn, msk[8].c_str(), slen);
         tosigexpr += workbuff;
 
-
         snprintf(workbuff, WBUFF_LEN, "((_m->%s >> %d) & (%s))", sig->Name.c_str(), slen, msk[8].c_str());
         AppendToByteLine(to_bytes[bn], workbuff);
       }
@@ -195,6 +195,17 @@ std::string CSigPrinter::PrintSignalExpr(SignalDescriptor_t* sig,
     }
   }
 
+  if (sig->Offset < 0)
+  {
+    snprintf(workbuff, WBUFF_LEN, "(%s) - %d", tosigexpr.c_str(), abs(sig->RawOffset));
+    tosigexpr = workbuff;
+  }
+  else if (sig->Offset > 0)
+  {
+    snprintf(workbuff, WBUFF_LEN, "(%s) + %d", tosigexpr.c_str(), abs(sig->RawOffset));
+    tosigexpr = workbuff;
+  }
+
   return tosigexpr;
 }
 
@@ -210,4 +221,4 @@ void CSigPrinter::AppendToByteLine(std::string& expr, std::string str)
     // First appending
     expr = str;
   }
-}
+}
