From: Anton Korobeynikov Date: Sun, 17 Aug 2008 13:56:03 +0000 (+0000) Subject: Fix merge error X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4a8978b61c0536d57bfa32bc5c590fdb6d0113a4;p=oota-llvm.git Fix merge error git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54891 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/CodeGen/LinkAllCodegenComponents.h b/include/llvm/CodeGen/LinkAllCodegenComponents.h index 8f2e5c1ae80..2fb01bfefcf 100644 --- a/include/llvm/CodeGen/LinkAllCodegenComponents.h +++ b/include/llvm/CodeGen/LinkAllCodegenComponents.h @@ -37,7 +37,6 @@ namespace { (void) llvm::createSimpleRegisterCoalescer(); (void) llvm::createOcamlCollector(); - (void) llvm::createOcamlMetadataPrinter(); (void) llvm::createShadowStackCollector(); (void) llvm::createBURRListDAGScheduler(NULL, NULL, NULL, false); diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 4d16c7b0f1a..de31840d703 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -122,10 +122,6 @@ bool AsmPrinter::doInitialization(Module &M) { E = CMM->end(); I != E; ++I) if (GCMetadataPrinter *GCP = GetOrCreateGCPrinter(*I)) GCP->beginAssembly(O, *this, *TAI); -<<<<<<< HEAD:lib/CodeGen/AsmPrinter.cpp -======= - ->>>>>>> Factor out asmprinters from collector interface.:lib/CodeGen/AsmPrinter.cpp if (!M.getModuleInlineAsm().empty()) O << TAI->getCommentString() << " Start of file scope inline assembly\n" @@ -1473,7 +1469,6 @@ void AsmPrinter::printVisibility(const std::string& Name, GCMetadataPrinter *AsmPrinter::GetOrCreateGCPrinter(Collector *C) { if (!C->usesMetadata()) return 0; -<<<<<<< HEAD:lib/CodeGen/AsmPrinter.cpp gcp_iterator GCPI = GCMetadataPrinters.find(C); if (GCPI != GCMetadataPrinters.end()) @@ -1481,15 +1476,6 @@ GCMetadataPrinter *AsmPrinter::GetOrCreateGCPrinter(Collector *C) { const char *Name = C->getName().c_str(); -======= - - gcp_iterator GCPI = GCMetadataPrinters.find(C); - if (GCPI != GCMetadataPrinters.end()) - return GCPI->second; - - const char *Name = C->getName().c_str(); - ->>>>>>> Factor out asmprinters from collector interface.:lib/CodeGen/AsmPrinter.cpp for (GCMetadataPrinterRegistry::iterator I = GCMetadataPrinterRegistry::begin(), E = GCMetadataPrinterRegistry::end(); I != E; ++I) @@ -1499,11 +1485,7 @@ GCMetadataPrinter *AsmPrinter::GetOrCreateGCPrinter(Collector *C) { GCMetadataPrinters.insert(std::make_pair(C, GCP)); return GCP; } -<<<<<<< HEAD:lib/CodeGen/AsmPrinter.cpp -======= - ->>>>>>> Factor out asmprinters from collector interface.:lib/CodeGen/AsmPrinter.cpp cerr << "no GCMetadataPrinter registered for collector: " << Name << "\n"; abort(); } diff --git a/lib/CodeGen/AsmPrinter/OcamlGCMetadataPrinter.cpp b/lib/CodeGen/AsmPrinter/OcamlGCMetadataPrinter.cpp deleted file mode 100644 index d1208e2d248..00000000000 --- a/lib/CodeGen/AsmPrinter/OcamlGCMetadataPrinter.cpp +++ /dev/null @@ -1,157 +0,0 @@ -//===-- OcamlGCMetadataPrinter.cpp - Ocaml frametable emitter -------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file implements gc metadata printing for the llvm.gc* intrinsics -// compatible with Objective Caml 3.10.0, which uses a liveness-accurate static -// stack map. -// -//===----------------------------------------------------------------------===// - -#include "llvm/CodeGen/AsmPrinter.h" -#include "llvm/CodeGen/Collectors.h" -#include "llvm/CodeGen/Collector.h" -#include "llvm/Module.h" -#include "llvm/Target/TargetAsmInfo.h" -#include "llvm/Target/TargetData.h" -#include "llvm/Target/TargetMachine.h" - -using namespace llvm; - -namespace { - class VISIBILITY_HIDDEN OcamlGCMetadataPrinter : public GCMetadataPrinter { - public: - void beginAssembly(std::ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI); - void finishAssembly(std::ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI); - }; -} - -static GCMetadataPrinterRegistry::Add -X("ocaml", "ocaml 3.10-compatible collector"); - -static void EmitCamlGlobal(const Module &M, std::ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI, const char *Id) { - const std::string &MId = M.getModuleIdentifier(); - - std::string Mangled; - Mangled += TAI.getGlobalPrefix(); - Mangled += "caml"; - size_t Letter = Mangled.size(); - Mangled.append(MId.begin(), std::find(MId.begin(), MId.end(), '.')); - Mangled += "__"; - Mangled += Id; - - // Capitalize the first letter of the module name. - Mangled[Letter] = toupper(Mangled[Letter]); - - if (const char *GlobalDirective = TAI.getGlobalDirective()) - OS << GlobalDirective << Mangled << "\n"; - OS << Mangled << ":\n"; -} - -void OcamlGCMetadataPrinter::beginAssembly(std::ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI) { - AP.SwitchToTextSection(TAI.getTextSection()); - EmitCamlGlobal(getModule(), OS, AP, TAI, "code_begin"); - - AP.SwitchToDataSection(TAI.getDataSection()); - EmitCamlGlobal(getModule(), OS, AP, TAI, "data_begin"); -} - -/// emitAssembly - Print the frametable. The ocaml frametable format is thus: -/// -/// extern "C" struct align(sizeof(intptr_t)) { -/// uint16_t NumDescriptors; -/// struct align(sizeof(intptr_t)) { -/// void *ReturnAddress; -/// uint16_t FrameSize; -/// uint16_t NumLiveOffsets; -/// uint16_t LiveOffsets[NumLiveOffsets]; -/// } Descriptors[NumDescriptors]; -/// } caml${module}__frametable; -/// -/// Note that this precludes programs from stack frames larger than 64K -/// (FrameSize and LiveOffsets would overflow). FrameTablePrinter will abort if -/// either condition is detected in a function which uses the collector. -/// -void OcamlGCMetadataPrinter::finishAssembly(std::ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI) { - const char *AddressDirective; - int AddressAlignLog; - if (AP.TM.getTargetData()->getPointerSize() == sizeof(int32_t)) { - AddressDirective = TAI.getData32bitsDirective(); - AddressAlignLog = 2; - } else { - AddressDirective = TAI.getData64bitsDirective(); - AddressAlignLog = 3; - } - - AP.SwitchToTextSection(TAI.getTextSection()); - EmitCamlGlobal(getModule(), OS, AP, TAI, "code_end"); - - AP.SwitchToDataSection(TAI.getDataSection()); - EmitCamlGlobal(getModule(), OS, AP, TAI, "data_end"); - - OS << AddressDirective << 0; // FIXME: Why does ocaml emit this?? - AP.EOL(); - - AP.SwitchToDataSection(TAI.getDataSection()); - EmitCamlGlobal(getModule(), OS, AP, TAI, "frametable"); - - for (iterator FI = begin(), FE = end(); FI != FE; ++FI) { - CollectorMetadata &MD = **FI; - - OS << "\t" << TAI.getCommentString() << " live roots for " - << MD.getFunction().getNameStart() << "\n"; - - for (CollectorMetadata::iterator PI = MD.begin(), - PE = MD.end(); PI != PE; ++PI) { - - uint64_t FrameSize = MD.getFrameSize(); - if (FrameSize >= 1<<16) { - cerr << "Function '" << MD.getFunction().getNameStart() - << "' is too large for the ocaml collector! " - << "Frame size " << FrameSize << " >= 65536.\n"; - abort(); // Very rude! - } - - size_t LiveCount = MD.live_size(PI); - if (LiveCount >= 1<<16) { - cerr << "Function '" << MD.getFunction().getNameStart() - << "' is too large for the ocaml collector! " - << "Live root count " << LiveCount << " >= 65536.\n"; - abort(); // Very rude! - } - - OS << AddressDirective - << TAI.getPrivateGlobalPrefix() << "label" << PI->Num; - AP.EOL("call return address"); - - AP.EmitInt16(FrameSize); - AP.EOL("stack frame size"); - - AP.EmitInt16(LiveCount); - AP.EOL("live root count"); - - for (CollectorMetadata::live_iterator LI = MD.live_begin(PI), - LE = MD.live_end(PI); - LI != LE; ++LI) { - assert(LI->StackOffset < 1<<16 && - "GC root stack offset is outside of fixed stack frame and out " - "of range for Ocaml collector!"); - - OS << "\t.word\t" << LI->StackOffset; - AP.EOL("stack offset"); - } - - AP.EmitAlignment(AddressAlignLog); - } - } -} diff --git a/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp b/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp new file mode 100644 index 00000000000..efa7f672769 --- /dev/null +++ b/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp @@ -0,0 +1,163 @@ +//===-- OcamlCollector.cpp - Ocaml frametable emitter ---------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file implements lowering for the llvm.gc* intrinsics compatible with +// Objective Caml 3.10.0, which uses a liveness-accurate static stack map. +// +//===----------------------------------------------------------------------===// + +#include "llvm/CodeGen/GCs.h" +#include "llvm/CodeGen/AsmPrinter.h" +#include "llvm/CodeGen/GCStrategy.h" +#include "llvm/Module.h" +#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/Target/TargetData.h" +#include "llvm/Target/TargetMachine.h" + +using namespace llvm; + +namespace { + + class VISIBILITY_HIDDEN OcamlGCMetadataPrinter : public GCMetadataPrinter { + public: + void beginAssembly(std::ostream &OS, AsmPrinter &AP, + const TargetAsmInfo &TAI); + + void finishAssembly(std::ostream &OS, AsmPrinter &AP, + const TargetAsmInfo &TAI); + }; + +} + +static GCMetadataPrinterRegistry::Add +Y("ocaml", "ocaml 3.10-compatible collector"); + +GCMetadataPrinter *llvm::createOcamlMetadataPrinter() { + return new OcamlGCMetadataPrinter(); +} + +static void EmitCamlGlobal(const Module &M, std::ostream &OS, AsmPrinter &AP, + const TargetAsmInfo &TAI, const char *Id) { + const std::string &MId = M.getModuleIdentifier(); + + std::string Mangled; + Mangled += TAI.getGlobalPrefix(); + Mangled += "caml"; + size_t Letter = Mangled.size(); + Mangled.append(MId.begin(), std::find(MId.begin(), MId.end(), '.')); + Mangled += "__"; + Mangled += Id; + + // Capitalize the first letter of the module name. + Mangled[Letter] = toupper(Mangled[Letter]); + + if (const char *GlobalDirective = TAI.getGlobalDirective()) + OS << GlobalDirective << Mangled << "\n"; + OS << Mangled << ":\n"; +} + +void OcamlGCMetadataPrinter::beginAssembly(std::ostream &OS, AsmPrinter &AP, + const TargetAsmInfo &TAI) { + AP.SwitchToTextSection(TAI.getTextSection()); + EmitCamlGlobal(getModule(), OS, AP, TAI, "code_begin"); + + AP.SwitchToDataSection(TAI.getDataSection()); + EmitCamlGlobal(getModule(), OS, AP, TAI, "data_begin"); +} + +/// emitAssembly - Print the frametable. The ocaml frametable format is thus: +/// +/// extern "C" struct align(sizeof(intptr_t)) { +/// uint16_t NumDescriptors; +/// struct align(sizeof(intptr_t)) { +/// void *ReturnAddress; +/// uint16_t FrameSize; +/// uint16_t NumLiveOffsets; +/// uint16_t LiveOffsets[NumLiveOffsets]; +/// } Descriptors[NumDescriptors]; +/// } caml${module}__frametable; +/// +/// Note that this precludes programs from stack frames larger than 64K +/// (FrameSize and LiveOffsets would overflow). FrameTablePrinter will abort if +/// either condition is detected in a function which uses the collector. +/// +void OcamlGCMetadataPrinter::finishAssembly(std::ostream &OS, AsmPrinter &AP, + const TargetAsmInfo &TAI) { + const char *AddressDirective; + int AddressAlignLog; + if (AP.TM.getTargetData()->getPointerSize() == sizeof(int32_t)) { + AddressDirective = TAI.getData32bitsDirective(); + AddressAlignLog = 2; + } else { + AddressDirective = TAI.getData64bitsDirective(); + AddressAlignLog = 3; + } + + AP.SwitchToTextSection(TAI.getTextSection()); + EmitCamlGlobal(getModule(), OS, AP, TAI, "code_end"); + + AP.SwitchToDataSection(TAI.getDataSection()); + EmitCamlGlobal(getModule(), OS, AP, TAI, "data_end"); + + OS << AddressDirective << 0; // FIXME: Why does ocaml emit this?? + AP.EOL(); + + AP.SwitchToDataSection(TAI.getDataSection()); + EmitCamlGlobal(getModule(), OS, AP, TAI, "frametable"); + + for (iterator FI = begin(), FE = end(); FI != FE; ++FI) { + CollectorMetadata &MD = **FI; + + OS << "\t" << TAI.getCommentString() << " live roots for " + << MD.getFunction().getNameStart() << "\n"; + + for (CollectorMetadata::iterator PI = MD.begin(), + PE = MD.end(); PI != PE; ++PI) { + + uint64_t FrameSize = MD.getFrameSize(); + if (FrameSize >= 1<<16) { + cerr << "Function '" << MD.getFunction().getNameStart() + << "' is too large for the ocaml collector! " + << "Frame size " << FrameSize << " >= 65536.\n"; + abort(); // Very rude! + } + + size_t LiveCount = MD.live_size(PI); + if (LiveCount >= 1<<16) { + cerr << "Function '" << MD.getFunction().getNameStart() + << "' is too large for the ocaml collector! " + << "Live root count " << LiveCount << " >= 65536.\n"; + abort(); // Very rude! + } + + OS << AddressDirective + << TAI.getPrivateGlobalPrefix() << "label" << PI->Num; + AP.EOL("call return address"); + + AP.EmitInt16(FrameSize); + AP.EOL("stack frame size"); + + AP.EmitInt16(LiveCount); + AP.EOL("live root count"); + + for (CollectorMetadata::live_iterator LI = MD.live_begin(PI), + LE = MD.live_end(PI); + LI != LE; ++LI) { + assert(LI->StackOffset < 1<<16 && + "GC root stack offset is outside of fixed stack frame and out " + "of range for Ocaml collector!"); + + OS << "\t.word\t" << LI->StackOffset; + AP.EOL("stack offset"); + } + + AP.EmitAlignment(AddressAlignLog); + } + } +} diff --git a/lib/CodeGen/OcamlGCPrinter.cpp b/lib/CodeGen/OcamlGCPrinter.cpp deleted file mode 100644 index efa7f672769..00000000000 --- a/lib/CodeGen/OcamlGCPrinter.cpp +++ /dev/null @@ -1,163 +0,0 @@ -//===-- OcamlCollector.cpp - Ocaml frametable emitter ---------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file implements lowering for the llvm.gc* intrinsics compatible with -// Objective Caml 3.10.0, which uses a liveness-accurate static stack map. -// -//===----------------------------------------------------------------------===// - -#include "llvm/CodeGen/GCs.h" -#include "llvm/CodeGen/AsmPrinter.h" -#include "llvm/CodeGen/GCStrategy.h" -#include "llvm/Module.h" -#include "llvm/Target/TargetAsmInfo.h" -#include "llvm/Target/TargetData.h" -#include "llvm/Target/TargetMachine.h" - -using namespace llvm; - -namespace { - - class VISIBILITY_HIDDEN OcamlGCMetadataPrinter : public GCMetadataPrinter { - public: - void beginAssembly(std::ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI); - - void finishAssembly(std::ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI); - }; - -} - -static GCMetadataPrinterRegistry::Add -Y("ocaml", "ocaml 3.10-compatible collector"); - -GCMetadataPrinter *llvm::createOcamlMetadataPrinter() { - return new OcamlGCMetadataPrinter(); -} - -static void EmitCamlGlobal(const Module &M, std::ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI, const char *Id) { - const std::string &MId = M.getModuleIdentifier(); - - std::string Mangled; - Mangled += TAI.getGlobalPrefix(); - Mangled += "caml"; - size_t Letter = Mangled.size(); - Mangled.append(MId.begin(), std::find(MId.begin(), MId.end(), '.')); - Mangled += "__"; - Mangled += Id; - - // Capitalize the first letter of the module name. - Mangled[Letter] = toupper(Mangled[Letter]); - - if (const char *GlobalDirective = TAI.getGlobalDirective()) - OS << GlobalDirective << Mangled << "\n"; - OS << Mangled << ":\n"; -} - -void OcamlGCMetadataPrinter::beginAssembly(std::ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI) { - AP.SwitchToTextSection(TAI.getTextSection()); - EmitCamlGlobal(getModule(), OS, AP, TAI, "code_begin"); - - AP.SwitchToDataSection(TAI.getDataSection()); - EmitCamlGlobal(getModule(), OS, AP, TAI, "data_begin"); -} - -/// emitAssembly - Print the frametable. The ocaml frametable format is thus: -/// -/// extern "C" struct align(sizeof(intptr_t)) { -/// uint16_t NumDescriptors; -/// struct align(sizeof(intptr_t)) { -/// void *ReturnAddress; -/// uint16_t FrameSize; -/// uint16_t NumLiveOffsets; -/// uint16_t LiveOffsets[NumLiveOffsets]; -/// } Descriptors[NumDescriptors]; -/// } caml${module}__frametable; -/// -/// Note that this precludes programs from stack frames larger than 64K -/// (FrameSize and LiveOffsets would overflow). FrameTablePrinter will abort if -/// either condition is detected in a function which uses the collector. -/// -void OcamlGCMetadataPrinter::finishAssembly(std::ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI) { - const char *AddressDirective; - int AddressAlignLog; - if (AP.TM.getTargetData()->getPointerSize() == sizeof(int32_t)) { - AddressDirective = TAI.getData32bitsDirective(); - AddressAlignLog = 2; - } else { - AddressDirective = TAI.getData64bitsDirective(); - AddressAlignLog = 3; - } - - AP.SwitchToTextSection(TAI.getTextSection()); - EmitCamlGlobal(getModule(), OS, AP, TAI, "code_end"); - - AP.SwitchToDataSection(TAI.getDataSection()); - EmitCamlGlobal(getModule(), OS, AP, TAI, "data_end"); - - OS << AddressDirective << 0; // FIXME: Why does ocaml emit this?? - AP.EOL(); - - AP.SwitchToDataSection(TAI.getDataSection()); - EmitCamlGlobal(getModule(), OS, AP, TAI, "frametable"); - - for (iterator FI = begin(), FE = end(); FI != FE; ++FI) { - CollectorMetadata &MD = **FI; - - OS << "\t" << TAI.getCommentString() << " live roots for " - << MD.getFunction().getNameStart() << "\n"; - - for (CollectorMetadata::iterator PI = MD.begin(), - PE = MD.end(); PI != PE; ++PI) { - - uint64_t FrameSize = MD.getFrameSize(); - if (FrameSize >= 1<<16) { - cerr << "Function '" << MD.getFunction().getNameStart() - << "' is too large for the ocaml collector! " - << "Frame size " << FrameSize << " >= 65536.\n"; - abort(); // Very rude! - } - - size_t LiveCount = MD.live_size(PI); - if (LiveCount >= 1<<16) { - cerr << "Function '" << MD.getFunction().getNameStart() - << "' is too large for the ocaml collector! " - << "Live root count " << LiveCount << " >= 65536.\n"; - abort(); // Very rude! - } - - OS << AddressDirective - << TAI.getPrivateGlobalPrefix() << "label" << PI->Num; - AP.EOL("call return address"); - - AP.EmitInt16(FrameSize); - AP.EOL("stack frame size"); - - AP.EmitInt16(LiveCount); - AP.EOL("live root count"); - - for (CollectorMetadata::live_iterator LI = MD.live_begin(PI), - LE = MD.live_end(PI); - LI != LE; ++LI) { - assert(LI->StackOffset < 1<<16 && - "GC root stack offset is outside of fixed stack frame and out " - "of range for Ocaml collector!"); - - OS << "\t.word\t" << LI->StackOffset; - AP.EOL("stack offset"); - } - - AP.EmitAlignment(AddressAlignLog); - } - } -}