[llvm] r332305 - [WebAssembly] Move toString helpers to BinaryFormat
Sam Clegg via llvm-commits
llvm-commits at lists.llvm.org
Mon May 14 15:42:07 PDT 2018
Author: sbc
Date: Mon May 14 15:42:07 2018
New Revision: 332305
URL: http://llvm.org/viewvc/llvm-project?rev=332305&view=rev
Log:
[WebAssembly] Move toString helpers to BinaryFormat
Subscribers: dschuff, mgorny, jgravelle-google, aheejin, sunfish, llvm-commits
Differential Revision: https://reviews.llvm.org/D46847
Added:
llvm/trunk/lib/BinaryFormat/Wasm.cpp (with props)
Modified:
llvm/trunk/include/llvm/BinaryFormat/Wasm.h
llvm/trunk/include/llvm/Object/Wasm.h
llvm/trunk/lib/BinaryFormat/CMakeLists.txt
llvm/trunk/lib/MC/LLVMBuild.txt
llvm/trunk/lib/MC/WasmObjectWriter.cpp
Modified: llvm/trunk/include/llvm/BinaryFormat/Wasm.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BinaryFormat/Wasm.h?rev=332305&r1=332304&r2=332305&view=diff
==============================================================================
--- llvm/trunk/include/llvm/BinaryFormat/Wasm.h (original)
+++ llvm/trunk/include/llvm/BinaryFormat/Wasm.h Mon May 14 15:42:07 2018
@@ -290,6 +290,9 @@ inline bool operator!=(const WasmGlobalT
return !(LHS == RHS);
}
+std::string toString(wasm::WasmSymbolType type);
+std::string relocTypetoString(uint32_t type);
+
} // end namespace wasm
} // end namespace llvm
Modified: llvm/trunk/include/llvm/Object/Wasm.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/Wasm.h?rev=332305&r1=332304&r2=332305&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/Wasm.h (original)
+++ llvm/trunk/include/llvm/Object/Wasm.h Mon May 14 15:42:07 2018
@@ -89,7 +89,8 @@ public:
}
void print(raw_ostream &Out) const {
- Out << "Name=" << Info.Name << ", Kind=" << int(Info.Kind)
+ Out << "Name=" << Info.Name
+ << ", Kind=" << toString(wasm::WasmSymbolType(Info.Kind))
<< ", Flags=" << Info.Flags;
if (!isTypeData()) {
Out << ", ElemIndex=" << Info.ElementIndex;
Modified: llvm/trunk/lib/BinaryFormat/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/BinaryFormat/CMakeLists.txt?rev=332305&r1=332304&r2=332305&view=diff
==============================================================================
--- llvm/trunk/lib/BinaryFormat/CMakeLists.txt (original)
+++ llvm/trunk/lib/BinaryFormat/CMakeLists.txt Mon May 14 15:42:07 2018
@@ -1,8 +1,9 @@
add_llvm_library(LLVMBinaryFormat
Dwarf.cpp
Magic.cpp
+ Wasm.cpp
ADDITIONAL_HEADER_DIRS
${LLVM_MAIN_INCLUDE_DIR}/llvm/BinaryFormat
)
-
\ No newline at end of file
+
Added: llvm/trunk/lib/BinaryFormat/Wasm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/BinaryFormat/Wasm.cpp?rev=332305&view=auto
==============================================================================
--- llvm/trunk/lib/BinaryFormat/Wasm.cpp (added)
+++ llvm/trunk/lib/BinaryFormat/Wasm.cpp Mon May 14 15:42:07 2018
@@ -0,0 +1,34 @@
+//===-- llvm/BinaryFormat/Wasm.cpp -------------------------------*- C++-*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/BinaryFormat/Wasm.h"
+
+std::string llvm::wasm::toString(wasm::WasmSymbolType type) {
+ switch (type) {
+ case wasm::WASM_SYMBOL_TYPE_FUNCTION:
+ return "WASM_SYMBOL_TYPE_FUNCTION";
+ case wasm::WASM_SYMBOL_TYPE_GLOBAL:
+ return "WASM_SYMBOL_TYPE_GLOBAL";
+ case wasm::WASM_SYMBOL_TYPE_DATA:
+ return "WASM_SYMBOL_TYPE_DATA";
+ case wasm::WASM_SYMBOL_TYPE_SECTION:
+ return "WASM_SYMBOL_TYPE_SECTION";
+ }
+ llvm_unreachable("unknown symbol type");
+}
+
+std::string llvm::wasm::relocTypetoString(uint32_t type) {
+ switch (type) {
+#define WASM_RELOC(NAME, VALUE) case VALUE: return #NAME;
+#include "llvm/BinaryFormat/WasmRelocs.def"
+#undef WASM_RELOC
+ default:
+ llvm_unreachable("unknown reloc type");
+ }
+}
Propchange: llvm/trunk/lib/BinaryFormat/Wasm.cpp
------------------------------------------------------------------------------
svn:eol-style = LF
Modified: llvm/trunk/lib/MC/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/LLVMBuild.txt?rev=332305&r1=332304&r2=332305&view=diff
==============================================================================
--- llvm/trunk/lib/MC/LLVMBuild.txt (original)
+++ llvm/trunk/lib/MC/LLVMBuild.txt Mon May 14 15:42:07 2018
@@ -22,4 +22,4 @@ subdirectories = MCDisassembler MCParser
type = Library
name = MC
parent = Libraries
-required_libraries = Support DebugInfoCodeView
+required_libraries = Support BinaryFormat DebugInfoCodeView
Modified: llvm/trunk/lib/MC/WasmObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/WasmObjectWriter.cpp?rev=332305&r1=332304&r2=332305&view=diff
==============================================================================
--- llvm/trunk/lib/MC/WasmObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/WasmObjectWriter.cpp Mon May 14 15:42:07 2018
@@ -37,32 +37,6 @@ using namespace llvm;
#define DEBUG_TYPE "mc"
-#if !defined(NDEBUG)
-static std::string toString(wasm::WasmSymbolType type) {
- switch (type) {
- case wasm::WASM_SYMBOL_TYPE_FUNCTION:
- return "WASM_SYMBOL_TYPE_FUNCTION";
- case wasm::WASM_SYMBOL_TYPE_GLOBAL:
- return "WASM_SYMBOL_TYPE_GLOBAL";
- case wasm::WASM_SYMBOL_TYPE_DATA:
- return "WASM_SYMBOL_TYPE_DATA";
- case wasm::WASM_SYMBOL_TYPE_SECTION:
- return "WASM_SYMBOL_TYPE_SECTION";
- }
- llvm_unreachable("unknown symbol type");
-}
-#endif
-
-static std::string relocTypetoString(uint32_t type) {
- switch (type) {
-#define WASM_RELOC(NAME, VALUE) case VALUE: return #NAME;
-#include "llvm/BinaryFormat/WasmRelocs.def"
-#undef WASM_RELOC
- default:
- llvm_unreachable("uknown reloc type");
- }
-}
-
namespace {
// Went we ceate the indirect function table we start at 1, so that there is
@@ -189,7 +163,7 @@ struct WasmRelocationEntry {
}
void print(raw_ostream &Out) const {
- Out << relocTypetoString(Type)
+ Out << wasm::relocTypetoString(Type)
<< " Off=" << Offset << ", Sym=" << *Symbol << ", Addend=" << Addend
<< ", FixupSection=" << FixupSection->getSectionName();
}
More information about the llvm-commits
mailing list