0
@@ -25,8 +25,8 @@ file 'runtime/platform.conf' => %w[Rakefile rakelib/platform.rake rakelib/struct
0
   timeval = StructGenerator.new
0
   timeval.include "sys/time.h"
0
   timeval.name 'struct timeval'
0
-  timeval.field :tv_sec, :long
0
-  timeval.field :tv_usec, :long
0
+  timeval.field :tv_sec, :time_t
0
+  timeval.field :tv_usec, :suseconds_t
0
   timeval.calculate
0
 
0
   sockaddr_in = StructGenerator.new

0
@@ -1005,8 +1005,22 @@ void ffi_call(STATE, cpu c, OBJECT ptr) {
0
   func();
0
 }
0
 
0
+typedef void (*nf_take_8)(uint8_t);
0
+typedef void (*nf_take_16)(uint16_t);
0
+typedef void (*nf_take_32)(uint32_t);
0
+typedef void (*nf_take_64)(uint64_t);
0
+
0
+typedef uint8_t (*nf_return_8)();
0
+typedef uint16_t (*nf_return_16)();
0
+typedef uint32_t (*nf_return_32)();
0
+typedef uint64_t (*nf_return_64)();
0
+
0
+typedef unsigned long (*nf_return_long)();
0
+typedef unsigned long long (*nf_return_ll)();
0
+typedef float (*nf_return_float)();
0
+typedef double (*nf_return_double)();
0
+
0
 OBJECT ffi_get_field(char *ptr, int offset, int type) {
0
-  nf_converter conv = (nf_converter)ffi_get_from_converter(type);
0
   int sz;
0
   rni_context *ctx = subtend_retrieve_context();
0
 
0
@@ -1015,20 +1029,28 @@ OBJECT ffi_get_field(char *ptr, int offset, int type) {
0
   sz = ffi_type_size(type);
0
 
0
   switch(sz) {
0
-  case 1:
0
-    (void)conv(*((uint8_t*)ptr));
0
+  case 1: {
0
+    nf_take_8 conv = (nf_take_8)ffi_get_from_converter(type);
0
+    conv(*((uint8_t*)ptr));
0
     break;
0
-  case 2:
0
-    (void)conv(*((uint16_t*)ptr));
0
+  }
0
+  case 2: {
0
+    nf_take_16 conv = (nf_take_16)ffi_get_from_converter(type);
0
+    conv(*((uint16_t*)ptr));
0
     break;
0
+  }
0
   default:
0
-  case 4:
0
-    (void)conv(*((uint32_t*)ptr));
0
+  case 4: {
0
+    nf_take_32 conv = (nf_take_32)ffi_get_from_converter(type);
0
+    conv(*((uint32_t*)ptr));
0
     break;
0
-  case 8:
0
-    (void)conv(*((uint64_t*)ptr));
0
+  }
0
+  case 8: {
0
+    nf_take_64 conv = (nf_take_64)ffi_get_from_converter(type);
0
+    conv(*((uint64_t*)ptr));
0
     break;
0
   }
0
+  }
0
 
0
   return cpu_stack_pop(ctx->state, ctx->cpu);
0
 }
0
@@ -1039,34 +1061,97 @@ void ffi_set_field(char *ptr, int offset, int type, OBJECT val) {
0
   uint8_t u8;
0
   uint16_t u16;
0
   uint32_t u32;
0
-  uint64_t u64;
0
 
0
   rni_context *ctx = subtend_retrieve_context();
0
-  nf_converter conv = (nf_converter)ffi_get_to_converter(type);
0
   sz = ffi_type_size(type);
0
 
0
   cpu_stack_push(ctx->state, ctx->cpu, val, FALSE);
0
 
0
   ptr += offset;
0
+    
0
+  switch(type) {
0
+  case FFI_TYPE_CHAR:
0
+  case FFI_TYPE_UCHAR: {
0
+    nf_return_8 conv = (nf_return_8)ffi_get_to_converter(type);
0
+    u8 = conv();
0
+    memcpy(ptr, &u8, sz);
0
+    break;
0
+  }
0
+  case FFI_TYPE_SHORT:
0
+  case FFI_TYPE_USHORT: {
0
+    nf_return_16 conv = (nf_return_16)ffi_get_to_converter(type);
0
+    u16 = conv();
0
+    memcpy(ptr, &u16, sz);
0
+    break;
0
+  }
0
+  case FFI_TYPE_INT:
0
+  case FFI_TYPE_UINT: {
0
+    nf_return_32 conv = (nf_return_32)ffi_get_to_converter(type);
0
+    u32 = conv();
0
+    memcpy(ptr, &u32, sz);
0
+    break;
0
+  }
0
+  case FFI_TYPE_LL:
0
+  case FFI_TYPE_ULL: {
0
+    nf_return_ll conv = (nf_return_ll)ffi_get_to_converter(type);
0
+    unsigned long long v = conv();
0
+    memcpy(ptr, &v, sizeof(long long));
0
+    break;
0
+  }
0
+  default:
0
+  case FFI_TYPE_OBJECT:
0
+  case FFI_TYPE_PTR:
0
+  case FFI_TYPE_STRING:
0
+  case FFI_TYPE_STATE:
0
+  case FFI_TYPE_LONG:
0
+  case FFI_TYPE_ULONG: {
0
+    nf_return_long conv = (nf_return_long)ffi_get_to_converter(type);
0
+    long v = conv();
0
+    memcpy(ptr, &v, sizeof(long));
0
+    break;
0
+  }
0
+  case FFI_TYPE_FLOAT: {
0
+    nf_return_float conv = (nf_return_float)ffi_get_to_converter(type);
0
+    float v = conv();
0
+    memcpy(ptr, &v, sizeof(float));
0
+    break;
0
+  }
0
+  case FFI_TYPE_DOUBLE: {
0
+    nf_return_double conv = (nf_return_double)ffi_get_to_converter(type);
0
+    double v = conv();
0
+    memcpy(ptr, &v, sizeof(double));
0
+    break;
0
+  }
0
+  }
0
 
0
+  /*
0
   switch(sz) {
0
-  case 1:
0
-    u8 = (uint8_t)conv();
0
+  case 1: {
0
+    nf_return_8 conv = (nf_return_8)ffi_get_from_converter(type);
0
+    u8 = conv();
0
     memcpy(ptr, &u8, sz);
0
     break;
0
-  case 2:
0
-    u16 = (uint16_t)conv();
0
+  }
0
+  case 2: {
0
+    nf_return_16 conv = (nf_return_16)ffi_get_from_converter(type);
0
+    u16 = conv();
0
     memcpy(ptr, &u16, sz);
0
     break;
0
+  }
0
   default:
0
-  case 4:
0
-    u32 = (uint32_t)conv();
0
+  case 4: {
0
+    nf_return_32 conv = (nf_return_32)ffi_get_from_converter(type);
0
+    u32 = conv();
0
     memcpy(ptr, &u32, sz);
0
     break;
0
-  case 8:
0
-    u64 = (uint64_t)conv();
0
+  }
0
+  case 8: {
0
+    nf_return_64 conv = (nf_return_64)ffi_get_from_converter(type);
0
+    u64 = conv();
0
     memcpy(ptr, &u64, sz);
0
     break;
0
-
0
   }
0
+  }
0
+
0
+  */
0
 }