mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 03:02:36 +01:00
3f0b170fdd
Problem:
On SystemZ we need to open text files in text mode. On Windows, files opened in text mode adds a CRLF '\r\n' which may not be desirable.
Solution:
This patch adds two new flags
- OF_CRLF which indicates that CRLF translation is used.
- OF_TextWithCRLF = OF_Text | OF_CRLF indicates that the file is text and uses CRLF translation.
Developers should now use either the OF_Text or OF_TextWithCRLF for text files and OF_None for binary files. If the developer doesn't want carriage returns on Windows, they should use OF_Text, if they do want carriage returns on Windows, they should use OF_TextWithCRLF.
So this is the behaviour per platform with my patch:
z/OS:
OF_None: open in binary mode
OF_Text : open in text mode
OF_TextWithCRLF: open in text mode
Windows:
OF_None: open file with no carriage return
OF_Text: open file with no carriage return
OF_TextWithCRLF: open file with carriage return
The Major change is in llvm/lib/Support/Windows/Path.inc to only set text mode if the OF_CRLF is set.
```
if (Flags & OF_CRLF)
CrtOpenFlags |= _O_TEXT;
```
These following files are the ones that still use OF_Text which I left unchanged. I modified all these except raw_ostream.cpp in recent patches so I know these were previously in Binary mode on Windows.
./llvm/lib/Support/raw_ostream.cpp
./llvm/lib/TableGen/Main.cpp
./llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
./llvm/unittests/Support/Path.cpp
./clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp
./clang/lib/Frontend/CompilerInstance.cpp
./clang/lib/Driver/Driver.cpp
./clang/lib/Driver/ToolChains/Clang.cpp
Reviewed By: MaskRay
Differential Revision: https://reviews.llvm.org/D99426
101 lines
4.2 KiB
C++
101 lines
4.2 KiB
C++
//===- xray-extract.cpp: XRay Instrumentation Map Extraction --------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Implementation of the xray-extract.h interface.
|
|
//
|
|
// FIXME: Support other XRay-instrumented binary formats other than ELF.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
#include "func-id-helper.h"
|
|
#include "xray-registry.h"
|
|
#include "llvm/Object/ObjectFile.h"
|
|
#include "llvm/Support/CommandLine.h"
|
|
#include "llvm/Support/Error.h"
|
|
#include "llvm/Support/FileSystem.h"
|
|
#include "llvm/Support/Format.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
#include "llvm/XRay/InstrumentationMap.h"
|
|
|
|
using namespace llvm;
|
|
using namespace llvm::xray;
|
|
using namespace llvm::yaml;
|
|
|
|
// llvm-xray extract
|
|
// ----------------------------------------------------------------------------
|
|
static cl::SubCommand Extract("extract", "Extract instrumentation maps");
|
|
static cl::opt<std::string> ExtractInput(cl::Positional,
|
|
cl::desc("<input file>"), cl::Required,
|
|
cl::sub(Extract));
|
|
static cl::opt<std::string>
|
|
ExtractOutput("output", cl::value_desc("output file"), cl::init("-"),
|
|
cl::desc("output file; use '-' for stdout"),
|
|
cl::sub(Extract));
|
|
static cl::alias ExtractOutput2("o", cl::aliasopt(ExtractOutput),
|
|
cl::desc("Alias for -output"));
|
|
static cl::opt<bool> ExtractSymbolize("symbolize", cl::value_desc("symbolize"),
|
|
cl::init(false),
|
|
cl::desc("symbolize functions"),
|
|
cl::sub(Extract));
|
|
static cl::alias ExtractSymbolize2("s", cl::aliasopt(ExtractSymbolize),
|
|
cl::desc("alias for -symbolize"));
|
|
static cl::opt<bool> ExtractNoDemangle("no-demangle",
|
|
cl::value_desc("no-demangle"),
|
|
cl::init(false),
|
|
cl::desc("don't demangle symbols"),
|
|
cl::sub(Extract));
|
|
|
|
namespace {
|
|
|
|
void exportAsYAML(const InstrumentationMap &Map, raw_ostream &OS,
|
|
FuncIdConversionHelper &FH) {
|
|
// First we translate the sleds into the YAMLXRaySledEntry objects in a deque.
|
|
std::vector<YAMLXRaySledEntry> YAMLSleds;
|
|
auto Sleds = Map.sleds();
|
|
YAMLSleds.reserve(std::distance(Sleds.begin(), Sleds.end()));
|
|
for (const auto &Sled : Sleds) {
|
|
auto FuncId = Map.getFunctionId(Sled.Function);
|
|
if (!FuncId)
|
|
return;
|
|
YAMLSleds.push_back(
|
|
{*FuncId, Sled.Address, Sled.Function, Sled.Kind, Sled.AlwaysInstrument,
|
|
ExtractSymbolize ? FH.SymbolOrNumber(*FuncId) : "", Sled.Version});
|
|
}
|
|
Output Out(OS, nullptr, 0);
|
|
Out << YAMLSleds;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
static CommandRegistration Unused(&Extract, []() -> Error {
|
|
auto InstrumentationMapOrError = loadInstrumentationMap(ExtractInput);
|
|
if (!InstrumentationMapOrError)
|
|
return joinErrors(make_error<StringError>(
|
|
Twine("Cannot extract instrumentation map from '") +
|
|
ExtractInput + "'.",
|
|
std::make_error_code(std::errc::invalid_argument)),
|
|
InstrumentationMapOrError.takeError());
|
|
|
|
std::error_code EC;
|
|
raw_fd_ostream OS(ExtractOutput, EC, sys::fs::OpenFlags::OF_TextWithCRLF);
|
|
if (EC)
|
|
return make_error<StringError>(
|
|
Twine("Cannot open file '") + ExtractOutput + "' for writing.", EC);
|
|
const auto &FunctionAddresses =
|
|
InstrumentationMapOrError->getFunctionAddresses();
|
|
symbolize::LLVMSymbolizer::Options opts;
|
|
if (ExtractNoDemangle)
|
|
opts.Demangle = false;
|
|
symbolize::LLVMSymbolizer Symbolizer(opts);
|
|
llvm::xray::FuncIdConversionHelper FuncIdHelper(ExtractInput, Symbolizer,
|
|
FunctionAddresses);
|
|
exportAsYAML(*InstrumentationMapOrError, OS, FuncIdHelper);
|
|
return Error::success();
|
|
});
|