Merge pull request #117 from OptionalAssistant/master

Remove drift variable and unnecessary calculation
zyantific · Mar 27, 2024 · 55aa687 · 55aa687
2 parents fa85e5f + a741fa1
commit 55aa687
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/src/zasm/src/encoder/encoder.context.hpp b/src/zasm/src/encoder/encoder.context.hpp
@@ -45,7 +45,7 @@ namespace zasm
         std::int64_t va{};
         std::int32_t offset{};
         std::int32_t instrSize{};
-        std::int32_t drift{};
+
 
         struct LabelLink
         {

diff --git a/src/zasm/src/serialization/serializer.cpp b/src/zasm/src/serialization/serializer.cpp
@@ -128,18 +128,9 @@ namespace zasm
             alignBytesMissing -= dataIndex;
         }
 
-        if (nodeEntry.length != 0)
+        if (nodeEntry.length != 0 && nodeEntry.length != alignSize)
         {
-            if (alignSize < nodeEntry.length)
-            {
-                ctx.drift += nodeEntry.length - alignSize;
-                ctx.needsExtraPass = true;
-            }
-            else if (alignSize > nodeEntry.length)
-            {
-                ctx.drift -= static_cast<std::int64_t>(alignSize) - nodeEntry.length;
-                ctx.needsExtraPass = true;
-            }
+            ctx.needsExtraPass = true;
         }
         nodeEntry.length = alignSize;
 
@@ -166,18 +157,9 @@ namespace zasm
             auto& nodeEntry = ctx.nodes[ctx.nodeIndex];
             ctx.nodeIndex++;
 
-            if (nodeEntry.length != 0)
+            if (nodeEntry.length != 0 &&  res->buffer.length != nodeEntry.length)
             {
-                if (res->buffer.length < nodeEntry.length)
-                {
-                    ctx.drift += nodeEntry.length - static_cast<std::int64_t>(res->buffer.length);
-                    ctx.needsExtraPass = true;
-                }
-                else if (res->buffer.length > nodeEntry.length)
-                {
-                    ctx.drift -= static_cast<std::int64_t>(res->buffer.length) - nodeEntry.length;
-                    ctx.needsExtraPass = true;
-                }
+                ctx.needsExtraPass = true;
             }
             nodeEntry.length = res->buffer.length;
             nodeEntry.offset = ctx.offset;
@@ -503,7 +485,7 @@ namespace zasm
             encoderCtx.va = newBase;
             encoderCtx.nodeIndex = 0;
             encoderCtx.sectionIndex = 0;
-            encoderCtx.drift = 0;
+
 
             // Setup default section.
             encoderCtx.sections.clear();