Made the common case of default address space directive as non-virtual for performance reasons. Provide a single virtual interface for directives of all sizes in non-default address spaces.

llvm-svn: 63521

2 files changed, 22 insertions, 26 deletions

diff --git a/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.cpp b/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.cpp
index b86576be896..d40f2065b82 100644
--- a/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.cpp
+++ b/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.cpp
@@ -26,7 +26,7 @@ PIC16TargetAsmInfo(const PIC16TargetMachine &TM)
   Data32bitsDirective = " dl ";
   RomData8bitsDirective = " dw ";
   RomData16bitsDirective = " rom_di ";
-  RomData8bitsDirective = " rom_dl ";
+  RomData32bitsDirective = " rom_dl ";
   ZeroDirective = NULL;
   AsciiDirective = " dt ";
   AscizDirective = NULL;
@@ -37,27 +37,24 @@ PIC16TargetAsmInfo(const PIC16TargetMachine &TM)
   SwitchToSectionDirective = "";
 }
 
-const char *PIC16TargetAsmInfo::getData8bitsDirective(unsigned AddrSpace)
-                                                       const {
-      if (AddrSpace == PIC16ISD::ROM_SPACE)
-        return RomData8bitsDirective;
-      else 
-        return Data8bitsDirective; 
-  }
+const char *PIC16TargetAsmInfo::getRomDirective(unsigned size) const
+{
+  if (size == 8)
+    return RomData8bitsDirective;
+  else if (size == 16)
+    return RomData16bitsDirective;
+  else if (size == 32)
+    return RomData32bitsDirective;
+  else
+    return NULL;
+}
 
-const char *PIC16TargetAsmInfo::getData16bitsDirective(unsigned AddrSpace)
-                                                       const {
-      if (AddrSpace == PIC16ISD::ROM_SPACE)
-        return RomData16bitsDirective;
-      else
-        return Data16bitsDirective;
-  }
 
-const char *PIC16TargetAsmInfo::getData32bitsDirective(unsigned AddrSpace)
-                                                       const {
-      if (AddrSpace == PIC16ISD::ROM_SPACE)
-        return RomData32bitsDirective;
-      else
-        return Data32bitsDirective;
-  }
+const char *PIC16TargetAsmInfo::getASDirective(unsigned size, 
+                                               unsigned AS) const {
+  if (AS == PIC16ISD::ROM_SPACE)
+    return getRomDirective(size);
+  else
+    return NULL;
+}
 
diff --git a/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.h b/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.h
index b75699ba8c4..305e74d5a30 100644
--- a/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.h
+++ b/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.h
@@ -23,13 +23,12 @@ namespace llvm {
 
   struct PIC16TargetAsmInfo : public TargetAsmInfo {
     PIC16TargetAsmInfo(const PIC16TargetMachine &TM);
+    private:
     const char *RomData8bitsDirective;
     const char *RomData16bitsDirective;
     const char *RomData32bitsDirective;
-    public :
-    virtual const char *getData8bitsDirective(unsigned AddrSpace = 0) const;
-    virtual const char *getData16bitsDirective(unsigned AddrSpace = 0) const;
-    virtual const char *getData32bitsDirective(unsigned AddrSpace = 0) const;
+    const char *getRomDirective(unsigned size) const;
+    virtual const char *getASDirective(unsigned size, unsigned AS) const;
   };
 
 } // namespace llvm