Merge pull request #1017 from slaclab/block_alignment

Fix var bytes calculation to support list variables which span transaction size
slaclab · Aug 28, 2024 · a3d3818 · a3d3818
2 parents d19e4b2 + 156c650
commit a3d3818
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/rogue/interfaces/memory/Block.cpp b/src/rogue/interfaces/memory/Block.cpp
@@ -511,14 +511,14 @@ void rim::Block::addVariables(std::vector<rim::VariablePtr> variables) {
                     (*vit)->verifyEn_);
             }
 
-            // List variables
+        // List variables
         } else {
             for (x = 0; x < (*vit)->numValues_; x++) {
                 // Variable allows overlaps, add to overlap enable mask
                 if ((*vit)->overlapEn_) {
                     setBits(oleMask, x * (*vit)->valueStride_ + (*vit)->bitOffset_[0], (*vit)->valueBits_);
 
-                    // Otherwise add to exclusive mask and check for existing mapping
+                // Otherwise add to exclusive mask and check for existing mapping
                 } else {
                     if (anyBits(excMask, x * (*vit)->valueStride_ + (*vit)->bitOffset_[0], (*vit)->valueBits_))
                         throw(rogue::GeneralError::create(

diff --git a/src/rogue/interfaces/memory/Variable.cpp b/src/rogue/interfaces/memory/Variable.cpp
@@ -470,7 +470,7 @@ void rim::Variable::shiftOffsetDown(uint32_t shift, uint32_t minSize) {
         highTranByte_[0] = varBytes_ - 1;
         staleHighByte_   = highTranByte_[0];
 
-        // List variable
+    // List variable
     } else {
         for (x = 0; x < numValues_; x++) {
             lowTranByte_[x] =
@@ -487,7 +487,7 @@ void rim::Variable::shiftOffsetDown(uint32_t shift, uint32_t minSize) {
         }
 
         // Compute total bit range of accessed bytes
-        varBytes_      = highTranByte_[numValues_ - 1] - lowTranByte_[0] + 1;
+        varBytes_      = highTranByte_[numValues_ - 1] + 1;
         staleHighByte_ = highTranByte_[numValues_ - 1];
     }
 

diff --git a/tests/test_list_memory.py b/tests/test_list_memory.py
@@ -16,7 +16,7 @@
 import numpy as np
 import random
 
-#rogue.Logging.setLevel(rogue.Logging.Warning)
+#rogue.Logging.setLevel(rogue.Logging.Debug)
 #import logging
 #logger = logging.getLogger('pyrogue')
 #logger.setLevel(logging.DEBUG)