Changeset 3ad7602e in rtems

Timestamp:

12/20/99 15:21:31 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

8b91282

Parents:

947c27aa

Message:

Modifications to avoid having the size of the Buffer_addresses array
too small when OPERATION_COUNT is less than 10.

Files:

• c/src/tests/tmtests/tm20/task1.c (modified) (5 diffs)
• testsuites/tmtests/tm20/task1.c (modified) (5 diffs)

c/src/tests/tmtests/tm20/task1.c

@@ -13 +13 @@
 #define TEST_INIT
 #include "system.h"
+#include <assert.h>
 
 rtems_device_major_number _STUB_major = 1;
@@ -20 +21 @@
 rtems_unsigned8  Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
 
+#define PARTITION_SIZE         2048
+#define PARTITION_ELEMENT_SIZE  128
+#define PARTITION_BUFFER_POINTERS \
+    ((PARTITION_SIZE / PARTITION_ELEMENT_SIZE) + 2)
+
 rtems_id         Partition_id;
 rtems_name       Partition_name;
-rtems_unsigned8  Partition_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
-
-void            *Buffer_address_1;
-void            *Buffer_address_2;
-void            *Buffer_address_3;
-void            *Buffer_address_4;
+rtems_unsigned8  Partition_area[ PARTITION_SIZE ] CPU_STRUCTURE_ALIGNMENT;
+
+void  *Buffer_address_1;
+void  *Buffer_address_2;
+void  *Buffer_address_3;
+void  *Buffer_address_4;
 
 rtems_unsigned32 buffer_count;
 
-void            *Buffer_addresses[ OPERATION_COUNT+1 ];
+void  *Buffer_addresses[ PARTITION_BUFFER_POINTERS ];
 
 rtems_task Task_1(
@@ -96 +102 @@
       Partition_name,
       Partition_area,
-      2048,
+      PARTITION_SIZE,
       128,
       RTEMS_DEFAULT_ATTRIBUTES,
@@ -155 +161 @@
 
     buffer_count++;
+
+    assert( buffer_count < PARTITION_BUFFER_POINTERS );
   }
 
@@ -210 +218 @@
              &Buffer_address_2
            );
-  directive_failed( status, "region_get_semgent" );
+  directive_failed( status, "region_get_segment" );
 
   Timer_initialize();

testsuites/tmtests/tm20/task1.c

@@ -13 +13 @@
 #define TEST_INIT
 #include "system.h"
+#include <assert.h>
 
 rtems_device_major_number _STUB_major = 1;
@@ -20 +21 @@
 rtems_unsigned8  Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
 
+#define PARTITION_SIZE         2048
+#define PARTITION_ELEMENT_SIZE  128
+#define PARTITION_BUFFER_POINTERS \
+    ((PARTITION_SIZE / PARTITION_ELEMENT_SIZE) + 2)
+
 rtems_id         Partition_id;
 rtems_name       Partition_name;
-rtems_unsigned8  Partition_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
-
-void            *Buffer_address_1;
-void            *Buffer_address_2;
-void            *Buffer_address_3;
-void            *Buffer_address_4;
+rtems_unsigned8  Partition_area[ PARTITION_SIZE ] CPU_STRUCTURE_ALIGNMENT;
+
+void  *Buffer_address_1;
+void  *Buffer_address_2;
+void  *Buffer_address_3;
+void  *Buffer_address_4;
 
 rtems_unsigned32 buffer_count;
 
-void            *Buffer_addresses[ OPERATION_COUNT+1 ];
+void  *Buffer_addresses[ PARTITION_BUFFER_POINTERS ];
 
 rtems_task Task_1(
@@ -96 +102 @@
       Partition_name,
       Partition_area,
-      2048,
+      PARTITION_SIZE,
       128,
       RTEMS_DEFAULT_ATTRIBUTES,
@@ -155 +161 @@
 
     buffer_count++;
+
+    assert( buffer_count < PARTITION_BUFFER_POINTERS );
   }
 
@@ -210 +218 @@
              &Buffer_address_2
            );
-  directive_failed( status, "region_get_semgent" );
+  directive_failed( status, "region_get_segment" );
 
   Timer_initialize();