* 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'.
This commit is contained in:
Yao Qi 2012-08-13 00:54:04 +00:00
parent f8cb18510f
commit 5cad973621
8 changed files with 12 additions and 46 deletions

View File

@ -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> 2012-08-10 Sergio Durigan Junior <sergiodj@redhat.com>
* linespec.c (find_methods): Remove unused variables `i1' and * linespec.c (find_methods): Remove unused variables `i1' and

View File

@ -10168,7 +10168,6 @@ watchpoint_exp_is_const (const struct expression *exp)
case OP_LAST: case OP_LAST:
case OP_COMPLEX: case OP_COMPLEX:
case OP_STRING: case OP_STRING:
case OP_BITSTRING:
case OP_ARRAY: case OP_ARRAY:
case OP_TYPE: case OP_TYPE:
case OP_TYPEOF: case OP_TYPEOF:

View File

@ -970,16 +970,6 @@ evaluate_subexp_standard (struct type *expect_type,
} }
return value_nsstring (exp->gdbarch, &exp->elts[pc + 2].string, tem + 1); 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: case OP_ARRAY:
(*pos) += 3; (*pos) += 3;
tem2 = longest_to_int (exp->elts[pc + 1].longconst); tem2 = longest_to_int (exp->elts[pc + 1].longconst);

View File

@ -210,13 +210,6 @@ print_subexp_standard (struct expression *exp, int *pos,
} }
return; 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 case OP_OBJC_NSSTRING: /* Objective-C Foundation Class
NSString constant. */ NSString constant. */
{ {
@ -1037,7 +1030,6 @@ dump_subexp_body_standard (struct expression *exp,
case OP_F77_UNDETERMINED_ARGLIST: case OP_F77_UNDETERMINED_ARGLIST:
case OP_COMPLEX: case OP_COMPLEX:
case OP_STRING: case OP_STRING:
case OP_BITSTRING:
case OP_BOOL: case OP_BOOL:
case OP_M2_STRING: case OP_M2_STRING:
case OP_THIS: case OP_THIS:

View File

@ -967,12 +967,6 @@ operator_length_standard (const struct expression *expr, int endpos,
oplen = 4 + BYTES_TO_EXP_ELEM (oplen + 1); oplen = 4 + BYTES_TO_EXP_ELEM (oplen + 1);
break; 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: case OP_ARRAY:
oplen = 4; oplen = 4;
args = longest_to_int (expr->elts[endpos - 2].longconst); args = longest_to_int (expr->elts[endpos - 2].longconst);

View File

@ -194,12 +194,6 @@ OP (OP_COMPLEX)
is executed. */ is executed. */
OP (OP_STRING) 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. /* OP_ARRAY creates an array constant out of the following subexpressions.
It is followed by two exp_elements, the first containing an integer 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 that is the lower bound of the array and the second containing another

View File

@ -1875,19 +1875,6 @@ value_string (char *ptr, int len, struct type *char_type)
return val; 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 /* 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 arguments of types T1. T1 is a list of NARGS arguments, and T2 is

View File

@ -591,8 +591,6 @@ extern struct value *value_cstring (char *ptr, int len,
struct type *char_type); struct type *char_type);
extern struct value *value_string (char *ptr, int len, extern struct value *value_string (char *ptr, int len,
struct type *char_type); 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, extern struct value *value_array (int lowbound, int highbound,
struct value **elemvec); struct value **elemvec);