diff options
| -rw-r--r-- | gdb/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 1 | ||||
| -rw-r--r-- | gdb/eval.c | 10 | ||||
| -rw-r--r-- | gdb/expprint.c | 8 | ||||
| -rw-r--r-- | gdb/parse.c | 6 | ||||
| -rw-r--r-- | gdb/std-operator.def | 6 | ||||
| -rw-r--r-- | gdb/valops.c | 13 | ||||
| -rw-r--r-- | gdb/value.h | 2 |
8 files changed, 12 insertions, 46 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 81c03ee..662642a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2012-08-13 Yao Qi <yao@codesourcery.com> + + * std-operator.def: Remove OP_BITSTRING. + * breakpoint.c (watchpoint_exp_is_const): Update. + * eval.c (evaluate_subexp_standard): Remove handling to + OP_BITSTRING. + * expprint.c (print_subexp_standard): Likewise. + (dump_subexp_body_standard): Likewise. + * parse.c (operator_length_standard): Likewise. + * valops.c (value_bitstring): Remove. + * value.h: Remove the declaration of 'value_bitstring'. + 2012-08-10 Sergio Durigan Junior <sergiodj@redhat.com> * linespec.c (find_methods): Remove unused variables `i1' and diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index e38c54a..1ba923f 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -10168,7 +10168,6 @@ watchpoint_exp_is_const (const struct expression *exp) case OP_LAST: case OP_COMPLEX: case OP_STRING: - case OP_BITSTRING: case OP_ARRAY: case OP_TYPE: case OP_TYPEOF: @@ -970,16 +970,6 @@ evaluate_subexp_standard (struct type *expect_type, } return value_nsstring (exp->gdbarch, &exp->elts[pc + 2].string, tem + 1); - case OP_BITSTRING: - tem = longest_to_int (exp->elts[pc + 1].longconst); - (*pos) - += 3 + BYTES_TO_EXP_ELEM ((tem + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT); - if (noside == EVAL_SKIP) - goto nosideret; - return value_bitstring (&exp->elts[pc + 2].string, tem, - builtin_type (exp->gdbarch)->builtin_int); - break; - case OP_ARRAY: (*pos) += 3; tem2 = longest_to_int (exp->elts[pc + 1].longconst); diff --git a/gdb/expprint.c b/gdb/expprint.c index 779368b..c74c564 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -210,13 +210,6 @@ print_subexp_standard (struct expression *exp, int *pos, } return; - case OP_BITSTRING: - nargs = longest_to_int (exp->elts[pc + 1].longconst); - (*pos) - += 3 + BYTES_TO_EXP_ELEM ((nargs + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT); - fprintf_unfiltered (stream, "B'<unimplemented>'"); - return; - case OP_OBJC_NSSTRING: /* Objective-C Foundation Class NSString constant. */ { @@ -1037,7 +1030,6 @@ dump_subexp_body_standard (struct expression *exp, case OP_F77_UNDETERMINED_ARGLIST: case OP_COMPLEX: case OP_STRING: - case OP_BITSTRING: case OP_BOOL: case OP_M2_STRING: case OP_THIS: diff --git a/gdb/parse.c b/gdb/parse.c index d1ed4e8..d418aef 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -967,12 +967,6 @@ operator_length_standard (const struct expression *expr, int endpos, oplen = 4 + BYTES_TO_EXP_ELEM (oplen + 1); break; - case OP_BITSTRING: - oplen = longest_to_int (expr->elts[endpos - 2].longconst); - oplen = (oplen + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT; - oplen = 4 + BYTES_TO_EXP_ELEM (oplen); - break; - case OP_ARRAY: oplen = 4; args = longest_to_int (expr->elts[endpos - 2].longconst); diff --git a/gdb/std-operator.def b/gdb/std-operator.def index b013687..173dc1d 100644 --- a/gdb/std-operator.def +++ b/gdb/std-operator.def @@ -194,12 +194,6 @@ OP (OP_COMPLEX) is executed. */ OP (OP_STRING) -/* OP_BITSTRING represents a packed bitstring constant. - Its format is the same as that of a STRUCTOP, but the bitstring - data is just made into a bitstring constant when the operation - is executed. */ -OP (OP_BITSTRING) - /* OP_ARRAY creates an array constant out of the following subexpressions. It is followed by two exp_elements, the first containing an integer that is the lower bound of the array and the second containing another diff --git a/gdb/valops.c b/gdb/valops.c index 934f381..8167cd4 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -1875,19 +1875,6 @@ value_string (char *ptr, int len, struct type *char_type) return val; } -struct value * -value_bitstring (char *ptr, int len, struct type *index_type) -{ - struct value *val; - struct type *domain_type - = create_range_type (NULL, index_type, 0, len - 1); - struct type *type = create_set_type (NULL, domain_type); - - TYPE_CODE (type) = TYPE_CODE_BITSTRING; - val = allocate_value (type); - memcpy (value_contents_raw (val), ptr, TYPE_LENGTH (type)); - return val; -} /* See if we can pass arguments in T2 to a function which takes arguments of types T1. T1 is a list of NARGS arguments, and T2 is diff --git a/gdb/value.h b/gdb/value.h index d8b157f..cfdf085 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -591,8 +591,6 @@ extern struct value *value_cstring (char *ptr, int len, struct type *char_type); extern struct value *value_string (char *ptr, int len, struct type *char_type); -extern struct value *value_bitstring (char *ptr, int len, - struct type *index_type); extern struct value *value_array (int lowbound, int highbound, struct value **elemvec); |