Use big int for integer type without max value

Signed-off-by: Siebren Weertman <[email protected]>

Author: Siebren Weertman

src/cbexigen/decoder_classes.py

@@ -365,6 +365,23 @@ def __get_content_decode_long_int(self, element_typename, detail: ElementGrammar
 
         return decode_content
 
+    def __get_content_decode_signed(self, element_typename, detail: ElementGrammarDetail, level):
+        type_value = f'{element_typename}->{detail.particle.name}'
+        next_grammar_id = detail.next_grammar
+
+        template_file = 'DecodeTypeSigned.jinja'
+        decode_comment = '// decode: signed'
+        if detail.particle.is_attribute:
+            decode_comment += ' (Attribute)'
+        temp = self.generator.get_template(template_file)
+        decode_content = temp.render(decode_comment=decode_comment,
+                                     type_value=type_value,
+                                     type_option=detail.particle.is_optional,
+                                     next_grammar_id=next_grammar_id,
+                                     indent=self.indent, level=level)
+
+        return decode_content
+
     def __get_content_decode_string(self, element_typename, detail: ElementGrammarDetail, level):
         decode_comment = '// decode: string (len, characters)'
         if detail.particle.is_attribute:
@@ -550,6 +567,8 @@ def __get_type_content(self, grammar: ElementGrammar, detail: ElementGrammarDeta
                 type_content = self.__get_content_decode_int(grammar.element_typename, detail, level)
             elif detail.particle.integer_base_type == 'uint64':
                 type_content = self.__get_content_decode_long_int(grammar.element_typename, detail, level)
+            elif detail.particle.integer_base_type == 'signed':
+                type_content = self.__get_content_decode_signed(grammar.element_typename, detail, level)
             else:
                 log_write_error(f"Unhandled numeric type: '{detail.particle.name}': "
                                 f"'{detail.particle.type_short}', " +

src/cbexigen/encoder_classes.py

@@ -282,6 +282,15 @@ def __get_content_encode_long_int(self, element_typename, detail: ElementGrammar
 
         return content
 
+    def __get_content_encode_signed(self, element_typename, detail, level):
+        value_parameter = f'{element_typename}->{detail.particle.name}'
+
+        temp = self.generator.get_template('EncodeTypeSigned.jinja')
+        content = temp.render(value_parameter=value_parameter,
+                              next_grammar=detail.next_grammar,
+                              indent=self.indent, level=level)
+        return content
+
     def __get_content_encode_string(self, element_typename, detail: ElementGrammarDetail, level):
         length_parameter = f'{element_typename}->{detail.particle.name}.{detail.particle.length_parameter_name}'
         value_parameter = f'{element_typename}->{detail.particle.name}.{detail.particle.value_parameter_name}'
@@ -420,6 +429,8 @@ def __get_type_content(self, grammar: ElementGrammar, detail: ElementGrammarDeta
                 type_content = self.__get_content_encode_int(grammar.element_typename, detail, level)
             elif detail.particle.integer_base_type == 'uint64':
                 type_content = self.__get_content_encode_long_int(grammar.element_typename, detail, level)
+            elif detail.particle.integer_base_type == 'signed':
+                type_content = self.__get_content_encode_signed(grammar.element_typename, detail, level)
             else:
                 log_write_error(f"Unhandled numeric type: '{detail.particle.name}': "
                                 f"'{detail.particle.type_short}', " +

src/cbexigen/tools.py

@@ -21,6 +21,7 @@
     'uint16': 'uint16_t',
     'uint32': 'uint32_t',
     'uint64': 'uint64_t',
+    'signed': 'exi_signed_t',
 }
 
 TYPE_TRANSLATION = {
@@ -29,7 +30,7 @@
     'byte': 'int8',
     'short': 'int16',
     'int': 'int32',
-    'integer': 'int32',
+    'integer': 'signed',
     'long': 'int64',
     'decimal': 'integer',  # FIXME special type
     'unsignedByte': 'uint8',

src/input/code_templates/c/decoder/DecodeTypeSigned.jinja

@@ -0,0 +1,9 @@
+{{ indent * level }}{{ decode_comment }}
+{{ indent * level }}error = exi_basetypes_decoder_signed(stream, &{{ type_value }});
+{{ indent * level }}if (error == 0)
+{{ indent * level }}{
+{%- if type_option == 1 %}
+{{ indent * (level + 1) }}{{ type_value }}_isUsed = 1u;
+{%- endif %}
+{{ indent * (level + 1) }}grammar_id = {{ next_grammar_id }};
+{{ indent * level }}}

src/input/code_templates/c/encoder/EncodeTypeSigned.jinja

@@ -0,0 +1,14 @@
+{{ indent * level }}error = exi_basetypes_encoder_nbit_uint(stream, 1, 0);
+{{ indent * level }}if (error == EXI_ERROR__NO_ERROR)
+{{ indent * level }}{
+{{ indent * (level + 1) }}error = exi_basetypes_encoder_signed(stream, &{{ value_parameter }});
+{{ indent * (level + 1) }}if (error == EXI_ERROR__NO_ERROR)
+{{ indent * (level + 1) }}{
+{{ indent * (level + 2) }}// encode END Element
+{{ indent * (level + 2) }}error = exi_basetypes_encoder_nbit_uint(stream, 1, 0);
+{{ indent * (level + 2) }}if (error == EXI_ERROR__NO_ERROR)
+{{ indent * (level + 2) }}{
+{{ indent * (level + 3) }}grammar_id = {{ next_grammar }};
+{{ indent * (level + 2) }}}
+{{ indent * (level + 1) }}}
+{{ indent * level }}}

src/input/code_templates/c/static_code/exi_basetypes.c.jinja

@@ -58,6 +58,26 @@ int exi_basetypes_convert_64_to_unsigned(exi_unsigned_t* exi_unsigned, uint64_t
     return (exi_unsigned->octets_count <= EXI_BASETYPES_UINT64_MAX_OCTETS) ? EXI_ERROR__NO_ERROR : EXI_ERROR__OCTET_COUNT_LARGER_THAN_TYPE_SUPPORTS;
 }
 
+int exi_basetypes_convert_to_signed(exi_signed_t* exi_signed, int32_t value, size_t max_octets)
+{
+    if (value < 0) {
+        exi_signed->is_negative = 1;
+        return exi_basetypes_convert_to_unsigned(&exi_signed->data, -value, max_octets);
+    }
+    exi_signed->is_negative = 0;
+    return exi_basetypes_convert_to_unsigned(&exi_signed->data, value, max_octets);
+}
+
+int exi_basetypes_convert_64_to_signed(exi_signed_t* exi_signed, int64_t value)
+{
+    if (value < 0) {
+        exi_signed->is_negative = 1;
+        return exi_basetypes_convert_64_to_unsigned(&exi_signed->data, -value);
+    }
+    exi_signed->is_negative = 0;
+    return exi_basetypes_convert_64_to_unsigned(&exi_signed->data, value);
+}
+
 int exi_basetypes_convert_from_unsigned(exi_unsigned_t* exi_unsigned, uint32_t* value, size_t max_octets)
 {
     if (exi_unsigned->octets_count > max_octets)
@@ -97,4 +117,20 @@ int exi_basetypes_convert_64_from_unsigned(exi_unsigned_t* exi_unsigned, uint64_
 
     return EXI_ERROR__NO_ERROR;
 }
+
+int exi_basetypes_convert_from_signed(exi_signed_t* exi_signed, int32_t* value, size_t max_octets)
+{
+    uint32_t uValue = 0;
+    int res = exi_basetypes_convert_from_unsigned(&exi_signed->data, &uValue, max_octets);
+    *value = (exi_signed->is_negative == 0) ? uValue : -uValue;
+    return res;
+}
+
+int exi_basetypes_convert_64_from_signed(exi_signed_t* exi_signed, int64_t* value)
+{
+    uint64_t uValue = 0;
+    int res = exi_basetypes_convert_64_from_unsigned(&exi_signed->data, &uValue);
+    *value = (exi_signed->is_negative == 0) ? uValue : -uValue;
+    return res;
+}
 {% endblock %}

src/input/code_templates/c/static_code/exi_basetypes.h.jinja

@@ -16,7 +16,7 @@
 #define EXI_STRING_MAX_LEN 64
 #define EXI_BYTE_ARRAY_MAX_LEN 350
 
-#define EXI_BASETYPES_MAX_OCTETS_SUPPORTED 10
+#define EXI_BASETYPES_MAX_OCTETS_SUPPORTED 20
 
 #define EXI_BASETYPES_OCTET_SEQ_FLAG_MASK 0x80
 #define EXI_BASETYPES_OCTET_SEQ_VALUE_MASK 0x7F
@@ -40,11 +40,23 @@ typedef struct
     size_t octets_count;
 } exi_unsigned_t;
 
+typedef struct exi_signed_t
+{
+    exi_unsigned_t data;
+    uint8_t is_negative : 1;
+} exi_signed_t;
+
 typedef char exi_character_t;
 
 int exi_basetypes_convert_to_unsigned(exi_unsigned_t* exi_unsigned, uint32_t value, size_t max_octets);
 int exi_basetypes_convert_64_to_unsigned(exi_unsigned_t* exi_unsigned, uint64_t value);
 
 int exi_basetypes_convert_from_unsigned(exi_unsigned_t* exi_unsigned, uint32_t* value, size_t max_octets);
 int exi_basetypes_convert_64_from_unsigned(exi_unsigned_t* exi_unsigned, uint64_t* value);
+
+int exi_basetypes_convert_to_signed(exi_signed_t* exi_signed, int32_t value, size_t max_octets);
+int exi_basetypes_convert_64_to_signed(exi_signed_t* exi_signed, int64_t value);
+
+int exi_basetypes_convert_from_signed(exi_signed_t* exi_unsigned, int32_t* value, size_t max_octets);
+int exi_basetypes_convert_64_from_signed(exi_signed_t* exi_unsigned, int64_t* value);
 {% endblock %}

src/input/code_templates/c/static_code/exi_basetypes_decoder.c.jinja

@@ -224,6 +224,11 @@ int exi_basetypes_decoder_uint_64(exi_bitstream_t* stream, uint64_t* value)
     return EXI_ERROR__NO_ERROR;
 }
 
+int exi_basetypes_decoder_unsigned(exi_bitstream_t* stream, exi_unsigned_t* value)
+{
+    return exi_basetypes_decoder_read_unsigned(stream, value);
+}
+
 /*****************************************************************************
  * interface functions - integer
  *****************************************************************************/
@@ -341,6 +346,22 @@ int exi_basetypes_decoder_integer_64(exi_bitstream_t* stream, int64_t* value)
     return error;
 }
 
+int exi_basetypes_decoder_signed(exi_bitstream_t* stream, exi_signed_t* value)
+{
+    int sign;
+    int error;
+
+    error = exi_basetypes_decoder_bool(stream, &sign);
+    if (error != EXI_ERROR__NO_ERROR)
+    {
+        return error;
+    }
+    value->is_negative = (sign == 0) ? 0 : 1;
+
+    error = exi_basetypes_decoder_unsigned(stream, &value->data);
+    return error;
+}
+
 /*****************************************************************************
  * interface functions - characters, string
  *****************************************************************************/

src/input/code_templates/c/static_code/exi_basetypes_decoder.h.jinja

@@ -62,6 +62,7 @@ int exi_basetypes_decoder_uint_8(exi_bitstream_t* stream, uint8_t* value);
 int exi_basetypes_decoder_uint_16(exi_bitstream_t* stream, uint16_t* value);
 int exi_basetypes_decoder_uint_32(exi_bitstream_t* stream, uint32_t* value);
 int exi_basetypes_decoder_uint_64(exi_bitstream_t* stream, uint64_t* value);
+int exi_basetypes_decoder_unsigned(exi_bitstream_t* stream, exi_unsigned_t* value);
 
 /**
  * \brief       decoder for type integer
@@ -79,6 +80,7 @@ int exi_basetypes_decoder_integer_8(exi_bitstream_t* stream, int8_t* value);
 int exi_basetypes_decoder_integer_16(exi_bitstream_t* stream, int16_t* value);
 int exi_basetypes_decoder_integer_32(exi_bitstream_t* stream, int32_t* value);
 int exi_basetypes_decoder_integer_64(exi_bitstream_t* stream, int64_t* value);
+int exi_basetypes_decoder_signed(exi_bitstream_t* stream, exi_signed_t* value);
 
 /**
  * \brief       decoder for type character array

src/input/code_templates/c/static_code/exi_basetypes_encoder.c.jinja

@@ -11,15 +11,15 @@
 /*****************************************************************************
  * local functions
  *****************************************************************************/
-static int exi_basetypes_encoder_write_unsigned(exi_bitstream_t* stream, exi_unsigned_t* exi_unsigned)
+static int exi_basetypes_encoder_write_unsigned(exi_bitstream_t* stream, const exi_unsigned_t* exi_unsigned)
 {
 {%- if add_debug_code == 1 %}
     if (stream->status_callback)
     {
         stream->status_callback(EXI_DEBUG__BASETYPES_ENCODE_UNSIGNED, 0, exi_unsigned->octets_count, 0);
     }
 {% endif %}
-    uint8_t* current_octet = exi_unsigned->octets;
+    const uint8_t* current_octet = exi_unsigned->octets;
 
     for (size_t n = 0; n < exi_unsigned->octets_count; n++)
     {
@@ -173,6 +173,11 @@ int exi_basetypes_encoder_uint_64(exi_bitstream_t* stream, uint64_t value)
     return exi_basetypes_encoder_write_unsigned(stream, &exi_unsigned);
 }
 
+int exi_basetypes_encoder_unsigned(exi_bitstream_t* stream, const exi_unsigned_t* value)
+{
+    return exi_basetypes_encoder_write_unsigned(stream, value);
+}
+
 /*****************************************************************************
  * interface functions - integer
  *****************************************************************************/
@@ -278,6 +283,19 @@ int exi_basetypes_encoder_integer_64(exi_bitstream_t* stream, int64_t value)
     return exi_basetypes_encoder_uint_64(stream, result);
 }
 
+int exi_basetypes_encoder_signed(exi_bitstream_t* stream, const exi_signed_t* value)
+{
+    int error;
+
+    error = exi_basetypes_encoder_bool(stream, value->is_negative);
+    if (error != EXI_ERROR__NO_ERROR)
+    {
+        return error;
+    }
+
+    return exi_basetypes_encoder_unsigned(stream, &value->data);
+}
+
 /*****************************************************************************
  * interface functions - characters, string
  *****************************************************************************/