Fix more naming issues.

compiler libcalls start with .lib. now.
fixed section names.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@71424 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 20 insertions, 13 deletions

diff --git a/lib/Target/PIC16/PIC16.h b/lib/Target/PIC16/PIC16.h
index bf4421b2f2..ce7602cdd0 100644
--- a/lib/Target/PIC16/PIC16.h
+++ b/lib/Target/PIC16/PIC16.h
@@ -72,11 +72,11 @@ namespace PIC16CC {
     //           Its temp data:   @foo.temp.
     //           Its arg passing: @foo.args.
     //----------------------------------------------
-    // Libcall - compiler generated libcall names must have a .lib.
+    // Libcall - compiler generated libcall names must start with .lib.
     //           This id will be used to emit extern decls for libcalls.
-    // Example - libcall name:   @sra_i8.lib.
-    //           To pass args:   @sra_i8.args.
-    //           To return val:  @sra_i8.ret.
+    // Example - libcall name:   @.lib.sra.i8
+    //           To pass args:   @.lib.sra.i8.args.
+    //           To return val:  @.lib.sra.i8.ret.
     //----------------------------------------------
     // SECTION Names
     // uninitialized globals - @udata.<num>.#
@@ -114,10 +114,10 @@ namespace PIC16CC {
       case TEMPS_LABEL:       return ".temp.";
       case ARGS_LABEL:       return ".args.";
       case RET_LABEL:       return ".ret.";
-      case LIBCALL:       return "__intrinsics";
-      case FRAME_SECTION:       return ".fpdata.";
-      case AUTOS_SECTION:       return ".fadata.";
-      case CODE_SECTION:       return "code";
+      case LIBCALL:       return ".lib.";
+      case FRAME_SECTION:       return ".frame_section.";
+      case AUTOS_SECTION:       return ".autos_section.";
+      case CODE_SECTION:       return ".code_section.";
       }
     }
 
@@ -205,19 +205,19 @@ namespace PIC16CC {
     static std::string getFrameSectionName(const std::string &Func) {
       std::string Func1 = addPrefix(Func);
       std::string tag = getTagName(FRAME_SECTION);
-      return Func1 + tag + " UDATA_OVR";
+      return Func1 + tag + "# UDATA_OVR";
     }
 
     static std::string getAutosSectionName(const std::string &Func) {
       std::string Func1 = addPrefix(Func);
       std::string tag = getTagName(AUTOS_SECTION);
-      return Func1 + tag + " UDATA_OVR";
+      return Func1 + tag + "# UDATA_OVR";
     }
 
     static std::string getCodeSectionName(const std::string &Func) {
       std::string Func1 = addPrefix(Func);
       std::string tag = getTagName(CODE_SECTION);
-      return Func1 + tag + " CODE";
+      return Func1 + tag + "# CODE";
     }
 
     // udata and idata section names are generated by a given number.
@@ -235,7 +235,15 @@ namespace PIC16CC {
     }
 
     static std::string getDeclSectionName(void) {
-       std::string dsname = "decl_section.1";
+       std::string dsname = "section.0";
+       dsname = addPrefix(dsname);
+       return dsname; 
+    }
+
+    // FIXME: currently decls for libcalls are into a separate section.
+    // merge the rest of decls to one.
+    static std::string getLibDeclSectionName(void) {
+       std::string dsname = "lib_decls.0";
        dsname = addPrefix(dsname);
        return dsname; 
     }
@@ -285,7 +293,6 @@ namespace PIC16CC {
         }
       }
     }
-
   }; // class PAN.