fix a corner case for list region calculators

ARM-software · Nov 25, 2024 · 7c0b5f8 · 7c0b5f8
1 parent 01a5f28
commit 7c0b5f8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/ARM.Arm-2D.pdsc b/ARM.Arm-2D.pdsc
@@ -318,7 +318,7 @@
           </RTE_Components_h>
         </component>
 
-        <component Cclass="Acceleration" Cgroup="Arm-2D Helper" Csub="PFB" Cversion="2.4.1" condition="Arm-2D-CORE">
+        <component Cclass="Acceleration" Cgroup="Arm-2D Helper" Csub="PFB" Cversion="2.4.2" condition="Arm-2D-CORE">
           <description>Helper services for LCD adaptor(s), e.g. Generic Partial Framebuffer, Scene Player etc.</description>
           <files>
             <file category="include"     name="Helper/Include/" />

diff --git a/Helper/Include/arm_2d_helper_list.h b/Helper/Include/arm_2d_helper_list.h
@@ -21,8 +21,8 @@
  * Title:        #include "arm_2d_helper_list.h"
  * Description:  Public header file for list core related services
  *
- * $Date:        24. Nov 2024
- * $Revision:    V.2.1.0
+ * $Date:        25. Nov 2024
+ * $Revision:    V.2.1.1
  *
  * Target Processor:  Cortex-M cores
  * -------------------------------------------------------------------- */

diff --git a/Helper/Source/arm_2d_helper_list.c b/Helper/Source/arm_2d_helper_list.c
@@ -21,8 +21,8 @@
  * Title:        #include "arm_2d_helper_list.h"
  * Description:  Public header file for list core related services
  *
- * $Date:        24. Nov 2024
- * $Revision:    V.2.1.0
+ * $Date:        25. Nov 2024
+ * $Revision:    V.2.1.1
  *
  * Target Processor:  Cortex-M cores
  * -------------------------------------------------------------------- */
@@ -442,6 +442,7 @@ ARM_PT_BEGIN(this.Runtime.chState)
         } 
     } while(0);
 
+
     /* finish drawing */
     if (!this.Runtime.bIsMoving) {
         if (this.tCFG.nTotalLength > 0) {
@@ -456,6 +457,7 @@ ARM_PT_BEGIN(this.Runtime.chState)
         }
     }
 
+
 label_end_of_list_core_task:
 ARM_PT_END()
 
@@ -1235,18 +1237,18 @@ ARM_PT_BEGIN(this.chState)
         nOffset = this.nOffset;
     }
 
+    if (ARM_2D_ERR_NONE != __calculator_offset_update(ptThis, fnIterator, &nOffset, bMidAligned)) {
+        /* no valid item, return NULL */
+        ARM_PT_RETURN(NULL)
+    }
+
     if (this.tCFG.nTotalLength) {
         nOffset = __arm_2d_list_safe_mod(nOffset, this.tCFG.nTotalLength, bMidAligned);
         if (nOffset >= 0) {
             nOffset -= this.tCFG.nTotalLength;
         }
     }
 
-    if (ARM_2D_ERR_NONE != __calculator_offset_update(ptThis, fnIterator, &nOffset, bMidAligned)) {
-        /* no valid item, return NULL */
-        ARM_PT_RETURN(NULL)
-    }
-
     /* no ring mode */
     if (this.tCFG.bDisableRingMode) {
 
@@ -1702,18 +1704,18 @@ ARM_PT_BEGIN(this.chState)
         nOffset = this.nOffset;
     }
 
+    if (ARM_2D_ERR_NONE != __calculator_offset_update(ptThis, fnIterator, &nOffset, bMidAligned)) {
+        /* no valid item, return NULL */
+        ARM_PT_RETURN(NULL)
+    }
+
     if (this.tCFG.nTotalLength) {
         nOffset = __arm_2d_list_safe_mod(nOffset, this.tCFG.nTotalLength, bMidAligned);
         if (nOffset >= 0) {
             nOffset -= this.tCFG.nTotalLength;
         }
     }
 
-    if (ARM_2D_ERR_NONE != __calculator_offset_update(ptThis, fnIterator, &nOffset, bMidAligned)) {
-        /* no valid item, return NULL */
-        ARM_PT_RETURN(NULL)
-    }
-
     /* no ring mode */
     if (this.tCFG.bDisableRingMode) {
 
@@ -2171,19 +2173,18 @@ ARM_PT_BEGIN(this.chState)
         nOffset = this.nOffset;
     }
 
+    if (ARM_2D_ERR_NONE != __calculator_offset_update(ptThis, fnIterator, &nOffset, bMidAligned)) {
+        /* no valid item, return NULL */
+        ARM_PT_RETURN(NULL)
+    }
+
     if (this.tCFG.nTotalLength) {
         nOffset = __arm_2d_list_safe_mod(nOffset, this.tCFG.nTotalLength, bMidAligned);
         if (nOffset >= 0) {
             nOffset -= this.tCFG.nTotalLength;
         }
     }
 
-    if (ARM_2D_ERR_NONE != __calculator_offset_update(ptThis, fnIterator, &nOffset, bMidAligned)) {
-        /* no valid item, return NULL */
-        ARM_PT_RETURN(NULL)
-    }
-
-
     /* no ring mode */
     if (this.tCFG.bDisableRingMode) {
 
@@ -2662,18 +2663,18 @@ ARM_PT_BEGIN(this.chState)
         nOffset = this.nOffset;
     }
 
+    if (ARM_2D_ERR_NONE != __calculator_offset_update(ptThis, fnIterator, &nOffset, bMidAligned)) {
+        /* no valid item, return NULL */
+        ARM_PT_RETURN(NULL)
+    }
+
     if (this.tCFG.nTotalLength) {
         nOffset = __arm_2d_list_safe_mod(nOffset, this.tCFG.nTotalLength, bMidAligned);
         if (nOffset >= 0) {
             nOffset -= this.tCFG.nTotalLength;
         }
     }
 
-    if (ARM_2D_ERR_NONE != __calculator_offset_update(ptThis, fnIterator, &nOffset, bMidAligned)) {
-        /* no valid item, return NULL */
-        ARM_PT_RETURN(NULL)
-    }
-
     /* no ring mode */
     if (this.tCFG.bDisableRingMode) {