cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wasm/BinaryTransform: Rename globals and functions to globalIDs and functionIDs

Browse Source
This commit is contained in:
Kamil Śliwak 2020-06-09 17:13:19 +02:00
parent b2a8639c20
commit b9ecccdece
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libyul/backends/wasm/BinaryTransform.cpp
View File

@ -255,13 +255,13 @@ bytes BinaryTransform::run(Module const& _module)
{ {
map<Type, vector<string>> const types = typeToFunctionMap(_module.imports, _module.functions); map<Type, vector<string>> const types = typeToFunctionMap(_module.imports, _module.functions);
map<string, size_t> const globals = enumerateGlobals(_module); map<string, size_t> const globalIDs = enumerateGlobals(_module);
map<string, size_t> const functions = enumerateFunctions(_module); map<string, size_t> const functionIDs = enumerateFunctions(_module);
map<string, size_t> const functionTypes = enumerateFunctionTypes(types); map<string, size_t> const functionTypes = enumerateFunctionTypes(types);
yulAssert(globals.size() == _module.globals.size(), ""); yulAssert(globalIDs.size() == _module.globals.size(), "");
yulAssert(functions.size() == _module.imports.size() + _module.functions.size(), ""); yulAssert(functionIDs.size() == _module.imports.size() + _module.functions.size(), "");
yulAssert(functionTypes.size() == functions.size(), ""); yulAssert(functionTypes.size() == functionIDs.size(), "");
yulAssert(functionTypes.size() >= types.size(), ""); yulAssert(functionTypes.size() >= types.size(), "");
bytes ret{0, 'a', 's', 'm'}; bytes ret{0, 'a', 's', 'm'};
@ -272,7 +272,7 @@ bytes BinaryTransform::run(Module const& _module)
ret += functionSection(_module.functions, functionTypes); ret += functionSection(_module.functions, functionTypes);
ret += memorySection(); ret += memorySection();
ret += globalSection(_module.globals); ret += globalSection(_module.globals);
ret += exportSection(functions); ret += exportSection(functionIDs);
map<string, pair<size_t, size_t>> subModulePosAndSize; map<string, pair<size_t, size_t>> subModulePosAndSize;
for (auto const& sub: _module.subModules) for (auto const& sub: _module.subModules)
@ -285,8 +285,8 @@ bytes BinaryTransform::run(Module const& _module)
} }
BinaryTransform bt( BinaryTransform bt(
move(globals), move(globalIDs),
move(functions), move(functionIDs),
move(functionTypes), move(functionTypes),
move(subModulePosAndSize) move(subModulePosAndSize)
); );
@ -313,7 +313,7 @@ bytes BinaryTransform::operator()(LocalVariable const& _variable)
bytes BinaryTransform::operator()(GlobalVariable const& _variable) bytes BinaryTransform::operator()(GlobalVariable const& _variable)
{ {
return toBytes(Opcode::GlobalGet) + lebEncode(m_globals.at(_variable.name)); return toBytes(Opcode::GlobalGet) + lebEncode(m_globalIDs.at(_variable.name));
} }
bytes BinaryTransform::operator()(BuiltinCall const& _call) bytes BinaryTransform::operator()(BuiltinCall const& _call)
@ -359,7 +359,7 @@ bytes BinaryTransform::operator()(BuiltinCall const& _call)
bytes BinaryTransform::operator()(FunctionCall const& _call) bytes BinaryTransform::operator()(FunctionCall const& _call)
{ {
return visit(_call.arguments) + toBytes(Opcode::Call) + lebEncode(m_functions.at(_call.functionName)); return visit(_call.arguments) + toBytes(Opcode::Call) + lebEncode(m_functionIDs.at(_call.functionName));
} }
bytes BinaryTransform::operator()(LocalAssignment const& _assignment) bytes BinaryTransform::operator()(LocalAssignment const& _assignment)
@ -375,7 +375,7 @@ bytes BinaryTransform::operator()(GlobalAssignment const& _assignment)
return return
std::visit(*this, *_assignment.value) + std::visit(*this, *_assignment.value) +
toBytes(Opcode::GlobalSet) + toBytes(Opcode::GlobalSet) +
lebEncode(m_globals.at(_assignment.variableName)); lebEncode(m_globalIDs.at(_assignment.variableName));
} }
bytes BinaryTransform::operator()(If const& _if) bytes BinaryTransform::operator()(If const& _if)
@ -623,11 +623,11 @@ bytes BinaryTransform::globalSection(vector<wasm::GlobalVariableDeclaration> con
return makeSection(Section::GLOBAL, std::move(result)); return makeSection(Section::GLOBAL, std::move(result));
} }
bytes BinaryTransform::exportSection(map<string, size_t> const& _functions) bytes BinaryTransform::exportSection(map<string, size_t> const& _functionIDs)
{ {
bytes result = lebEncode(2); bytes result = lebEncode(2);
result += encodeName("memory") + toBytes(Export::Memory) + lebEncode(0); result += encodeName("memory") + toBytes(Export::Memory) + lebEncode(0);
result += encodeName("main") + toBytes(Export::Function) + lebEncode(_functions.at("main")); result += encodeName("main") + toBytes(Export::Function) + lebEncode(_functionIDs.at("main"));
return makeSection(Section::EXPORT, std::move(result)); return makeSection(Section::EXPORT, std::move(result));
} }

14
libyul/backends/wasm/BinaryTransform.h
View File

@ -56,13 +56,13 @@ public:
private: private:
BinaryTransform( BinaryTransform(
std::map<std::string, size_t> _globals, std::map<std::string, size_t> _globalIDs,
std::map<std::string, size_t> _functions, std::map<std::string, size_t> _functionIDs,
std::map<std::string, size_t> _functionTypes, std::map<std::string, size_t> _functionTypes,
std::map<std::string, std::pair<size_t, size_t>> _subModulePosAndSize std::map<std::string, std::pair<size_t, size_t>> _subModulePosAndSize
): ):
m_globals(std::move(_globals)), m_globalIDs(std::move(_globalIDs)),
m_functions(std::move(_functions)), m_functionIDs(std::move(_functionIDs)),
m_functionTypes(std::move(_functionTypes)), m_functionTypes(std::move(_functionTypes)),
m_subModulePosAndSize(std::move(_subModulePosAndSize)) m_subModulePosAndSize(std::move(_subModulePosAndSize))
{} {}
@ -96,7 +96,7 @@ private:
); );
static bytes memorySection(); static bytes memorySection();
static bytes globalSection(std::vector<wasm::GlobalVariableDeclaration> const& _globals); static bytes globalSection(std::vector<wasm::GlobalVariableDeclaration> const& _globals);
static bytes exportSection(std::map<std::string, size_t> const& _functions); static bytes exportSection(std::map<std::string, size_t> const& _functionIDs);
static bytes customSection(std::string const& _name, bytes _data); static bytes customSection(std::string const& _name, bytes _data);
bytes codeSection(std::vector<wasm::FunctionDefinition> const& _functions); bytes codeSection(std::vector<wasm::FunctionDefinition> const& _functions);
@ -107,8 +107,8 @@ private:
static bytes encodeName(std::string const& _name); static bytes encodeName(std::string const& _name);
std::map<std::string, size_t> const m_globals; std::map<std::string, size_t> const m_globalIDs;
std::map<std::string, size_t> const m_functions; std::map<std::string, size_t> const m_functionIDs;
std::map<std::string, size_t> const m_functionTypes; std::map<std::string, size_t> const m_functionTypes;
std::map<std::string, std::pair<size_t, size_t>> const m_subModulePosAndSize; std::map<std::string, std::pair<size_t, size_t>> const m_subModulePosAndSize;