Skip to content

A
asn1c
Commit 63b4126c authored by Lev Walkin's avatar Lev Walkin
Browse files
Options

C90-compliant negative LONG_MIN

parent b9671d1d
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 31 deletions
libasn1compiler/asn1c_C.c
View file @ 63b4126c
...@@ -1859,8 +1859,7 @@ emit_single_member_PER_constraint(arg_t *arg, asn1cnst_range_t *range, int alpha ...@@ -1859,8 +1859,7 @@ emit_single_member_PER_constraint(arg_t *arg, asn1cnst_range_t *range, int alpha
if(lv > 0x7fffffff) { lv = 0x7fffffff; gcmt++; } if(lv > 0x7fffffff) { lv = 0x7fffffff; gcmt++; }
if(rv > 0x7fffffff) { rv = 0x7fffffff; gcmt++; } if(rv > 0x7fffffff) { rv = 0x7fffffff; gcmt++; }
if(gcmt) { if(gcmt) {
OUT("% " PRIdASN ", % " PRIdASN " }", OINTS(lv); OUT(", "); OINTS(rv); OUT(" }");
lv, rv);
goto pcmt; goto pcmt;
} }
} }
...@@ -1872,8 +1871,8 @@ emit_single_member_PER_constraint(arg_t *arg, asn1cnst_range_t *range, int alpha ...@@ -1872,8 +1871,8 @@ emit_single_member_PER_constraint(arg_t *arg, asn1cnst_range_t *range, int alpha
OUT("{ APC_SEMI_CONSTRAINED,\t-1, -1, "); OUT("{ APC_SEMI_CONSTRAINED,\t-1, -1, ");
} }
} }
OUT("% " PRIdASN ", % " PRIdASN " }", OINTS(range->left.value); OUT(", ");
range->left.value, range->right.value); OINTS(range->right.value); OUT(" }");
} else { } else {
OUT("{ APC_UNCONSTRAINED,\t-1, -1, 0, 0 }"); OUT("{ APC_UNCONSTRAINED,\t-1, -1, 0, 0 }");
} }
...@@ -2129,12 +2128,14 @@ try_inline_default(arg_t *arg, asn1p_expr_t *expr, int out) { ...@@ -2129,12 +2128,14 @@ try_inline_default(arg_t *arg, asn1p_expr_t *expr, int out) {
OUT("/* Install default value %" PRIdASN " */\n", OUT("/* Install default value %" PRIdASN " */\n",
expr->marker.default_value->value.v_integer); expr->marker.default_value->value.v_integer);
if(fits_long) { if(fits_long) {
OUT("*st = %" PRIdASN ";\n", OUT("*st = ");
expr->marker.default_value->value.v_integer); OINT(expr->marker.default_value->value.v_integer);
OUT(";\n");
OUT("return 0;\n"); OUT("return 0;\n");
} else { } else {
OUT("return asn_long2INTEGER(st, %" PRIdASN ");\n", OUT("return asn_long2INTEGER(st, ");
expr->marker.default_value->value.v_integer); OINT(expr->marker.default_value->value.v_integer);
OUT(");\n");
} }
INDENT(-1); INDENT(-1);
OUT("} else {\n"); OUT("} else {\n");
......
libasn1compiler/asn1c_constraint.c
View file @ 63b4126c
...@@ -495,20 +495,20 @@ emit_range_comparison_code(arg_t *arg, asn1cnst_range_t *range, const char *varn ...@@ -495,20 +495,20 @@ emit_range_comparison_code(arg_t *arg, asn1cnst_range_t *range, const char *varn
} }
if(ignore_left) { if(ignore_left) {
OUT("%s <= %" PRIdASN, varname, OUT("%s <= ", varname);
r->right.value); OINT(r->right.value);
} else if(ignore_right) { } else if(ignore_right) {
OUT("%s >= %" PRIdASN, varname, OUT("%s >= ", varname);
r->left.value); OINT(r->left.value);
} else if(r->left.value == r->right.value) { } else if(r->left.value == r->right.value) {
OUT("%s == %" PRIdASN, varname, OUT("%s == ", varname);
r->right.value); OINT(r->right.value);
} else { } else {
OUT("%s >= %" PRIdASN " && %s <= %" PRIdASN, OUT("%s >= ", varname);
varname, OINT(r->left.value);
r->left.value, OUT(" && ");
varname, OUT("%s <= ", varname);
r->right.value); OINT(r->right.value);
} }
if(r != range) OUT(")"); if(r != range) OUT(")");
generated_something = 1; generated_something = 1;
......
libasn1compiler/asn1c_out.h
View file @ 63b4126c
...@@ -108,4 +108,21 @@ int asn1c_compiled_output(arg_t *arg, const char *fmt, ...); ...@@ -108,4 +108,21 @@ int asn1c_compiled_output(arg_t *arg, const char *fmt, ...);
REDIR(saved_target); \ REDIR(saved_target); \
} while(0) } while(0)
/*
* Format LONG_MIN according to C90 rules.
*/
#define OINT(iv) do { \
if(iv == (-2147483647L - 1)) \
OUT("(-2147483647L - 1)"); \
else \
OUT("%" PRIdASN, iv); \
} while(0)
#define OINTS(iv) do { \
if(iv == (-2147483647L - 1)) \
OUT("(-2147483647L - 1)"); \
else \
OUT("% " PRIdASN, iv); \
} while(0)
#endif /* _ASN1_COMPILED_OUTPUT_H_ */ #endif /* _ASN1_COMPILED_OUTPUT_H_ */
tests/90-cond-int-type-OK.asn1.-P
View file @ 63b4126c
...@@ -1754,7 +1754,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -1754,7 +1754,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
value = *(const long *)sptr; value = *(const long *)sptr;
if((value >= -2147483648 && value <= 2147483647)) { if((value >= (-2147483647L - 1) && value <= 2147483647)) {
/* Constraint check succeeded */ /* Constraint check succeeded */
return 0; return 0;
} else { } else {
...@@ -1895,7 +1895,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -1895,7 +1895,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
value = *(const long *)sptr; value = *(const long *)sptr;
if(((value == -2147483648) || (value == 2147483647))) { if(((value == (-2147483647L - 1)) || (value == 2147483647))) {
/* Constraint check succeeded */ /* Constraint check succeeded */
return 0; return 0;
} else { } else {
...@@ -2042,7 +2042,7 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -2042,7 +2042,7 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
return -1; return -1;
} }
if(((value == -2147483648) || (value == 2147483647))) { if(((value == (-2147483647L - 1)) || (value == 2147483647))) {
/* Constraint check succeeded */ /* Constraint check succeeded */
return 0; return 0;
} else { } else {
......
tests/90-cond-int-type-OK.asn1.-Pfnative-types
View file @ 63b4126c
...@@ -1741,7 +1741,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -1741,7 +1741,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
value = *(const long *)sptr; value = *(const long *)sptr;
if((value >= -2147483648 && value <= 2147483647)) { if((value >= (-2147483647L - 1) && value <= 2147483647)) {
/* Constraint check succeeded */ /* Constraint check succeeded */
return 0; return 0;
} else { } else {
...@@ -1882,7 +1882,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -1882,7 +1882,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
value = *(const long *)sptr; value = *(const long *)sptr;
if(((value == -2147483648) || (value == 2147483647))) { if(((value == (-2147483647L - 1)) || (value == 2147483647))) {
/* Constraint check succeeded */ /* Constraint check succeeded */
return 0; return 0;
} else { } else {
...@@ -2023,7 +2023,7 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -2023,7 +2023,7 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
value = *(const long *)sptr; value = *(const long *)sptr;
if(((value == -2147483648) || (value == 2147483647))) { if(((value == (-2147483647L - 1)) || (value == 2147483647))) {
/* Constraint check succeeded */ /* Constraint check succeeded */
return 0; return 0;
} else { } else {
......
tests/90-cond-int-type-OK.asn1.-Pgen-PER
View file @ 63b4126c
...@@ -2060,7 +2060,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -2060,7 +2060,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
value = *(const long *)sptr; value = *(const long *)sptr;
if((value >= -2147483648 && value <= 2147483647)) { if((value >= (-2147483647L - 1) && value <= 2147483647)) {
/* Constraint check succeeded */ /* Constraint check succeeded */
return 0; return 0;
} else { } else {
...@@ -2155,7 +2155,7 @@ OK_IntegerInRange3_encode_uper(asn_TYPE_descriptor_t *td, ...@@ -2155,7 +2155,7 @@ OK_IntegerInRange3_encode_uper(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [OK-IntegerInRange3] >>> ***/ /*** <<< CTDEFS [OK-IntegerInRange3] >>> ***/
static asn_per_constraints_t asn_PER_type_OK_IntegerInRange3_constr_1 = { static asn_per_constraints_t asn_PER_type_OK_IntegerInRange3_constr_1 = {
{ APC_CONSTRAINED, 32, -1, -2147483648, 2147483647 } /* (-2147483648..2147483647) */, { APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */ 0, 0 /* No PER value map */
}; };
...@@ -2227,7 +2227,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -2227,7 +2227,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
value = *(const long *)sptr; value = *(const long *)sptr;
if(((value == -2147483648) || (value == 2147483647))) { if(((value == (-2147483647L - 1)) || (value == 2147483647))) {
/* Constraint check succeeded */ /* Constraint check succeeded */
return 0; return 0;
} else { } else {
...@@ -2322,7 +2322,7 @@ OK_IntegerInRange4_encode_uper(asn_TYPE_descriptor_t *td, ...@@ -2322,7 +2322,7 @@ OK_IntegerInRange4_encode_uper(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [OK-IntegerInRange4] >>> ***/ /*** <<< CTDEFS [OK-IntegerInRange4] >>> ***/
static asn_per_constraints_t asn_PER_type_OK_IntegerInRange4_constr_1 = { static asn_per_constraints_t asn_PER_type_OK_IntegerInRange4_constr_1 = {
{ APC_CONSTRAINED, 32, -1, -2147483648, 2147483647 } /* (-2147483648..2147483647) */, { APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */ 0, 0 /* No PER value map */
}; };
...@@ -2400,7 +2400,7 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -2400,7 +2400,7 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
return -1; return -1;
} }
if(((value == -2147483648) || (value == 2147483647))) { if(((value == (-2147483647L - 1)) || (value == 2147483647))) {
/* Constraint check succeeded */ /* Constraint check succeeded */
return 0; return 0;
} else { } else {
...@@ -2495,7 +2495,7 @@ OK_IntegerInRange5_encode_uper(asn_TYPE_descriptor_t *td, ...@@ -2495,7 +2495,7 @@ OK_IntegerInRange5_encode_uper(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [OK-IntegerInRange5] >>> ***/ /*** <<< CTDEFS [OK-IntegerInRange5] >>> ***/
static asn_per_constraints_t asn_PER_type_OK_IntegerInRange5_constr_1 = { static asn_per_constraints_t asn_PER_type_OK_IntegerInRange5_constr_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 32, -1, -2147483648, 2147483647 } /* (-2147483648..2147483647,...) */, { APC_CONSTRAINED | APC_EXTENSIBLE, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */ 0, 0 /* No PER value map */
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment