From 5fa5ca40e67c3c4bfce116a70c3a88b52b718928 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 5 Jul 2014 23:43:00 +0300
Subject: [PATCH] binary: Factor out mp_binary_set_int().
---
py/binary.c | 34 ++++++++++++++++++----------------
py/binary.h | 1 +
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/py/binary.c b/py/binary.c
index a0af97208..3f1d7f286 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -177,6 +177,23 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte **ptr) {
}
}
+void mp_binary_set_int(uint val_sz, bool big_endian, byte *p, byte *val_ptr) {
+ int in_delta, out_delta;
+ if (big_endian) {
+ in_delta = -1;
+ out_delta = 1;
+ val_ptr += val_sz - 1;
+ } else {
+ in_delta = out_delta = 1;
+ }
+
+ for (uint i = val_sz; i > 0; i--) {
+ *p = *val_ptr;
+ p += out_delta;
+ val_ptr += in_delta;
+ }
+}
+
void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte **ptr) {
byte *p = *ptr;
uint align;
@@ -206,22 +223,7 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte **
val = mp_obj_get_int(val_in);
}
- int in_delta, out_delta;
- uint val_sz = MIN(size, sizeof(val));
- if (struct_type == '>') {
- in_delta = -1;
- out_delta = 1;
- in += val_sz - 1;
- } else {
- in_delta = out_delta = 1;
- }
-
- for (uint i = val_sz; i > 0; i--) {
- *p = *in;
- p += out_delta;
- in += in_delta;
- }
-
+ mp_binary_set_int(MIN(size, sizeof(val)), struct_type == '>', p, in);
}
void mp_binary_set_val_array(char typecode, void *p, int index, mp_obj_t val_in) {
diff --git a/py/binary.h b/py/binary.h
index f18f24020..74e66e288 100644
--- a/py/binary.h
+++ b/py/binary.h
@@ -35,3 +35,4 @@ void mp_binary_set_val_array_from_int(char typecode, void *p, int index, mp_int_
mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte **ptr);
void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte **ptr);
mp_int_t mp_binary_get_int(uint size, bool is_signed, bool big_endian, byte *p);
+void mp_binary_set_int(uint val_sz, bool big_endian, byte *p, byte *val_ptr);
--
GitLab