diff options
| -rw-r--r-- | ffi.c | 64 |
1 files changed, 40 insertions, 24 deletions
@@ -2131,25 +2131,23 @@ static val ffi_wchar_rget(struct txr_ffi_type *tft, mem_t *src, val self) static void ffi_be_i16_rput(struct txr_ffi_type *tft, val n, mem_t *dst, val self) { - memset(dst, 0, 6); - ffi_be_i16_put(tft, n, dst + 6, self); + ffi_i16_rput(tft, n, dst, self); } static val ffi_be_i16_rget(struct txr_ffi_type *tft, mem_t *src, val self) { - return ffi_be_i16_get(tft, src + 6, self); + return ffi_i16_rget(tft, src, self); } static void ffi_be_u16_rput(struct txr_ffi_type *tft, val n, mem_t *dst, val self) { - memset(dst, 0, 6); - ffi_be_u16_put(tft, n, dst + 6, self); + ffi_u16_rput(tft, n, dst, self); } static val ffi_be_u16_rget(struct txr_ffi_type *tft, mem_t *src, val self) { - return ffi_be_u16_get(tft, src + 6, self); + return ffi_u16_rget(tft, src, self); } #endif @@ -2159,25 +2157,23 @@ static val ffi_be_u16_rget(struct txr_ffi_type *tft, mem_t *src, val self) static void ffi_be_i32_rput(struct txr_ffi_type *tft, val n, mem_t *dst, val self) { - memset(dst, 0, 4); - ffi_be_i32_put(tft, n, dst + 4, self); + ffi_i32_rput(tft, n, dst, self); } static val ffi_be_i32_rget(struct txr_ffi_type *tft, mem_t *src, val self) { - return ffi_be_i32_get(tft, src + 4, self); + return ffi_i32_rget(tft, src, self); } static void ffi_be_u32_rput(struct txr_ffi_type *tft, val n, mem_t *dst, val self) { - memset(dst, 0, 4); - ffi_be_u32_put(tft, n, dst + 4, self); + ffi_u32_rput(tft, n, dst, self); } static val ffi_be_u32_rget(struct txr_ffi_type *tft, mem_t *src, val self) { - return ffi_be_u32_get(tft, src + 4, self); + return ffi_u32_rget(tft, src, self); } #endif @@ -2187,25 +2183,35 @@ static val ffi_be_u32_rget(struct txr_ffi_type *tft, mem_t *src, val self) static void ffi_le_i16_rput(struct txr_ffi_type *tft, val n, mem_t *dst, val self) { - memset(dst, 0, 6); - ffi_le_i16_put(tft, n, dst + 6, self); + i16_t v = ffi_swap_i16(c_i16(n, self)); + (void) tft; + (void) self; + *coerce(ffi_arg *, dst) = v; } static val ffi_le_i16_rget(struct txr_ffi_type *tft, mem_t *src, val self) { - return ffi_le_i16_get(tft, src + 6, self); + i16_t n = ffi_swap_i16(*coerce(ffi_arg *, src)); + (void) tft; + (void) self; + return num_fast(n); } static void ffi_le_u16_rput(struct txr_ffi_type *tft, val n, mem_t *dst, val self) { - memset(dst, 0, 6); - ffi_le_u16_put(tft, n, dst + 6, self); + u16_t v = ffi_swap_u16(c_u16(n, self)); + (void) tft; + (void) self; + *coerce(ffi_arg *, dst) = v; } static val ffi_le_u16_rget(struct txr_ffi_type *tft, mem_t *src, val self) { - return ffi_le_u16_get(tft, src + 6, self); + u16_t n = ffi_swap_u16(*coerce(ffi_arg *, src)); + (void) tft; + (void) self; + return num_fast(n); } #endif @@ -2215,25 +2221,35 @@ static val ffi_le_u16_rget(struct txr_ffi_type *tft, mem_t *src, val self) static void ffi_le_i32_rput(struct txr_ffi_type *tft, val n, mem_t *dst, val self) { - memset(dst, 0, 4); - ffi_le_i32_put(tft, n, dst + 4, self); + i32_t v = ffi_swap_i32(c_i32(n, self)); + (void) tft; + (void) self; + *coerce(ffi_arg *, dst) = v; } static val ffi_le_i32_rget(struct txr_ffi_type *tft, mem_t *src, val self) { - return ffi_le_i32_get(tft, src + 4, self); + i32_t n = ffi_swap_i32(*coerce(ffi_arg *, src)); + (void) tft; + (void) self; + return num_fast(n); } static void ffi_le_u32_rput(struct txr_ffi_type *tft, val n, mem_t *dst, val self) { - memset(dst, 0, 4); - ffi_le_u32_put(tft, n, dst + 4, self); + u32_t v = ffi_swap_u32(c_u32(n, self)); + (void) tft; + (void) self; + *coerce(ffi_arg *, dst) = v; } static val ffi_le_u32_rget(struct txr_ffi_type *tft, mem_t *src, val self) { - return ffi_le_u32_get(tft, src + 4, self); + u32_t n = ffi_swap_u32(*coerce(ffi_arg *, src)); + (void) tft; + (void) self; + return num_fast(n); } #endif |