fix: to slot number of strings and bytes that are > 32 bytes

naddison36 · Aug 3, 2022 · 8a5b90d · 8a5b90d
1 parent 2b1e3fb
commit 8a5b90d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/lib/converterClasses2Storage.js b/lib/converterClasses2Storage.js
diff --git a/src/ts/converterClasses2Storage.ts b/src/ts/converterClasses2Storage.ts
@@ -247,12 +247,11 @@ export const parseReferenceStorage = (
             umlClass,
             otherClasses
         )
-        const slotSize = arrayItemSize > 16 ? 32 : arrayItemSize
 
         const firstVariable: Variable = {
             id: variableId++,
             fromSlot: 0,
-            toSlot: Math.floor((slotSize - 1) / 32),
+            toSlot: Math.floor((arrayItemSize - 1) / 32),
             byteSize: arrayItemSize,
             byteOffset: 0,
             type: baseType,
@@ -264,10 +263,10 @@ export const parseReferenceStorage = (
             for (let i = 1; i < arrayLength; i++) {
                 variables.push({
                     id: variableId++,
-                    fromSlot: Math.floor((i * slotSize) / 32),
-                    toSlot: Math.floor(((i + 1) * slotSize - 1) / 32),
+                    fromSlot: Math.floor((i * arrayItemSize) / 32),
+                    toSlot: Math.floor(((i + 1) * arrayItemSize - 1) / 32),
                     byteSize: arrayItemSize,
-                    byteOffset: (i * slotSize) % 32,
+                    byteOffset: (i * arrayItemSize) % 32,
                     type: baseType,
                     dynamic,
                     noValue: false,