Fix platform specific code in libc_backing.c

Author: Others

code_benches/run.py

@@ -29,8 +29,6 @@
 IS_X86 = '86' in os.uname()[-1]
 IS_32_BIT_X86 = (not IS_64_BIT) and IS_X86
 
-# TODO: Add an option to output a CSV instead of human readable output
-
 # How many times should we run our benchmarks
 RUN_COUNT = 10
 ENABLE_DEBUG_SYMBOLS = True

runtime/libc/libc_backing.c

@@ -226,7 +226,7 @@ i32 wasm_stat(u32 path_str_offset, i32 stat_offset) {
             .st_blksize = stat.st_blksize,
             .st_blocks = stat.st_blocks,
         };
-
+#ifdef __APPLE__
         stat_ptr->st_atim.tv_sec = stat.st_atimespec.tv_sec;
         stat_ptr->st_atim.tv_nsec = stat.st_atimespec.tv_nsec;
 
@@ -235,6 +235,16 @@ i32 wasm_stat(u32 path_str_offset, i32 stat_offset) {
 
         stat_ptr->st_ctim.tv_sec = stat.st_ctimespec.tv_sec;
         stat_ptr->st_ctim.tv_nsec = stat.st_ctimespec.tv_nsec;
+#else
+        stat_ptr->st_atim.tv_sec = stat.st_atim.tv_sec;
+        stat_ptr->st_atim.tv_nsec = stat.st_atim.tv_nsec;
+
+        stat_ptr->st_mtim.tv_sec = stat.st_mtim.tv_sec;
+        stat_ptr->st_mtim.tv_nsec = stat.st_mtim.tv_nsec;
+
+        stat_ptr->st_ctim.tv_sec = stat.st_ctim.tv_sec;
+        stat_ptr->st_ctim.tv_nsec = stat.st_ctim.tv_nsec;
+#endif
     } else if (res == -1) {
         return -errno;
     }
@@ -261,6 +271,7 @@ i32 wasm_fstat(i32 filedes, i32 stat_offset) {
             .st_blksize = stat.st_blksize,
             .st_blocks = stat.st_blocks,
         };
+#ifdef __APPLE__
         stat_ptr->st_atim.tv_sec = stat.st_atimespec.tv_sec;
         stat_ptr->st_atim.tv_nsec = stat.st_atimespec.tv_nsec;
 
@@ -269,6 +280,16 @@ i32 wasm_fstat(i32 filedes, i32 stat_offset) {
 
         stat_ptr->st_ctim.tv_sec = stat.st_ctimespec.tv_sec;
         stat_ptr->st_ctim.tv_nsec = stat.st_ctimespec.tv_nsec;
+#else
+        stat_ptr->st_atim.tv_sec = stat.st_atim.tv_sec;
+        stat_ptr->st_atim.tv_nsec = stat.st_atim.tv_nsec;
+
+        stat_ptr->st_mtim.tv_sec = stat.st_mtim.tv_sec;
+        stat_ptr->st_mtim.tv_nsec = stat.st_mtim.tv_nsec;
+
+        stat_ptr->st_ctim.tv_sec = stat.st_ctim.tv_sec;
+        stat_ptr->st_ctim.tv_nsec = stat.st_ctim.tv_nsec;
+#endif
     } else if (res == -1) {
         return -errno;
     }
@@ -296,6 +317,7 @@ i32 wasm_lstat(i32 path_str_offset, i32 stat_offset) {
             .st_blksize = stat.st_blksize,
             .st_blocks = stat.st_blocks,
         };
+#ifdef __APPLE__
         stat_ptr->st_atim.tv_sec = stat.st_atimespec.tv_sec;
         stat_ptr->st_atim.tv_nsec = stat.st_atimespec.tv_nsec;
 
@@ -304,6 +326,16 @@ i32 wasm_lstat(i32 path_str_offset, i32 stat_offset) {
 
         stat_ptr->st_ctim.tv_sec = stat.st_ctimespec.tv_sec;
         stat_ptr->st_ctim.tv_nsec = stat.st_ctimespec.tv_nsec;
+#else
+        stat_ptr->st_atim.tv_sec = stat.st_atim.tv_sec;
+        stat_ptr->st_atim.tv_nsec = stat.st_atim.tv_nsec;
+
+        stat_ptr->st_mtim.tv_sec = stat.st_mtim.tv_sec;
+        stat_ptr->st_mtim.tv_nsec = stat.st_mtim.tv_nsec;
+
+        stat_ptr->st_ctim.tv_sec = stat.st_ctim.tv_sec;
+        stat_ptr->st_ctim.tv_nsec = stat.st_ctim.tv_nsec;
+#endif
     } else if (res == -1) {
         return -errno;
     }

runtime/runtime.c

@@ -193,9 +193,8 @@ int main(int argc, char* argv[]) {
     expand_memory();
     switch_into_runtime();
 
-    // FIXME: Should do a real bounds check here
     i32* array_ptr = get_memory_ptr_void(page_offset, argc * sizeof(i32));
-    int string_offset = page_offset + argc * sizeof(i32);
+    i32 string_offset = page_offset + argc * sizeof(i32);
     for (int i = 0; i < argc; i++) {
         size_t str_size = strlen(argv[i]) + 1;