fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-12 08:31:21 +00:00
Code Issues Projects Releases Wiki Activity

Start implementing exception handling by adding frame descriptor entry processing.

Browse Source 
- Soon, we should be able basic exceptions.
This commit is contained in:
Lachlan Sneff
2019-03-02 10:56:02 -08:00
parent 87ddf4f855
commit 5760f6006a
7 changed files with 68 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/llvm-backend/cpp/object_loader.cpp
View File

@ -2,11 +2,15 @@
#include <iostream>
#include <memory>
extern "C" void __register_frame(uint8_t *);
extern "C" void __deregister_frame(uint8_t *);
struct MemoryManager : llvm::RuntimeDyld::MemoryManager {
public:
MemoryManager(callbacks_t callbacks) : callbacks(callbacks) {}
virtual ~MemoryManager() override {
deregisterEHFrames();
// Deallocate all of the allocated memory.
callbacks.dealloc_memory(code_section.base, code_section.size);
callbacks.dealloc_memory(read_section.base, read_section.size);
@ -62,12 +66,17 @@ public:
return true;
}
virtual void registerEHFrames(uint8_t* Addr, uint64_t LoadAddr, size_t Size) override {
std::cout << "should register eh frames" << std::endl;
virtual void registerEHFrames(uint8_t* addr, uint64_t LoadAddr, size_t size) override {
eh_frame_ptr = addr;
eh_frame_size = size;
eh_frames_registered = true;
callbacks.visit_fde(addr, size, __register_frame);
}
virtual void deregisterEHFrames() override {
std::cout << "should deregister eh frames" << std::endl;
if (eh_frames_registered) {
callbacks.visit_fde(eh_frame_ptr, eh_frame_size, __deregister_frame);
}
}
virtual bool finalizeMemory(std::string *ErrMsg = nullptr) override {
@ -111,6 +120,9 @@ private:
Section code_section, read_section, readwrite_section;
uintptr_t code_bump_ptr, read_bump_ptr, readwrite_bump_ptr;
uint8_t* eh_frame_ptr;
size_t eh_frame_size;
bool eh_frames_registered = false;
callbacks_t callbacks;
};
@ -154,7 +166,7 @@ WasmModule::WasmModule(
const uint8_t *object_start,
size_t object_size,
callbacks_t callbacks
) : memory_manager(new MemoryManager(callbacks))
) : memory_manager(std::unique_ptr<MemoryManager>(new MemoryManager(callbacks)))
{
object_file = llvm::cantFail(llvm::object::ObjectFile::createObjectFile(llvm::MemoryBufferRef(
llvm::StringRef((const char *)object_start, object_size), "object"

6
lib/llvm-backend/cpp/object_loader.hh
View File

@ -21,6 +21,8 @@ typedef result_t (*alloc_memory_t)(size_t size, mem_protect_t protect, uint8_t**
typedef result_t (*protect_memory_t)(uint8_t* ptr, size_t size, mem_protect_t protect);
typedef result_t (*dealloc_memory_t)(uint8_t* ptr, size_t size);
typedef uintptr_t (*lookup_vm_symbol_t)(const char* name_ptr, size_t length);
typedef void (*fde_visitor_t)(uint8_t *fde);
typedef result_t (*visit_fde_t)(uint8_t *fde, size_t size, fde_visitor_t visitor);
typedef struct {
/* Memory management. */
@ -29,6 +31,8 @@ typedef struct {
dealloc_memory_t dealloc_memory;
lookup_vm_symbol_t lookup_vm_symbol;
visit_fde_t visit_fde;
} callbacks_t;
class WasmModule {
@ -41,7 +45,7 @@ public:
void *get_func(llvm::StringRef name) const;
private:
llvm::RuntimeDyld::MemoryManager* memory_manager;
std::unique_ptr<llvm::RuntimeDyld::MemoryManager> memory_manager;
std::unique_ptr<llvm::object::ObjectFile> object_file;
std::unique_ptr<llvm::RuntimeDyld> runtime_dyld;
};