[llvm-commits] CVS: llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp AlphaISelPattern.cpp AlphaRegisterInfo.cpp
Andrew Lenharth
alenhar2 at cs.uiuc.edu
Wed Apr 13 10:17:44 PDT 2005
Changes in directory llvm/lib/Target/Alpha:
AlphaAsmPrinter.cpp updated: 1.10 -> 1.11
AlphaISelPattern.cpp updated: 1.96 -> 1.97
AlphaRegisterInfo.cpp updated: 1.18 -> 1.19
---
Log message:
WOW, function calls still seem to work after this.
---
Diffs of the changes: (+30 -19)
AlphaAsmPrinter.cpp | 33 ++++++++++++++++++++-------------
AlphaISelPattern.cpp | 10 +++++-----
AlphaRegisterInfo.cpp | 6 +++++-
3 files changed, 30 insertions(+), 19 deletions(-)
Index: llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp
diff -u llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp:1.10 llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp:1.11
--- llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp:1.10 Thu Mar 17 09:37:15 2005
+++ llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp Wed Apr 13 12:17:28 2005
@@ -49,6 +49,7 @@
///
typedef std::map<const Value *, unsigned> ValueMapTy;
ValueMapTy NumberForBB;
+ std::string CurSection;
virtual const char *getPassName() const {
return "Alpha Assembly Printer";
@@ -62,6 +63,7 @@
bool runOnMachineFunction(MachineFunction &F);
bool doInitialization(Module &M);
bool doFinalization(Module &M);
+ void SwitchSection(std::ostream &OS, const char *NewSection);
};
} // end of anonymous namespace
@@ -134,8 +136,13 @@
O << MO.getSymbolName();
return;
- case MachineOperand::MO_GlobalAddress:
- O << Mang->getValueName(MO.getGlobal());
+ case MachineOperand::MO_GlobalAddress:
+ //Abuse PCrel to specify pcrel calls
+ //calls are the only thing that use this flag
+ if (MO.isPCRelative())
+ O << "$" << Mang->getValueName(MO.getGlobal()) << "..ng";
+ else
+ O << Mang->getValueName(MO.getGlobal());
return;
default:
@@ -169,8 +176,8 @@
printConstantPool(MF.getConstantPool());
// Print out labels for the function.
- O << "\t.text\n";
- emitAlignment(3);
+ SwitchSection(O, "text");
+ emitAlignment(4);
O << "\t.globl\t" << CurrentFnName << "\n";
O << "\t.ent\t" << CurrentFnName << "\n";
@@ -209,8 +216,9 @@
if (CP.empty()) return;
+ SwitchSection(O, "section .rodata");
for (unsigned i = 0, e = CP.size(); i != e; ++i) {
- O << "\t.section\t.rodata\n";
+ // SwitchSection(O, "section .rodata, \"dr\"");
emitAlignment(TD.getTypeAlignmentShift(CP[i]->getType()));
O << "CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentString
<< *CP[i] << "\n";
@@ -229,18 +237,17 @@
// SwitchSection - Switch to the specified section of the executable if we are
// not already in it!
//
-static void SwitchSection(std::ostream &OS, std::string &CurSection,
- const char *NewSection) {
+void AlphaAsmPrinter::SwitchSection(std::ostream &OS, const char *NewSection)
+{
if (CurSection != NewSection) {
CurSection = NewSection;
if (!CurSection.empty())
- OS << "\t" << NewSection << "\n";
+ OS << "\t." << NewSection << "\n";
}
}
bool AlphaAsmPrinter::doFinalization(Module &M) {
const TargetData &TD = TM.getTargetData();
- std::string CurSection;
for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I)
if (I->hasInitializer()) { // External global require no code
@@ -253,7 +260,7 @@
if (C->isNullValue() &&
(I->hasLinkOnceLinkage() || I->hasInternalLinkage() ||
I->hasWeakLinkage() /* FIXME: Verify correct */)) {
- SwitchSection(O, CurSection, ".data");
+ SwitchSection(O, "data");
if (I->hasInternalLinkage())
O << "\t.local " << name << "\n";
@@ -268,7 +275,7 @@
case GlobalValue::WeakLinkage: // FIXME: Verify correct for weak.
// Nonnull linkonce -> weak
O << "\t.weak " << name << "\n";
- SwitchSection(O, CurSection, "");
+ SwitchSection(O, "");
O << "\t.section\t.llvm.linkonce.d." << name << ",\"aw\", at progbits\n";
break;
case GlobalValue::AppendingLinkage:
@@ -280,9 +287,9 @@
// FALL THROUGH
case GlobalValue::InternalLinkage:
if (C->isNullValue())
- SwitchSection(O, CurSection, ".data"); //was .bss
+ SwitchSection(O, "bss"); //was .bss
else
- SwitchSection(O, CurSection, ".data");
+ SwitchSection(O, "data");
break;
case GlobalValue::GhostLinkage:
std::cerr << "GhostLinkage cannot appear in AlphaAsmPrinter!\n";
Index: llvm/lib/Target/Alpha/AlphaISelPattern.cpp
diff -u llvm/lib/Target/Alpha/AlphaISelPattern.cpp:1.96 llvm/lib/Target/Alpha/AlphaISelPattern.cpp:1.97
--- llvm/lib/Target/Alpha/AlphaISelPattern.cpp:1.96 Wed Apr 13 00:19:55 2005
+++ llvm/lib/Target/Alpha/AlphaISelPattern.cpp Wed Apr 13 12:17:28 2005
@@ -1411,15 +1411,15 @@
if (GlobalAddressSDNode *GASD =
dyn_cast<GlobalAddressSDNode>(N.getOperand(1)))
{
- //if (GASD->getGlobal()->isExternal()) {
+ if (GASD->getGlobal()->isExternal()) {
//use safe calling convention
AlphaLowering.restoreGP(BB);
has_sym = true;
- BuildMI(BB, Alpha::CALL, 1).addGlobalAddress(GASD->getGlobal(),true);
- //} else {
+ BuildMI(BB, Alpha::CALL, 1).addGlobalAddress(GASD->getGlobal());
+ } else {
//use PC relative branch call
- //BuildMI(BB, Alpha::BSR, 1, Alpha::R26).addGlobalAddress(GASD->getGlobal(),true);
- //}
+ BuildMI(BB, Alpha::BSR, 1, Alpha::R26).addGlobalAddress(GASD->getGlobal(),true);
+ }
}
else if (ExternalSymbolSDNode *ESSDN =
dyn_cast<ExternalSymbolSDNode>(N.getOperand(1)))
Index: llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp
diff -u llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp:1.18 llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp:1.19
--- llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp:1.18 Tue Mar 29 13:24:04 2005
+++ llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp Wed Apr 13 12:17:28 2005
@@ -16,6 +16,7 @@
#include "AlphaRegisterInfo.h"
#include "llvm/Constants.h"
#include "llvm/Type.h"
+#include "llvm/Function.h"
#include "llvm/CodeGen/ValueTypes.h"
#include "llvm/CodeGen/MachineInstrBuilder.h"
#include "llvm/CodeGen/MachineFunction.h"
@@ -213,7 +214,10 @@
//handle GOP offset
MI = BuildMI(Alpha::LDGP, 0);
MBB.insert(MBBI, MI);
-
+ //evil const_cast until MO stuff setup to handle const
+ MI = BuildMI(Alpha::ALTENT, 1).addGlobalAddress(const_cast<Function*>(MF.getFunction()), true);
+ MBB.insert(MBBI, MI);
+
// Get the number of bytes to allocate from the FrameInfo
long NumBytes = MFI->getStackSize();
More information about the llvm-commits
mailing list