From bc96f3b4b889891cb685c4bbcaf12166ca08331c Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 23 Jan 2018 09:53:06 +0100 Subject: ada: Introduce RTEMS.Size type Some time ago the Classic API object size related parameters were changed to use size_t. Reflect this in the Ada bindings. Update #3082. --- testsuites/ada/sptests/sp09/sptest.adb | 6 ++++-- testsuites/ada/sptests/sp09/sptest.ads | 8 ++++---- testsuites/ada/sptests/sp12/sp12.adb | 2 ++ testsuites/ada/sptests/sp13/sptest.adb | 21 +++++++++++---------- testsuites/ada/sptests/sp14/sptest.adb | 2 ++ testsuites/ada/support/init.c | 4 ++-- testsuites/ada/support/test_support.adb | 4 ++-- testsuites/ada/support/test_support.ads | 2 +- testsuites/ada/tmtests/tm09/tmtest.adb | 2 +- testsuites/ada/tmtests/tm10/tmtest.adb | 6 +++--- testsuites/ada/tmtests/tm11/tmtest.adb | 4 ++-- testsuites/ada/tmtests/tm12/tmtest.adb | 2 +- testsuites/ada/tmtests/tm13/tmtest.adb | 4 ++-- testsuites/ada/tmtests/tm14/tmtest.adb | 2 +- testsuites/ada/tmtests/tm22/tmtest.adb | 2 +- 15 files changed, 39 insertions(+), 32 deletions(-) (limited to 'testsuites') diff --git a/testsuites/ada/sptests/sp09/sptest.adb b/testsuites/ada/sptests/sp09/sptest.adb index 519d0ad4cb..7ebb67b54e 100644 --- a/testsuites/ada/sptests/sp09/sptest.adb +++ b/testsuites/ada/sptests/sp09/sptest.adb @@ -30,6 +30,8 @@ with RTEMS.RATE_MONOTONIC; with RTEMS.REGION; with RTEMS.SEMAPHORE; with RTEMS.TIMER; +with Interfaces.C; +use Interfaces.C; package body SPTEST is @@ -1126,7 +1128,7 @@ package body SPTEST is BUFFER : SPTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; COUNT : RTEMS.UNSIGNED32; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin @@ -3035,7 +3037,7 @@ package body SPTEST is pragma Unreferenced(ARGUMENT); BUFFER : SPTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin diff --git a/testsuites/ada/sptests/sp09/sptest.ads b/testsuites/ada/sptests/sp09/sptest.ads index d1bef16c96..7191dd59ce 100644 --- a/testsuites/ada/sptests/sp09/sptest.ads +++ b/testsuites/ada/sptests/sp09/sptest.ads @@ -161,12 +161,12 @@ package SPTEST is -- starting area and length. -- - REGION_GOOD_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 4095 ) - of RTEMS.UNSIGNED32; + REGION_GOOD_AREA : array ( RTEMS.Size range 0 .. 4095 ) + of RTEMS.Size; for REGION_GOOD_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT; - REGION_START_OFFSET : constant RTEMS.UNSIGNED32 := 2048; - REGION_LENGTH : constant RTEMS.UNSIGNED32 := 512; + REGION_START_OFFSET : constant RTEMS.Size := 2048; + REGION_LENGTH : constant RTEMS.Size := 512; -- -- The following area defines a memory area to be used as the diff --git a/testsuites/ada/sptests/sp12/sp12.adb b/testsuites/ada/sptests/sp12/sp12.adb index 62a5761e51..08a39a869b 100644 --- a/testsuites/ada/sptests/sp12/sp12.adb +++ b/testsuites/ada/sptests/sp12/sp12.adb @@ -22,6 +22,8 @@ with RTEMS; with RTEMS.TASKS; with SPTEST; with TEST_SUPPORT; +with Interfaces.C; +use Interfaces.C; procedure SP12 is INIT_ID : RTEMS.ID; diff --git a/testsuites/ada/sptests/sp13/sptest.adb b/testsuites/ada/sptests/sp13/sptest.adb index 96b74618b7..7621af6252 100644 --- a/testsuites/ada/sptests/sp13/sptest.adb +++ b/testsuites/ada/sptests/sp13/sptest.adb @@ -25,6 +25,7 @@ with TEST_SUPPORT; with TEXT_IO; with UNSIGNED32_IO; use type RTEMS.STATUS_CODES; +use type RTEMS.Size; package body SPTEST is @@ -227,9 +228,9 @@ package body SPTEST is BUFFER : SPTEST.BUFFER; BUFFER_POINTER : constant RTEMS.ADDRESS := BUFFER'ADDRESS; COUNT : RTEMS.UNSIGNED32; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; - SIZE : RTEMS.UNSIGNED32 := 0; + SIZE : RTEMS.Size := 0; begin RTEMS.MESSAGE_QUEUE.IDENT( @@ -578,7 +579,7 @@ TEST_SUPPORT.PAUSE; RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 2, -- just 2 msgs each - RTEMS.UNSIGNED32( QUEUE_SIZE ), + RTEMS.Size( QUEUE_SIZE ), RTEMS.DEFAULT_ATTRIBUTES, QUEUE_ID( 1 ), STATUS @@ -606,7 +607,7 @@ TEST_SUPPORT.PAUSE; RTEMS.MESSAGE_QUEUE.CREATE( SPTEST.QUEUE_NAME( 1 ), 2, -- just 2 msgs each - RTEMS.UNSIGNED32( QUEUE_SIZE ), + RTEMS.Size( QUEUE_SIZE ), RTEMS.DEFAULT_ATTRIBUTES, SPTEST.QUEUE_ID( 1 ), STATUS @@ -620,7 +621,7 @@ TEST_SUPPORT.PAUSE; RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BIG_SEND_BUFFER_POINTER, - RTEMS.UNSIGNED32( QUEUE_SIZE + 1 ), + RTEMS.Size( QUEUE_SIZE + 1 ), STATUS ); TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( @@ -631,7 +632,7 @@ TEST_SUPPORT.PAUSE; RTEMS.MESSAGE_QUEUE.SEND( SPTEST.QUEUE_ID( 1 ), BIG_SEND_BUFFER_POINTER, - RTEMS.UNSIGNED32( QUEUE_SIZE ), + RTEMS.Size( QUEUE_SIZE ), STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( @@ -639,7 +640,7 @@ TEST_SUPPORT.PAUSE; ); -- now read and verify the message just sent - SIZE := INTERFACES.UNSIGNED_32(QUEUE_SIZE); + SIZE := RTEMS.Size(QUEUE_SIZE); RTEMS.MESSAGE_QUEUE.RECEIVE( SPTEST.QUEUE_ID( 1 ), BIG_RECEIVE_BUFFER_POINTER, @@ -651,7 +652,7 @@ TEST_SUPPORT.PAUSE; TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "message_queue_receive exact size" ); - if SIZE /= RTEMS.UNSIGNED32( QUEUE_SIZE ) then + if SIZE /= RTEMS.Size( QUEUE_SIZE ) then TEXT_IO.PUT( "TA1 - exact size size match failed for queue_size = " ); @@ -694,7 +695,7 @@ TEST_SUPPORT.PAUSE; BUFFER : SPTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin @@ -830,7 +831,7 @@ TEST_SUPPORT.PAUSE; BUFFER : SPTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; COUNT : RTEMS.UNSIGNED32; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin diff --git a/testsuites/ada/sptests/sp14/sptest.adb b/testsuites/ada/sptests/sp14/sptest.adb index eb9ff3c34a..15239e30b4 100644 --- a/testsuites/ada/sptests/sp14/sptest.adb +++ b/testsuites/ada/sptests/sp14/sptest.adb @@ -25,6 +25,8 @@ with UNSIGNED32_IO; with INTERFACES; use INTERFACES; with RTEMS.TIMER; with RTEMS.SIGNAL; +with Interfaces.C; +use Interfaces.C; package body SPTEST is diff --git a/testsuites/ada/support/init.c b/testsuites/ada/support/init.c index 3e395fc15f..413e52e1eb 100644 --- a/testsuites/ada/support/init.c +++ b/testsuites/ada/support/init.c @@ -35,7 +35,7 @@ void ada_test_begin(void); void ada_test_end(void); uint32_t milliseconds_per_tick(void); uint32_t ticks_per_second(void); -uint32_t work_space_size(void); +size_t work_space_size(void); uint32_t is_configured_multiprocessing(void); uint32_t get_node(void); rtems_id tcb_to_id(Thread_Control *tcb); @@ -84,7 +84,7 @@ uint32_t ticks_per_second(void) return rtems_clock_get_ticks_per_second(); } -uint32_t work_space_size(void) +size_t work_space_size(void) { return rtems_configuration_get_work_space_size() + rtems_configuration_get_stack_space_size(); diff --git a/testsuites/ada/support/test_support.adb b/testsuites/ada/support/test_support.adb index bc636cee11..6a46b427ce 100644 --- a/testsuites/ada/support/test_support.adb +++ b/testsuites/ada/support/test_support.adb @@ -227,8 +227,8 @@ package body Test_Support is -- function Work_Space_Size - return RTEMS.Unsigned32 is - function Work_Space_Size_Base return RTEMS.Unsigned32; + return RTEMS.Size is + function Work_Space_Size_Base return RTEMS.Size; pragma Import (C, Work_Space_Size_Base, "work_space_size"); begin return Work_Space_Size_Base; diff --git a/testsuites/ada/support/test_support.ads b/testsuites/ada/support/test_support.ads index e3a71a33a0..a15574782e 100644 --- a/testsuites/ada/support/test_support.ads +++ b/testsuites/ada/support/test_support.ads @@ -181,7 +181,7 @@ package Test_Support is -- function Work_Space_Size - return RTEMS.Unsigned32; + return RTEMS.Size; -- -- Return an indication of whether multiprocessing is configured diff --git a/testsuites/ada/tmtests/tm09/tmtest.adb b/testsuites/ada/tmtests/tm09/tmtest.adb index ee54c199d2..88c016364b 100644 --- a/testsuites/ada/tmtests/tm09/tmtest.adb +++ b/testsuites/ada/tmtests/tm09/tmtest.adb @@ -131,7 +131,7 @@ package body TMTEST is EMPTY_FLUSH_COUNT : RTEMS.UNSIGNED32; BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin diff --git a/testsuites/ada/tmtests/tm10/tmtest.adb b/testsuites/ada/tmtests/tm10/tmtest.adb index 23e2513541..54836fb77d 100644 --- a/testsuites/ada/tmtests/tm10/tmtest.adb +++ b/testsuites/ada/tmtests/tm10/tmtest.adb @@ -61,7 +61,7 @@ package body TMTEST is TASK_ID : RTEMS.ID; BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin @@ -147,7 +147,7 @@ package body TMTEST is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin @@ -176,7 +176,7 @@ package body TMTEST is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin diff --git a/testsuites/ada/tmtests/tm11/tmtest.adb b/testsuites/ada/tmtests/tm11/tmtest.adb index b454462e2f..82ab9da4f1 100644 --- a/testsuites/ada/tmtests/tm11/tmtest.adb +++ b/testsuites/ada/tmtests/tm11/tmtest.adb @@ -149,7 +149,7 @@ package body TMTEST is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin @@ -189,7 +189,7 @@ package body TMTEST is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin diff --git a/testsuites/ada/tmtests/tm12/tmtest.adb b/testsuites/ada/tmtests/tm12/tmtest.adb index 11a4f6abc1..fa469a1eb4 100644 --- a/testsuites/ada/tmtests/tm12/tmtest.adb +++ b/testsuites/ada/tmtests/tm12/tmtest.adb @@ -183,7 +183,7 @@ package body TMTEST is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin diff --git a/testsuites/ada/tmtests/tm13/tmtest.adb b/testsuites/ada/tmtests/tm13/tmtest.adb index 6bb8d3fb01..886579c986 100644 --- a/testsuites/ada/tmtests/tm13/tmtest.adb +++ b/testsuites/ada/tmtests/tm13/tmtest.adb @@ -148,7 +148,7 @@ package body TMTEST is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin @@ -187,7 +187,7 @@ package body TMTEST is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin diff --git a/testsuites/ada/tmtests/tm14/tmtest.adb b/testsuites/ada/tmtests/tm14/tmtest.adb index b2f676e189..72d95bee3c 100644 --- a/testsuites/ada/tmtests/tm14/tmtest.adb +++ b/testsuites/ada/tmtests/tm14/tmtest.adb @@ -194,7 +194,7 @@ package body TMTEST is pragma Unreferenced(ARGUMENT); BUFFER : TMTEST.BUFFER; BUFFER_POINTER : RTEMS.ADDRESS; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin diff --git a/testsuites/ada/tmtests/tm22/tmtest.adb b/testsuites/ada/tmtests/tm22/tmtest.adb index 0ef326b97d..88588bd89d 100644 --- a/testsuites/ada/tmtests/tm22/tmtest.adb +++ b/testsuites/ada/tmtests/tm22/tmtest.adb @@ -137,7 +137,7 @@ package body TMTEST is BUFFER_POINTER : RTEMS.ADDRESS; OVERHEAD : RTEMS.UNSIGNED32; COUNT : RTEMS.UNSIGNED32; - MESSAGE_SIZE : RTEMS.UNSIGNED32 := 0; + MESSAGE_SIZE : RTEMS.Size := 0; STATUS : RTEMS.STATUS_CODES; begin -- cgit v1.2.3