refactor: @Others move_instructions.patch, PR #26

Author: bushidocodes

runtime/libc/env.c

@@ -145,15 +145,3 @@ env_getcycles(void)
 
     #endif
 }
-
-// Floating point routines
-// TODO: Do a fair comparison between musl and wasm-musl
-INLINE double
-env_sin(double d) {
-    return sin(d);
-}
-
-INLINE double
-env_cos(double d) {
-    return cos(d);
-}

runtime/libc/wasmception_backing.c

@@ -627,3 +627,15 @@ void env___unmapself(u32 base, u32 size) {
     // Just do some no op
 }
 
+// Floating point routines
+// TODO: Do a fair comparison between musl and wasm-musl
+INLINE double
+env_sin(double d) {
+    return sin(d);
+}
+
+INLINE double
+env_cos(double d) {
+    return cos(d);
+}
+

runtime/runtime.c

@@ -207,27 +207,7 @@ INLINE double f64_copysign(double a, double b) {
     return copysign(a, b);
 }
 
-// Memory related instructions
-/* instruction_memory_size and instruction_memory_grow are identical in this 
- * translation unit and all of the runtime/memory translation units. This is
- * causing linking errors because multiple translation units are trying to
- * define the same global symbol. I've set these functions to static for a
- * temporary fix pending a discussion of possible refactors. */
-static i32 instruction_memory_size() {
-    return memory_size / WASM_PAGE_SIZE;
-}
-
-static i32 instruction_memory_grow(i32 count) {
-    i32 prev_size = instruction_memory_size();
-    for (int i = 0; i < count; i++) {
-        expand_memory();
-    }
-
-    return prev_size;
-}
-
-
-// We want to have some allocation logic
+// We want to have some allocation logic here, so we can use it to implement libc
 WEAK u32 wasmg___heap_base = 0;
 u32 runtime_heap_base;
 

runtime/runtime.h

@@ -113,6 +113,9 @@ INLINE double get_f64(u32 offset);
 INLINE void set_f32(u32 offset, float);
 INLINE void set_f64(u32 offset, double);
 
+i32 instruction_memory_size();
+i32 instruction_memory_grow();
+
 static inline void* get_memory_ptr_void(u32 offset, u32 bounds_check) {
     return (void*) get_memory_ptr_for_runtime(offset, bounds_check);
 }