[llvm-commits] [llvm] r80670 - in /llvm/trunk/lib/Target/PIC16: MCSectionPIC16.h PIC16TargetObjectFile.cpp PIC16TargetObjectFile.h
Sanjiv Gupta
sanjiv.gupta at microchip.com
Tue Sep 1 03:47:31 PDT 2009
Author: sgupta
Date: Tue Sep 1 05:47:31 2009
New Revision: 80670
URL: http://llvm.org/viewvc/llvm-project?rev=80670&view=rev
Log:
Further refactoring of PIC16 Obj file code.
Modified:
llvm/trunk/lib/Target/PIC16/MCSectionPIC16.h
llvm/trunk/lib/Target/PIC16/PIC16TargetObjectFile.cpp
llvm/trunk/lib/Target/PIC16/PIC16TargetObjectFile.h
Modified: llvm/trunk/lib/Target/PIC16/MCSectionPIC16.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/MCSectionPIC16.h?rev=80670&r1=80669&r2=80670&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PIC16/MCSectionPIC16.h (original)
+++ llvm/trunk/lib/Target/PIC16/MCSectionPIC16.h Tue Sep 1 05:47:31 2009
@@ -29,10 +29,9 @@
/// Negative value here means user hasn't specified any.
int Address;
- /// FIXME: Keep overlay information here. uncomment the decl below.
/// Overlay information - Sections with same color can be overlaid on
/// one another.
- /// std::string Color;
+ int Color;
/// Conatined data objects.
std::vector<const GlobalVariable *>Items;
@@ -40,8 +39,8 @@
/// Total size of all data objects contained here.
unsigned Size;
- MCSectionPIC16(const StringRef &name, SectionKind K, int addr)
- : MCSection(K), Name(name), Address(addr) {
+ MCSectionPIC16(const StringRef &name, SectionKind K, int addr, int color)
+ : MCSection(K), Name(name), Address(addr), Color(color) {
}
public:
@@ -51,6 +50,9 @@
/// Return the Address of the section.
int getAddress() const { return Address; }
+ /// Return the Color of the section.
+ int getColor() const { return Color; }
+
/// PIC16 Terminology for section kinds is as below.
/// UDATA - BSS
/// IDATA - initialized data (equiv to Metadata)
@@ -73,7 +75,7 @@
/// This would be the only way to create a section.
static MCSectionPIC16 *Create(const StringRef &Name, SectionKind K,
- int Address, MCContext &Ctx);
+ int Address, int Color, MCContext &Ctx);
/// Override this as PIC16 has its own way of printing switching
/// to a section.
Modified: llvm/trunk/lib/Target/PIC16/PIC16TargetObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16TargetObjectFile.cpp?rev=80670&r1=80669&r2=80670&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PIC16/PIC16TargetObjectFile.cpp (original)
+++ llvm/trunk/lib/Target/PIC16/PIC16TargetObjectFile.cpp Tue Sep 1 05:47:31 2009
@@ -20,8 +20,8 @@
MCSectionPIC16 *MCSectionPIC16::Create(const StringRef &Name, SectionKind K,
- int Address, MCContext &Ctx) {
- return new (Ctx) MCSectionPIC16(Name, K, Address);
+ int Address, int Color, MCContext &Ctx) {
+ return new (Ctx) MCSectionPIC16(Name, K, Address, Color);
}
@@ -38,12 +38,14 @@
}
const MCSectionPIC16 *PIC16TargetObjectFile::
-getPIC16Section(const char *Name, SectionKind Kind, int Address) const {
+getPIC16Section(const char *Name, SectionKind Kind,
+ int Address, int Color) const {
MCSectionPIC16 *&Entry = SectionsByName[Name];
if (Entry)
return Entry;
- return Entry = MCSectionPIC16::Create(Name, Kind, Address, getContext());
+ return Entry = MCSectionPIC16::Create(Name, Kind, Address, Color,
+ getContext());
}
@@ -51,10 +53,10 @@
TargetLoweringObjectFile::Initialize(Ctx, tm);
TM = &tm;
- BSSSection = getPIC16Section("udata.# UDATA", SectionKind::getBSS());
+ BSSSection = getPIC16Section("udata.# UDATA", MCSectionPIC16::UDATA_Kind());
ReadOnlySection = getPIC16Section("romdata.# ROMDATA",
- SectionKind::getReadOnly());
- DataSection = getPIC16Section("idata.# IDATA", SectionKind::getDataRel());
+ MCSectionPIC16::ROMDATA_Kind());
+ DataSection = getPIC16Section("idata.# IDATA", MCSectionPIC16::IDATA_Kind());
// Need because otherwise a .text symbol is emitted by DwarfWriter
// in BeginModule, and gpasm cribbs for that .text symbol.
@@ -63,6 +65,8 @@
ROSections.push_back(new PIC16Section((MCSectionPIC16*)ReadOnlySection));
// FIXME: I don't know what the classification of these sections really is.
+ // These aren't really objects belonging to any section. Just emit them
+ // in AsmPrinter and remove this code from here.
ExternalVarDecls = new PIC16Section(getPIC16Section("ExternalVarDecls",
SectionKind::getMetadata()));
ExternalVarDefs = new PIC16Section(getPIC16Section("ExternalVarDefs",
@@ -107,7 +111,7 @@
if (!FoundBSS) {
std::string name = PAN::getUdataSectionName(BSSSections.size());
const MCSectionPIC16 *NewSection
- = getPIC16Section(name.c_str(), /*FIXME*/ SectionKind::getMetadata());
+ = getPIC16Section(name.c_str(), MCSectionPIC16::UDATA_Kind());
FoundBSS = new PIC16Section(NewSection);
@@ -148,7 +152,7 @@
if (!FoundIDATA) {
std::string name = PAN::getIdataSectionName(IDATASections.size());
const MCSectionPIC16 *NewSection =
- getPIC16Section(name.c_str(), /*FIXME*/ SectionKind::getMetadata());
+ getPIC16Section(name.c_str(), MCSectionPIC16::IDATA_Kind());
FoundIDATA = new PIC16Section(NewSection);
@@ -182,7 +186,7 @@
// No Auto section was found. Crate a new one.
if (!FoundAutoSec) {
const MCSectionPIC16 *NewSection =
- getPIC16Section(name.c_str(), /*FIXME*/ SectionKind::getMetadata());
+ getPIC16Section(name.c_str(), MCSectionPIC16::UDATA_OVR_Kind());
FoundAutoSec = new PIC16Section(NewSection);
@@ -333,7 +337,7 @@
PIC16Section *NewBSS = FoundBSS;
if (NewBSS == NULL) {
const MCSectionPIC16 *NewSection =
- getPIC16Section(Name.c_str(), SectionKind::getBSS());
+ getPIC16Section(Name.c_str(), MCSectionPIC16::UDATA_Kind());
NewBSS = new PIC16Section(NewSection);
BSSSections.push_back(NewBSS);
}
@@ -385,7 +389,7 @@
PIC16Section *NewIDATASec = FoundIDATASec;
if (NewIDATASec == NULL) {
const MCSectionPIC16 *NewSection =
- getPIC16Section(Name.c_str(), /* FIXME */SectionKind::getMetadata());
+ getPIC16Section(Name.c_str(), MCSectionPIC16::IDATA_Kind());
NewIDATASec = new PIC16Section(NewSection);
IDATASections.push_back(NewIDATASec);
}
@@ -424,7 +428,7 @@
PIC16Section *NewRomSec = FoundROSec;
if (NewRomSec == NULL) {
const MCSectionPIC16 *NewSection =
- getPIC16Section(Name.c_str(), SectionKind::getReadOnly());
+ getPIC16Section(Name.c_str(), MCSectionPIC16::ROMDATA_Kind());
NewRomSec = new PIC16Section(NewSection);
ROSections.push_back(NewRomSec);
}
Modified: llvm/trunk/lib/Target/PIC16/PIC16TargetObjectFile.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16TargetObjectFile.h?rev=80670&r1=80669&r2=80670&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PIC16/PIC16TargetObjectFile.h (original)
+++ llvm/trunk/lib/Target/PIC16/PIC16TargetObjectFile.h Tue Sep 1 05:47:31 2009
@@ -54,7 +54,8 @@
const MCSectionPIC16 *getPIC16Section(const char *Name,
SectionKind K,
- int Address = -1) const;
+ int Address = -1,
+ int Color = -1) const;
public:
mutable std::vector<PIC16Section*> BSSSections;
mutable std::vector<PIC16Section*> IDATASections;
More information about the llvm-commits
mailing list