Updating marte_non_local_jump to new MaRTE OS file organisation

git-svn-id: http://www.frescor.org/private/svn/frescor/fosa/trunk@1259 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/marte_non_local_jump/context.adb b/marte_non_local_jump/context.adb
index 4c43568854d40da3183c6a8921ab5cc537d183c9..2b0a972e2ab2d018c424fabb8f2f1f4f55b05032 100644 (file)
--- a/marte_non_local_jump/context.adb
+++ b/marte_non_local_jump/context.adb
@@ -22,11 +22,11 @@
 --\r
 --  {MAR>} -------------------------------------------------------------------\r
 with Text_IO; use Text_IO;\r
-with Basic_Integer_Types;\r
+with Marte.Integer_Types;\r
 with Non_Local_Jump;\r
 with System;\r
 \r
-use type Basic_Integer_Types.Unsigned_32;\r
+use type Marte.Integer_Types.Unsigned_32;\r
 \r
 package body Context is\r
 \r

diff --git a/marte_non_local_jump/non_local_jump.adb b/marte_non_local_jump/non_local_jump.adb
index 402a4b357d2524cf9032b3b5e83ca199d0f688ed..2921b9e4246a6da00bc7271781eb4618f0911beb 100644 (file)
--- a/marte_non_local_jump/non_local_jump.adb
+++ b/marte_non_local_jump/non_local_jump.adb
@@ -23,10 +23,10 @@
 --  {MAR>} -------------------------------------------------------------------
 with System.Machine_Code; use System.Machine_Code;
 with Ada.Unchecked_Conversion;
-with Hardware_Interface;
+with Marte.Hal;
 
 package body Non_Local_Jump is
-   use Basic_Integer_Types;
+   use Marte.Integer_Types;
    use System;
 
    pragma Optimize (Off);
@@ -99,7 +99,7 @@ package body Non_Local_Jump is
       Asm ("1: popl %%ebp;",
            No_Output_Operands,
            No_Input_Operands, "", True);
-      Hardware_Interface.Interrupts_Enabled;
+      Marte.Hal.Enable_Interrupts;
    end Save_Context;
 
    ------------------

diff --git a/marte_non_local_jump/non_local_jump.ads b/marte_non_local_jump/non_local_jump.ads
index a9af143ddf299dea085e07357f68ea90a94e82e8..6e0e75cb0d65afa65486a79037b4cd4f9166b032 100644 (file)
--- a/marte_non_local_jump/non_local_jump.ads
+++ b/marte_non_local_jump/non_local_jump.ads
@@ -22,7 +22,7 @@
 --
 --  {MAR>} -------------------------------------------------------------------
 with System;
-with Basic_Integer_Types;
+with Marte.Integer_Types;
 
 package Non_Local_Jump is
    pragma Optimize (Off);
@@ -53,7 +53,7 @@ package Non_Local_Jump is
    --  returning from 'Save_Context' due to a call to 'Restore_Context',
    --  'After_Jump' shall return 1 (True).
    function After_Jump (Context : access Jmp_Context)
-                        return Basic_Integer_Types.Unsigned_32;
+                        return Marte.Integer_Types.Unsigned_32;
    pragma Export (C, After_Jump, "marte_nonlocaljmp_afterjmp");
 
    ---------------------
@@ -97,7 +97,7 @@ package Non_Local_Jump is
 private
 
    type Save_Context_Stack is array (1 .. 29) of  --  17->2005, 29->2007
-     Basic_Integer_Types.Unsigned_32;
+     Marte.Integer_Types.Unsigned_32;
    type Save_Context_Stack_Ac is access Save_Context_Stack;
    --  Stack of 'Save_Context' funcion. The frame created by 'Save_Context' is
    --  16/28 integers long when no optimization is used for this function. The
@@ -112,17 +112,17 @@ private
       --  this instruction from the 'ret' instruction in
       --  'Processor_Registers.Context_Switch'.
 
-      Ebx                : Basic_Integer_Types.Unsigned_32;
-      Ecx                : Basic_Integer_Types.Unsigned_32;
-      Edx                : Basic_Integer_Types.Unsigned_32;
-      Esi                : Basic_Integer_Types.Unsigned_32;
-      Edi                : Basic_Integer_Types.Unsigned_32;
-      Ebp                : Basic_Integer_Types.Unsigned_32;
-      Eax                : Basic_Integer_Types.Unsigned_32;
+      Ebx                : Marte.Integer_Types.Unsigned_32;
+      Ecx                : Marte.Integer_Types.Unsigned_32;
+      Edx                : Marte.Integer_Types.Unsigned_32;
+      Esi                : Marte.Integer_Types.Unsigned_32;
+      Edi                : Marte.Integer_Types.Unsigned_32;
+      Ebp                : Marte.Integer_Types.Unsigned_32;
+      Eax                : Marte.Integer_Types.Unsigned_32;
 
-      Esp                : Basic_Integer_Types.Unsigned_32;  -- top of stack
+      Esp                : Marte.Integer_Types.Unsigned_32;  -- top of stack
 
-      After_Jmp          : Basic_Integer_Types.Unsigned_32;
+      After_Jmp          : Marte.Integer_Types.Unsigned_32;
       -- 0 (False) after a direct invocation to 'Save_Context'. 1 (True) if
       -- 'Restore_Context' has been invoked.
 
@@ -135,7 +135,7 @@ private
 
    type Preempted_Task_Restore_Context_Stack is record
       Return_Address : System.Address;
-      Ebp            : Basic_Integer_Types.Unsigned_32;
+      Ebp            : Marte.Integer_Types.Unsigned_32;
       Context_Stack  : Save_Context_Stack;
    end record;
    type Preempted_Task_Restore_Context_Stack_Ac is

diff --git a/marte_non_local_jump/non_local_jump_test.adb b/marte_non_local_jump/non_local_jump_test.adb
index aa88188b3c57dede2f95642a9abc2deccdc4f607..fbafc1206e60a986db17a5a9e8a2bdb293e1c488 100644 (file)
--- a/marte_non_local_jump/non_local_jump_test.adb
+++ b/marte_non_local_jump/non_local_jump_test.adb
@@ -26,7 +26,7 @@ with MaRTE_OS;
 with Text_IO; use Text_IO;\r
 with Ada.Unchecked_Conversion;\r
 with System;\r
-with Basic_Integer_Types; use Basic_Integer_Types;\r
+with Marte.Integer_Types; use Marte.Integer_Types;\r
 --  with Processor_Registers;\r
 with Non_Local_Jump;\r
 with System.Machine_Code; use System.Machine_Code;\r