Handle mallocated->end

source/m3_env.c

@@ -206,9 +206,9 @@ M3Result  InitMemory  (IM3Runtime io_runtime, IM3Module i_module)
         M3Memory * memory = & io_runtime->memory;
         
         // TODO: allocate only required memory when Grow is implemented
-		size_t numPageBytes = 256 * c_m3MemPageSize; //i_module->memoryInfo.initPages * c_m3MemPageSize;
+		size_t numPageBytes = 256 * c_m3MemPageSize; //TODO: i_module->memoryInfo.initPages * c_m3MemPageSize;
         size_t numBytes = numPageBytes + sizeof (M3MemoryHeader);
-        
+
         memory->mallocated = (M3MemoryHeader *) m3Realloc (memory->mallocated, numBytes, 0);
 		
 		if (memory->mallocated)
@@ -217,7 +217,7 @@ M3Result  InitMemory  (IM3Runtime io_runtime, IM3Module i_module)
 			memory->maxPages = i_module->memoryInfo.maxPages;
 			memory->wasmPages = (u8 *) (memory->mallocated + 1);
 			
-			memory->mallocated->end = memory->wasmPages + numPageBytes;
+			memory->mallocated->end = memory->wasmPages + (memory->numPages * c_m3MemPageSize); //TODO: numPageBytes;
 			memory->mallocated->runtime = io_runtime;
 		}
 		else _throw (c_m3Err_mallocFailed);

source/m3_exec.c

@@ -129,6 +129,7 @@ d_m3OpDef  (MemGrow)
 	// FIX/FINISH (smassey): reallocation does need to occur here. and, op_Loop needs to refresh _mem arg from runtime
     // for now, grow memory virtually
     runtime->memory.numPages = requiredPages;
+    runtime->memory.mallocated->end = memory->wasmPages + (runtime->memory.numPages * c_m3MemPageSize);
 
 	/* m3ret_t r = ResizeMemory (& _mem, runtime, requiredPages);