Skip to content

WASM_X86: Combine X86Generator and X86Visitor Classes #1257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2022
Merged

WASM_X86: Combine X86Generator and X86Visitor Classes #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 126 additions & 16 deletions src/libasr/codegen/wasm_to_x86.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,128 @@ namespace LFortran {

namespace wasm {

class X86Generator : public WASMDecoder<X86Generator> {
class X86Visitor : public WASMDecoder<X86Visitor>,
public WASM_INSTS_VISITOR::BaseWASMVisitor<X86Visitor> {
public:
X86Generator(Allocator &al, diag::Diagnostics &diagonostics)
: WASMDecoder(al, diagonostics) {}
X86Assembler &m_a;
uint32_t cur_func_idx;

X86Visitor(X86Assembler &m_a, Allocator &al,
diag::Diagnostics &diagonostics, Vec<uint8_t> &code)
: WASMDecoder(al, diagonostics),
BaseWASMVisitor(code, 0U /* temporary offset */),
m_a(m_a) {
wasm_bytes.from_pointer_n(code.data(), code.size());
}

void visit_Return() {}

void visit_Call(uint32_t func_index) {
if (func_index <= 6U) {
// call to imported functions
if (func_index == 0) {
m_a.asm_call_label("print_i32");
} else if (func_index == 5) {
// currently ignoring flush_buf
} else if (func_index == 6) {
m_a.asm_call_label("exit");
} else {
std::cerr << "Call to imported function with index " +
std::to_string(func_index) +
" not yet supported";
}
return;
}

uint32_t imports_adjusted_func_index = func_index - 7U;
m_a.asm_call_label(exports[imports_adjusted_func_index].name);

// Pop the passed function arguments
wasm::FuncType func_type =
func_types[type_indices[imports_adjusted_func_index]];
for (uint32_t i = 0; i < func_type.param_types.size(); i++) {
m_a.asm_pop_r32(X86Reg::eax);
}

// Adjust the return values of the called function
X86Reg base = X86Reg::esp;
for (uint32_t i = 0; i < func_type.result_types.size(); i++) {
// take value into eax
m_a.asm_mov_r32_m32(
X86Reg::eax, &base, nullptr, 1,
-(4 * (func_type.param_types.size() + 2 +
codes[imports_adjusted_func_index].locals.size() + 1)));

// push eax value onto stack
m_a.asm_push_r32(X86Reg::eax);
}
}

void visit_LocalGet(uint32_t localidx) {
X86Reg base = X86Reg::ebp;
int no_of_params =
(int)func_types[type_indices[cur_func_idx]].param_types.size();
if ((int)localidx < no_of_params) {
m_a.asm_mov_r32_m32(X86Reg::eax, &base, nullptr, 1,
(4 * localidx + 8));
m_a.asm_push_r32(X86Reg::eax);
} else {
m_a.asm_mov_r32_m32(X86Reg::eax, &base, nullptr, 1,
-(4 * ((int)localidx - no_of_params + 1)));
m_a.asm_push_r32(X86Reg::eax);
}
}
void visit_LocalSet(uint32_t localidx) {
X86Reg base = X86Reg::ebp;
int no_of_params =
(int)func_types[type_indices[cur_func_idx]].param_types.size();
if ((int)localidx < no_of_params) {
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_mov_m32_r32(&base, nullptr, 1, (4 * localidx + 8),
X86Reg::eax);
} else {
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_mov_m32_r32(&base, nullptr, 1,
-(4 * ((int)localidx - no_of_params + 1)),
X86Reg::eax);
}
}

void visit_I32Const(int32_t value) {
m_a.asm_push_imm32(value);
// if (value < 0) {
// m_a.asm_pop_r32(X86Reg::eax);
// m_a.asm_neg_r32(X86Reg::eax);
// m_a.asm_push_r32(X86Reg::eax);
// }
}

void gen_x86_bytes(X86Assembler &m_a) {
void visit_I32Add() {
m_a.asm_pop_r32(X86Reg::ebx);
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_add_r32_r32(X86Reg::eax, X86Reg::ebx);
m_a.asm_push_r32(X86Reg::eax);
}
void visit_I32Sub() {
m_a.asm_pop_r32(X86Reg::ebx);
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_sub_r32_r32(X86Reg::eax, X86Reg::ebx);
m_a.asm_push_r32(X86Reg::eax);
}
void visit_I32Mul() {
m_a.asm_pop_r32(X86Reg::ebx);
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_mul_r32(X86Reg::ebx);
m_a.asm_push_r32(X86Reg::eax);
}
void visit_I32DivS() {
m_a.asm_pop_r32(X86Reg::ebx);
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_div_r32(X86Reg::ebx);
m_a.asm_push_r32(X86Reg::eax);
}

void gen_x86_bytes() {
emit_elf32_header(m_a);

// Add runtime library functions
Expand Down Expand Up @@ -44,13 +160,9 @@ class X86Generator : public WASMDecoder<X86Generator> {
}
}

WASM_INSTS_VISITOR::X86Visitor v =
WASM_INSTS_VISITOR::X86Visitor(
wasm_bytes, codes.p[i].insts_start_index, m_a,
func_types, imports, type_indices, exports, codes,
data_segments, i);

v.decode_instructions();
offset = codes.p[i].insts_start_index;
cur_func_idx = i;
decode_instructions();

// Restore stack
m_a.asm_mov_r32_r32(X86Reg::esp, X86Reg::ebp);
Expand All @@ -75,14 +187,12 @@ Result<int> wasm_to_x86(Vec<uint8_t> &wasm_bytes, Allocator &al,

X86Assembler m_a(al);

wasm::X86Generator x86_generator(al, diagnostics);
x86_generator.wasm_bytes.from_pointer_n(wasm_bytes.data(),
wasm_bytes.size());
wasm::X86Visitor x86_visitor(m_a, al, diagnostics, wasm_bytes);

{
auto t1 = std::chrono::high_resolution_clock::now();
try {
x86_generator.decode_wasm();
x86_visitor.decode_wasm();
} catch (const CodeGenError &e) {
diagnostics.diagnostics.push_back(e.d);
return Error();
Expand All @@ -95,7 +205,7 @@ Result<int> wasm_to_x86(Vec<uint8_t> &wasm_bytes, Allocator &al,

{
auto t1 = std::chrono::high_resolution_clock::now();
x86_generator.gen_x86_bytes(m_a);
x86_visitor.gen_x86_bytes();
auto t2 = std::chrono::high_resolution_clock::now();
time_gen_x86_bytes =
std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1)
Expand Down
140 changes: 0 additions & 140 deletions src/libasr/codegen/wasm_to_x86.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,149 +2,9 @@
#define LFORTRAN_WASM_TO_X86_H

#include <libasr/wasm_visitor.h>
#include <libasr/codegen/x86_assembler.h>

namespace LFortran {

namespace WASM_INSTS_VISITOR {

class X86Visitor : public BaseWASMVisitor<X86Visitor> {
public:
X86Assembler &m_a;
Vec<wasm::FuncType> func_types;
Vec<wasm::Import> imports;
Vec<uint32_t> type_indices;
Vec<wasm::Export> exports;
Vec<wasm::Code> func_codes;
Vec<wasm::Data> data_segments;
uint32_t cur_func_idx;

X86Visitor(Vec<uint8_t> &code, uint32_t offset, X86Assembler &m_a,
Vec<wasm::FuncType> &func_types, Vec<wasm::Import> &imports,
Vec<uint32_t> &type_indices, Vec<wasm::Export> &exports,
Vec<wasm::Code> &func_codes, Vec<wasm::Data> &data_segments,
uint32_t cur_func_idx)
: BaseWASMVisitor(code, offset), m_a(m_a) {
this->func_types.from_pointer_n(func_types.p, func_types.size());
this->imports.from_pointer_n(imports.p, imports.size());
this->type_indices.from_pointer_n(type_indices.p, type_indices.size());
this->exports.from_pointer_n(exports.p, exports.size());
this->func_codes.from_pointer_n(func_codes.p, func_codes.size());
this->data_segments.from_pointer_n(data_segments.p,
data_segments.size());
this->cur_func_idx = cur_func_idx;
}

void visit_Return() {}

void visit_Call(uint32_t func_index) {
if (func_index <= 6U) {
// call to imported functions
if (func_index == 0) {
m_a.asm_call_label("print_i32");
} else if (func_index == 5) {
// currently ignoring flush_buf
} else if (func_index == 6) {
m_a.asm_call_label("exit");
} else {
std::cerr << "Call to imported function with index " +
std::to_string(func_index) +
" not yet supported";
}
return;
}

uint32_t imports_adjusted_func_index = func_index - 7U;
m_a.asm_call_label(exports[imports_adjusted_func_index].name);


// Pop the passed function arguments
wasm::FuncType func_type = func_types[type_indices[imports_adjusted_func_index]];
for (uint32_t i = 0; i < func_type.param_types.size(); i++) {
m_a.asm_pop_r32(X86Reg::eax);
}

// Adjust the return values of the called function
X86Reg base = X86Reg::esp;
for (uint32_t i = 0; i < func_type.result_types.size(); i++) {
// take value into eax
m_a.asm_mov_r32_m32(
X86Reg::eax, &base, nullptr, 1,
-(4 * (func_type.param_types.size() + 2 +
func_codes[imports_adjusted_func_index].locals.size() + 1)));

// push eax value onto stack
m_a.asm_push_r32(X86Reg::eax);
}
}

void visit_LocalGet(uint32_t localidx) {
X86Reg base = X86Reg::ebp;
int no_of_params =
(int)func_types[type_indices[cur_func_idx]].param_types.size();
if ((int)localidx < no_of_params) {
m_a.asm_mov_r32_m32(X86Reg::eax, &base, nullptr, 1,
(4 * localidx + 8));
m_a.asm_push_r32(X86Reg::eax);
} else {
m_a.asm_mov_r32_m32(X86Reg::eax, &base, nullptr, 1,
-(4 * ((int)localidx - no_of_params + 1)));
m_a.asm_push_r32(X86Reg::eax);
}
}
void visit_LocalSet(uint32_t localidx) {
X86Reg base = X86Reg::ebp;
int no_of_params =
(int)func_types[type_indices[cur_func_idx]].param_types.size();
if ((int)localidx < no_of_params) {
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_mov_m32_r32(&base, nullptr, 1, (4 * localidx + 8),
X86Reg::eax);
} else {
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_mov_m32_r32(&base, nullptr, 1,
-(4 * ((int)localidx - no_of_params + 1)),
X86Reg::eax);
}
}

void visit_I32Const(int32_t value) {
m_a.asm_push_imm32(value);
// if (value < 0) {
// m_a.asm_pop_r32(X86Reg::eax);
// m_a.asm_neg_r32(X86Reg::eax);
// m_a.asm_push_r32(X86Reg::eax);
// }
}

void visit_I32Add() {
m_a.asm_pop_r32(X86Reg::ebx);
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_add_r32_r32(X86Reg::eax, X86Reg::ebx);
m_a.asm_push_r32(X86Reg::eax);
}
void visit_I32Sub() {
m_a.asm_pop_r32(X86Reg::ebx);
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_sub_r32_r32(X86Reg::eax, X86Reg::ebx);
m_a.asm_push_r32(X86Reg::eax);
}
void visit_I32Mul() {
m_a.asm_pop_r32(X86Reg::ebx);
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_mul_r32(X86Reg::ebx);
m_a.asm_push_r32(X86Reg::eax);
}
void visit_I32DivS() {
m_a.asm_pop_r32(X86Reg::ebx);
m_a.asm_pop_r32(X86Reg::eax);
m_a.asm_div_r32(X86Reg::ebx);
m_a.asm_push_r32(X86Reg::eax);
}
};

} // namespace WASM_INSTS_VISITOR

Result<int> wasm_to_x86(Vec<uint8_t> &wasm_bytes, Allocator &al,
const std::string &filename, bool time_report,
diag::Diagnostics &diagnostics);
Expand Down