2008-09-29 Joel Sherrill <joel.sherrill@oarcorp.com>

* support/timer_driver.adb, support/timer_driver.ads,
	tmtests/tm01/tmtest.adb, tmtests/tm02/tmtest.adb,
	tmtests/tm03/tmtest.adb, tmtests/tm04/tmtest.adb,
	tmtests/tm05/tmtest.adb, tmtests/tm06/tmtest.adb,
	tmtests/tm07/tmtest.adb, tmtests/tm08/tmtest.adb,
	tmtests/tm09/tmtest.adb, tmtests/tm10/tmtest.adb,
	tmtests/tm11/tmtest.adb, tmtests/tm12/tmtest.adb,
	tmtests/tm13/tmtest.adb, tmtests/tm14/tmtest.adb,
	tmtests/tm15/tmtest.adb, tmtests/tm16/tmtest.adb,
	tmtests/tm17/tmtest.adb, tmtests/tm18/tmtest.adb,
	tmtests/tm19/tmtest.adb, tmtests/tm20/config.h,
	tmtests/tm20/tmtest.adb, tmtests/tm21/tmtest.adb,
	tmtests/tm22/tmtest.adb, tmtests/tm23/tmtest.adb,
	tmtests/tm24/tmtest.adb, tmtests/tm25/tmtest.adb,
	tmtests/tm28/tmtest.adb, tmtests/tm29/tmtest.adb,
	tmtests/tmck/tmtest.adb, tmtests/tmoverhd/tmtest.adb: Clean up.
	Verified to run on psim with gcc 4.3.2.
This commit is contained in:
Joel Sherrill
2008-09-29 20:44:38 +00:00
parent e606ce0d44
commit 3b1a322ee1
33 changed files with 74 additions and 6 deletions

View File

@@ -1,3 +1,23 @@
2008-09-29 Joel Sherrill <joel.sherrill@oarcorp.com>
* support/timer_driver.adb, support/timer_driver.ads,
tmtests/tm01/tmtest.adb, tmtests/tm02/tmtest.adb,
tmtests/tm03/tmtest.adb, tmtests/tm04/tmtest.adb,
tmtests/tm05/tmtest.adb, tmtests/tm06/tmtest.adb,
tmtests/tm07/tmtest.adb, tmtests/tm08/tmtest.adb,
tmtests/tm09/tmtest.adb, tmtests/tm10/tmtest.adb,
tmtests/tm11/tmtest.adb, tmtests/tm12/tmtest.adb,
tmtests/tm13/tmtest.adb, tmtests/tm14/tmtest.adb,
tmtests/tm15/tmtest.adb, tmtests/tm16/tmtest.adb,
tmtests/tm17/tmtest.adb, tmtests/tm18/tmtest.adb,
tmtests/tm19/tmtest.adb, tmtests/tm20/config.h,
tmtests/tm20/tmtest.adb, tmtests/tm21/tmtest.adb,
tmtests/tm22/tmtest.adb, tmtests/tm23/tmtest.adb,
tmtests/tm24/tmtest.adb, tmtests/tm25/tmtest.adb,
tmtests/tm28/tmtest.adb, tmtests/tm29/tmtest.adb,
tmtests/tmck/tmtest.adb, tmtests/tmoverhd/tmtest.adb: Clean up.
Verified to run on psim with gcc 4.3.2.
2008-06-06 Joel Sherrill <joel.sherrill@oarcorp.com>
* samples/hello/config.h, sptests/spname01/config.h: These needed

View File

@@ -20,9 +20,21 @@
--
with RTEMS;
with Interfaces.C;
package body Timer_Driver is
--PAGE
--
-- Empty_function
--
--
procedure Empty_Function
is
begin
Null;
end Empty_Function;
--PAGE
--
-- Set_Find_Average_Overhead
@@ -33,12 +45,18 @@ package body Timer_Driver is
Find_Flag : in Standard.Boolean
) is
procedure Set_Find_Average_Overhead_base (
Find_Flag : in RTEMS.Boolean
Find_Flag : in Interfaces.Unsigned_8
);
pragma Import (C, Set_Find_Average_Overhead_base,
"Set_find_average_overhead");
"benchmark_timer_disable_subtracting_average_overhead");
c: Interfaces.Unsigned_8;
begin
Set_Find_Average_Overhead_base (RTEMS.From_Ada_Boolean (Find_Flag));
if Find_Flag then
c := 1;
else
c := 0;
end if;
Set_Find_Average_Overhead_base (c);
end Set_Find_Average_Overhead;
end Timer_Driver;

View File

@@ -32,7 +32,7 @@ package Timer_Driver is
--
procedure Initialize;
pragma Import (C, Initialize, "Timer_initialize");
pragma Import (C, Initialize, "benchmark_timer_initialize");
--
-- Read_Timer
@@ -46,7 +46,7 @@ package Timer_Driver is
function Read_Timer
return RTEMS.Unsigned32;
pragma Import (C, Read_Timer, "Read_timer");
pragma Import (C, Read_Timer, "benchmark_timer_read");
--
-- Empty_Function
@@ -60,7 +60,6 @@ package Timer_Driver is
--
procedure Empty_Function;
pragma Import (C, Empty_Function, "Empty_function");
--
-- Set_Find_Average_Overhead

View File

@@ -266,6 +266,8 @@ package body TMTEST is
SEMAPHORE_RELEASE_LOOP_TIME * 2,
RTEMS_CALLING_OVERHEAD.SEMAPHORE_RELEASE
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 1 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end TASK_1;

View File

@@ -199,6 +199,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.SEMAPHORE_OBTAIN
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 2 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end LOW_TASK;

View File

@@ -179,6 +179,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.SEMAPHORE_RELEASE
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 3 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end HIGH_TASK;

View File

@@ -399,6 +399,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.TASK_DELETE
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 4 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end HIGH_TASK;

View File

@@ -119,6 +119,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.TASK_RESUME
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 5 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end HIGH_TASK;

View File

@@ -185,6 +185,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.TASK_DELETE
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 6 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end TASK_1;

View File

@@ -120,6 +120,7 @@ package body TMTEST is
RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
end if;
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 07 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end HIGH_TASK;

View File

@@ -307,6 +307,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.CLOCK_GET
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 8 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end TEST_TASK;

View File

@@ -109,6 +109,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_DELETE
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 9 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end TEST_TASK;

View File

@@ -215,6 +215,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_RECEIVE
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 10 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end LOW_TASK;

View File

@@ -175,6 +175,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_SEND
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 11 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end HIGH_TASK;

View File

@@ -174,6 +174,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_SEND
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 12 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end HIGH_TASK;

View File

@@ -173,6 +173,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_URGENT
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 13 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end HIGH_TASK;

View File

@@ -180,6 +180,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_URGENT
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 14 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end HIGH_TASK;

View File

@@ -237,6 +237,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.EVENT_SEND
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 15 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end LOW_TASK;

View File

@@ -188,6 +188,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.EVENT_SEND
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 16 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end HIGH_TASK;

View File

@@ -151,6 +151,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.TASK_SET_PRIORITY
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 17 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end LAST_TASK;

View File

@@ -145,6 +145,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.TASK_DELETE
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 18 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end LAST_TASK;

View File

@@ -277,6 +277,7 @@ package body TMTEST is
0
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 19 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end TASK_3;

View File

@@ -22,6 +22,7 @@
#define CONFIGURE_MAXIMUM_PARTITIONS 1
#define CONFIGURE_MAXIMUM_REGIONS 1
#define CONFIGURE_MAXIMUM_TASKS 3
#define CONFIGURE_TICKS_PER_TIMESLICE 0
#define CONFIGURE_POSIX_INIT_THREAD_TABLE

View File

@@ -393,6 +393,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.REGION_DELETE
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 20 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end TASK_1;

View File

@@ -293,6 +293,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_IDENT
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 21 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end TASK_1;

View File

@@ -218,6 +218,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_BROADCAST
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 22 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end LOW_TASK;

View File

@@ -389,6 +389,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.TASK_WAKE_WHEN
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 23 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end LOW_TASK;

View File

@@ -151,6 +151,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.TASK_WAKE_AFTER
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 24 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end if;

View File

@@ -148,6 +148,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.CLOCK_TICK
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 25 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end LOW_TASK;

View File

@@ -167,6 +167,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.PORT_DELETE
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 28 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end TEST_TASK;

View File

@@ -224,6 +224,7 @@ package body TMTEST is
RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_PERIOD
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST 29 ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end LOW_TASK;

View File

@@ -152,6 +152,7 @@ TEST_SUPPORT.PAUSE;
0
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST CHECK ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end TASK_1;

View File

@@ -1396,6 +1396,7 @@ TEST_SUPPORT.PAUSE;
0
);
TEXT_IO.PUT_LINE( "*** END OF TIME TEST OVERHEAD ***" );
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
end TASK_1;