* back_end.adb (Call_Back_End): Pass the maximum logical line number

[pf3gnuchains/gcc-fork.git] / gcc / ada / back_end.adb

diff --git a/gcc/ada/back_end.adb b/gcc/ada/back_end.adb
index 28ce1bd..b6ad263 100644 (file)
--- a/gcc/ada/back_end.adb
+++ b/gcc/ada/back_end.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2010, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2011, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -26,6 +26,7 @@
 with Atree;     use Atree;
 with Debug;     use Debug;
 with Elists;    use Elists;
+with Errout;    use Errout;
 with Lib;       use Lib;
 with Osint;     use Osint;
 with Opt;       use Opt;
@@ -40,6 +41,8 @@ with Switch.C;  use Switch.C;
 with System;    use System;
 with Types;     use Types;
 
+with System.OS_Lib; use System.OS_Lib;
+
 package body Back_End is
 
    type Arg_Array is array (Nat) of Big_String_Ptr;
@@ -111,11 +114,26 @@ package body Back_End is
          return;
       end if;
 
+      --  The back end needs to know the maximum line number that can appear
+      --  in a Sloc, in other words the maximum logical line number.
+
       for J in 1 .. Last_Source_File loop
          File_Info_Array (J).File_Name        := Full_Debug_Name (J);
-         File_Info_Array (J).Num_Source_Lines := Num_Source_Lines (J);
+         File_Info_Array (J).Num_Source_Lines :=
+           Nat (Physical_To_Logical (Last_Source_Line (J), J));
       end loop;
 
+      if Generate_SCIL then
+         Error_Msg_N ("'S'C'I'L generation not available", Cunit (Main_Unit));
+
+         if CodePeer_Mode
+           or else (Mode /= Generate_Object
+                     and then not Back_Annotate_Rep_Info)
+         then
+            return;
+         end if;
+      end if;
+
       gigi
         (gnat_root          => Int (Cunit (Main_Unit)),
          max_gnat_node      => Int (Last_Node_Id - First_Node_Id + 1),
@@ -162,7 +180,7 @@ package body Back_End is
 
    procedure Scan_Compiler_Arguments is
 
-      Next_Arg : Pos;
+      Next_Arg : Positive;
       --  Next argument to be scanned
 
       Output_File_Name_Seen : Boolean := False;
@@ -222,6 +240,11 @@ package body Back_End is
          end if;
       end Scan_Back_End_Switches;
 
+      --  Local variables
+
+      Arg_Count : constant Natural := Natural (save_argc - 1);
+      Args : Argument_List (1 .. Arg_Count);
+
    --  Start of processing for Scan_Compiler_Arguments
 
    begin
@@ -229,15 +252,25 @@ package body Back_End is
 
       Opt.Stack_Checking_Enabled := (flag_stack_check /= 0);
 
+      --  Put the arguments in Args
+
+      for Arg in Pos range 1 .. save_argc - 1 loop
+         declare
+            Argv_Ptr : constant Big_String_Ptr := save_argv (Arg);
+            Argv_Len : constant Nat            := Len_Arg (Arg);
+            Argv     : constant String         :=
+                         Argv_Ptr (1 .. Natural (Argv_Len));
+         begin
+            Args (Positive (Arg)) := new String'(Argv);
+         end;
+      end loop;
+
       --  Loop through command line arguments, storing them for later access
 
       Next_Arg := 1;
-      while Next_Arg < save_argc loop
+      while Next_Arg <= Args'Last loop
          Look_At_Arg : declare
-            Argv_Ptr : constant Big_String_Ptr := save_argv (Next_Arg);
-            Argv_Len : constant Nat            := Len_Arg (Next_Arg);
-            Argv     : constant String         :=
-                         Argv_Ptr (1 .. Natural (Argv_Len));
+            Argv     : constant String := Args (Next_Arg).all;
 
          begin
             --  If the previous switch has set the Output_File_Name_Present
@@ -284,7 +317,7 @@ package body Back_End is
                Opt.No_Stdlib := True;
 
             elsif Is_Front_End_Switch (Argv) then
-               Scan_Front_End_Switches (Argv, Integer (Next_Arg));
+               Scan_Front_End_Switches (Argv, Args, Next_Arg);
 
             --  All non-front-end switches are back-end switches
 
@@ -296,4 +329,26 @@ package body Back_End is
          Next_Arg := Next_Arg + 1;
       end loop;
    end Scan_Compiler_Arguments;
+
+   -----------------------------
+   -- Register_Back_End_Types --
+   -----------------------------
+
+   procedure Register_Back_End_Types (Call_Back : Register_Type_Proc) is
+      procedure Enumerate_Modes (Call_Back : Register_Type_Proc);
+      pragma Import (C, Enumerate_Modes, "enumerate_modes");
+
+   begin
+      Enumerate_Modes (Call_Back);
+   end Register_Back_End_Types;
+
+   -------------------------------
+   -- Gen_Or_Update_Object_File --
+   -------------------------------
+
+   procedure Gen_Or_Update_Object_File is
+   begin
+      null;
+   end Gen_Or_Update_Object_File;
+
 end Back_End;