hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

temporarily disable memory_impl

This commit is contained in:
Reuben Dunnington 2023-08-01 22:46:18 -07:00
parent f76817c1ed
commit 75f719441f
Signed by: rdunnington
GPG Key ID: 4EC5290E704FD482
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/memory_impl.c
View File

@ -10,61 +10,61 @@
void* wasm_memory_resize_callback(void* p, unsigned long size, void* userData) void* wasm_memory_resize_callback(void* p, unsigned long size, void* userData)
{ {
wasm_memory* memory = (wasm_memory*)userData; // wasm_memory* memory = (wasm_memory*)userData;
if(memory->committed >= size) // if(memory->committed >= size)
{ // {
return(memory->ptr); // return(memory->ptr);
} // }
else if(memory->committed < memory->reserved) // else if(memory->committed < memory->reserved)
{ // {
u32 commitSize = size - memory->committed; // u32 commitSize = size - memory->committed;
mem_base_allocator* allocator = mem_base_allocator_default(); // mem_base_allocator* allocator = mem_base_allocator_default();
mem_base_commit(allocator, memory->ptr + memory->committed, commitSize); // mem_base_commit(allocator, memory->ptr + memory->committed, commitSize);
memory->committed += commitSize; // memory->committed += commitSize;
return(memory->ptr); // return(memory->ptr);
} // }
else // else
{ // {
DEBUG_ASSERT(0, "Out of memory"); // DEBUG_ASSERT(0, "Out of memory");
return(0); // return(0);
} // }
return NULL; return NULL;
} }
void wasm_memory_free_callback(void* p, void* userData) void wasm_memory_free_callback(void* p, void* userData)
{ {
wasm_memory* memory = (wasm_memory*)userData; // wasm_memory* memory = (wasm_memory*)userData;
mem_base_allocator* allocator = mem_base_allocator_default(); // mem_base_allocator* allocator = mem_base_allocator_default();
mem_base_release(allocator, memory->ptr, memory->reserved); // mem_base_release(allocator, memory->ptr, memory->reserved);
memset(memory, 0, sizeof(wasm_memory)); // memset(memory, 0, sizeof(wasm_memory));
} }
extern u32 orca_mem_grow(u64 size) extern u32 orca_mem_grow(u64 size)
{ {
const size_t PAGE_SIZE = 65536; // const size_t PAGE_SIZE = 65536;
orca_runtime* runtime = orca_runtime_get(); // orca_runtime* runtime = orca_runtime_get();
wasm_memory* memory = &runtime->wasmMemory; // wasm_memory* memory = &runtime->wasmMemory;
size = AlignUpOnPow2(size, PAGE_SIZE); // size = AlignUpOnPow2(size, PAGE_SIZE);
u64 totalSize = size + m3_GetMemorySize(runtime->m3Runtime); // u64 totalSize = size + m3_GetMemorySize(runtime->m3Runtime);
u32 addr = memory->committed; // u32 addr = memory->committed;
//NOTE: call resize memory, which will call our custom resize callback... this is a bit involved because // //NOTE: call resize memory, which will call our custom resize callback... this is a bit involved because
// wasm3 doesn't allow resizing the memory directly // // wasm3 doesn't allow resizing the memory directly
M3Result res = ResizeMemory(runtime->m3Runtime, totalSize/PAGE_SIZE); // M3Result res = ResizeMemory(runtime->m3Runtime, totalSize/PAGE_SIZE);
return(addr); return(addr);
} }
void* wasm_memory_offset_to_ptr(wasm_memory* memory, u32 offset) void* wasm_memory_offset_to_ptr(wasm_memory* memory, u32 offset)
{ {
M3MemoryHeader* header = (M3MemoryHeader*)(memory->ptr); // M3MemoryHeader* header = (M3MemoryHeader*)(memory->ptr);
DEBUG_ASSERT(offset < header->length, "Wasm offset exceeds memory length") // DEBUG_ASSERT(offset < header->length, "Wasm offset exceeds memory length")
return memory->ptr + sizeof(M3MemoryHeader) + offset; // return memory->ptr + sizeof(M3MemoryHeader) + offset;
return NULL; return NULL;
} }