[llvm] r208157 - [obj2yaml] Recognize input file format using llvm::object::ObjectFile
Simon Atanasyan
simon at atanasyan.com
Tue May 6 22:18:51 PDT 2014
Author: atanasyan
Date: Wed May 7 00:18:51 2014
New Revision: 208157
URL: http://llvm.org/viewvc/llvm-project?rev=208157&view=rev
Log:
[obj2yaml] Recognize input file format using llvm::object::ObjectFile
interface methods isCOFF().
The '-coff' command line option has been removed. It was not used in any
test cases.
The patch reviewed by Michael Spencer.
Added:
llvm/trunk/tools/obj2yaml/Error.cpp
llvm/trunk/tools/obj2yaml/Error.h
Modified:
llvm/trunk/tools/obj2yaml/CMakeLists.txt
llvm/trunk/tools/obj2yaml/coff2yaml.cpp
llvm/trunk/tools/obj2yaml/obj2yaml.cpp
llvm/trunk/tools/obj2yaml/obj2yaml.h
Modified: llvm/trunk/tools/obj2yaml/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/CMakeLists.txt?rev=208157&r1=208156&r2=208157&view=diff
==============================================================================
--- llvm/trunk/tools/obj2yaml/CMakeLists.txt (original)
+++ llvm/trunk/tools/obj2yaml/CMakeLists.txt Wed May 7 00:18:51 2014
@@ -4,5 +4,5 @@ set(LLVM_LINK_COMPONENTS
)
add_llvm_utility(obj2yaml
- obj2yaml.cpp coff2yaml.cpp
+ obj2yaml.cpp coff2yaml.cpp Error.cpp
)
Added: llvm/trunk/tools/obj2yaml/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/Error.cpp?rev=208157&view=auto
==============================================================================
--- llvm/trunk/tools/obj2yaml/Error.cpp (added)
+++ llvm/trunk/tools/obj2yaml/Error.cpp Wed May 7 00:18:51 2014
@@ -0,0 +1,54 @@
+//===- Error.cpp - system_error extensions for obj2yaml ---------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Error.h"
+#include "llvm/Support/ErrorHandling.h"
+
+using namespace llvm;
+
+namespace {
+class _obj2yaml_error_category : public error_category {
+public:
+ const char *name() const override;
+ std::string message(int ev) const override;
+ error_condition default_error_condition(int ev) const override;
+};
+} // namespace
+
+const char *_obj2yaml_error_category::name() const { return "obj2yaml"; }
+
+std::string _obj2yaml_error_category::message(int ev) const {
+ switch (ev) {
+ case obj2yaml_error::success:
+ return "Success";
+ case obj2yaml_error::file_not_found:
+ return "No such file.";
+ case obj2yaml_error::unrecognized_file_format:
+ return "Unrecognized file type.";
+ case obj2yaml_error::unsupported_obj_file_format:
+ return "Unsupported object file format.";
+ default:
+ llvm_unreachable("An enumerator of obj2yaml_error does not have a message "
+ "defined.");
+ }
+}
+
+error_condition
+_obj2yaml_error_category::default_error_condition(int ev) const {
+ if (ev == obj2yaml_error::success)
+ return errc::success;
+ return errc::invalid_argument;
+}
+
+namespace llvm {
+const error_category &obj2yaml_category() {
+ static _obj2yaml_error_category o;
+ return o;
+}
+} // namespace llvm
Added: llvm/trunk/tools/obj2yaml/Error.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/Error.h?rev=208157&view=auto
==============================================================================
--- llvm/trunk/tools/obj2yaml/Error.h (added)
+++ llvm/trunk/tools/obj2yaml/Error.h Wed May 7 00:18:51 2014
@@ -0,0 +1,42 @@
+//===- Error.h - system_error extensions for obj2yaml -----------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_TOOLS_ERROR_H
+#define LLVM_TOOLS_ERROR_H
+
+#include "llvm/Support/system_error.h"
+
+namespace llvm {
+
+const error_category &obj2yaml_category();
+
+struct obj2yaml_error {
+ enum _ {
+ success = 0,
+ file_not_found,
+ unrecognized_file_format,
+ unsupported_obj_file_format
+ };
+ _ v_;
+
+ obj2yaml_error(_ v) : v_(v) {}
+ explicit obj2yaml_error(int v) : v_(_(v)) {}
+ operator int() const {return v_;}
+};
+
+inline error_code make_error_code(obj2yaml_error e) {
+ return error_code(static_cast<int>(e), obj2yaml_category());
+}
+
+template <> struct is_error_code_enum<obj2yaml_error> : std::true_type { };
+template <> struct is_error_code_enum<obj2yaml_error::_> : std::true_type { };
+
+} // namespace llvm
+
+#endif
Modified: llvm/trunk/tools/obj2yaml/coff2yaml.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/coff2yaml.cpp?rev=208157&r1=208156&r2=208157&view=diff
==============================================================================
--- llvm/trunk/tools/obj2yaml/coff2yaml.cpp (original)
+++ llvm/trunk/tools/obj2yaml/coff2yaml.cpp Wed May 7 00:18:51 2014
@@ -210,10 +210,7 @@ COFFYAML::Object &COFFDumper::getYAMLObj
return YAMLObj;
}
-error_code coff2yaml(raw_ostream &Out, MemoryBuffer *Buff) {
- error_code ec;
- object::COFFObjectFile Obj(Buff, ec);
- check(ec);
+error_code coff2yaml(raw_ostream &Out, const object::COFFObjectFile &Obj) {
COFFDumper Dumper(Obj);
yaml::Output Yout(Out);
Modified: llvm/trunk/tools/obj2yaml/obj2yaml.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/obj2yaml.cpp?rev=208157&r1=208156&r2=208157&view=diff
==============================================================================
--- llvm/trunk/tools/obj2yaml/obj2yaml.cpp (original)
+++ llvm/trunk/tools/obj2yaml/obj2yaml.cpp Wed May 7 00:18:51 2014
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "Error.h"
#include "obj2yaml.h"
#include "llvm/Object/Archive.h"
#include "llvm/Object/COFF.h"
@@ -16,16 +17,30 @@
#include "llvm/Support/Signals.h"
using namespace llvm;
+using namespace llvm::object;
-namespace {
-enum ObjectFileType {
- coff
-};
+static error_code dumpObject(const ObjectFile &Obj) {
+ if (Obj.isCOFF())
+ return coff2yaml(outs(), cast<COFFObjectFile>(Obj));
+
+ return obj2yaml_error::unsupported_obj_file_format;
}
-cl::opt<ObjectFileType> InputFormat(
- cl::desc("Choose input format"),
- cl::values(clEnumVal(coff, "process COFF object files"), clEnumValEnd));
+static error_code dumpInput(StringRef File) {
+ if (File != "-" && !sys::fs::exists(File))
+ return obj2yaml_error::file_not_found;
+
+ ErrorOr<Binary *> BinaryOrErr = createBinary(File);
+ if (error_code EC = BinaryOrErr.getError())
+ return EC;
+
+ std::unique_ptr<Binary> Binary(BinaryOrErr.get());
+ // TODO: If this is an archive, then burst it and dump each entry
+ if (ObjectFile *Obj = dyn_cast<ObjectFile>(Binary.get()))
+ return dumpObject(*Obj);
+
+ return obj2yaml_error::unrecognized_file_format;
+}
cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input file>"),
cl::init("-"));
@@ -36,17 +51,9 @@ int main(int argc, char *argv[]) {
PrettyStackTraceProgram X(argc, argv);
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
- // Process the input file
- std::unique_ptr<MemoryBuffer> buf;
-
- // TODO: If this is an archive, then burst it and dump each entry
- if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, buf)) {
- errs() << "Error: '" << ec.message() << "' opening file '" << InputFilename
- << "'\n";
- } else {
- ec = coff2yaml(outs(), buf.release());
- if (ec)
- errs() << "Error: " << ec.message() << " dumping COFF file\n";
+ if (error_code EC = dumpInput(InputFilename)) {
+ errs() << "Error: '" << EC.message() << "'\n";
+ return 1;
}
return 0;
Modified: llvm/trunk/tools/obj2yaml/obj2yaml.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/obj2yaml.h?rev=208157&r1=208156&r2=208157&view=diff
==============================================================================
--- llvm/trunk/tools/obj2yaml/obj2yaml.h (original)
+++ llvm/trunk/tools/obj2yaml/obj2yaml.h Wed May 7 00:18:51 2014
@@ -13,10 +13,11 @@
#ifndef LLVM_TOOLS_OBJ2YAML_H
#define LLVM_TOOLS_OBJ2YAML_H
-#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Object/COFF.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/system_error.h"
-llvm::error_code coff2yaml(llvm::raw_ostream &Out, llvm::MemoryBuffer *TheObj);
+llvm::error_code coff2yaml(llvm::raw_ostream &Out,
+ const llvm::object::COFFObjectFile &Obj);
#endif
More information about the llvm-commits
mailing list