Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-26 13:26:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[WebAssembly] Move toString helpers to BinaryFormat

Browse Source 
Subscribers: dschuff, mgorny, jgravelle-google, aheejin, sunfish, llvm-commits

Differential Revision: https://reviews.llvm.org/D46847

llvm-svn: 332305
This commit is contained in:
Sam Clegg 2018-05-14 22:42:07 +00:00
parent ed5b3255f0
commit 5f87ab336e
6 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/include/llvm/BinaryFormat/Wasm.h
View File

@ -290,6 +290,9 @@ inline bool operator!=(const WasmGlobalType &LHS, const WasmGlobalType &RHS) {
return !(LHS == RHS);
}
std::string toString(wasm::WasmSymbolType type);
std::string relocTypetoString(uint32_t type);
} // end namespace wasm
} // end namespace llvm

3
llvm/include/llvm/Object/Wasm.h
View File

@ -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;

3
llvm/lib/BinaryFormat/CMakeLists.txt
View File

@ -1,8 +1,9 @@
add_llvm_library(LLVMBinaryFormat
Dwarf.cpp
Magic.cpp
Wasm.cpp
ADDITIONAL_HEADER_DIRS
${LLVM_MAIN_INCLUDE_DIR}/llvm/BinaryFormat
)

34
llvm/lib/BinaryFormat/Wasm.cpp Normal file
View File

@ -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");
}
}

2
llvm/lib/MC/LLVMBuild.txt
View File

@ -22,4 +22,4 @@ subdirectories = MCDisassembler MCParser
type = Library
name = MC
parent = Libraries
required_libraries = Support DebugInfoCodeView
required_libraries = Support BinaryFormat DebugInfoCodeView

28
llvm/lib/MC/WasmObjectWriter.cpp
View File

@ -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();
}