Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Split out eval_op_f_mod

Browse Source 
This splits BINOP_MOD into a new function for future use.

gdb/ChangeLog
2021-03-08  Tom Tromey  <tom@tromey.com>

	* f-lang.c (eval_op_f_mod): New function.
	(evaluate_subexp_f): Use it.
This commit is contained in:
Tom Tromey
2021-03-08 07:27:57 -07:00
parent cc05c68ee0
commit e08109f24b
2 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@@ -1,3 +1,8 @@
2021-03-08 Tom Tromey <tom@tromey.com>
* f-lang.c (eval_op_f_mod): New function.
(evaluate_subexp_f): Use it.
2021-03-08 Tom Tromey <tom@tromey.com> 2021-03-08 Tom Tromey <tom@tromey.com>
* f-lang.c (eval_op_f_abs): New function. * f-lang.c (eval_op_f_abs): New function.

68
gdb/f-lang.c
View File

@@ -1003,6 +1003,44 @@ eval_op_f_abs (struct type *expect_type, struct expression *exp,
error (_("ABS of type %s not supported"), TYPE_SAFE_NAME (type)); error (_("ABS of type %s not supported"), TYPE_SAFE_NAME (type));
} }
/* A helper function for BINOP_MOD. */
static struct value *
eval_op_f_mod (struct type *expect_type, struct expression *exp,
enum noside noside,
struct value *arg1, struct value *arg2)
{
if (noside == EVAL_SKIP)
return eval_skip_value (exp);
struct type *type = value_type (arg1);
if (type->code () != value_type (arg2)->code ())
error (_("non-matching types for parameters to MOD ()"));
switch (type->code ())
{
case TYPE_CODE_FLT:
{
double d1
= target_float_to_host_double (value_contents (arg1),
value_type (arg1));
double d2
= target_float_to_host_double (value_contents (arg2),
value_type (arg2));
double d3 = fmod (d1, d2);
return value_from_host_double (type, d3);
}
case TYPE_CODE_INT:
{
LONGEST v1 = value_as_long (arg1);
LONGEST v2 = value_as_long (arg2);
if (v2 == 0)
error (_("calling MOD (N, 0) is undefined"));
LONGEST v3 = v1 - (v1 / v2) * v2;
return value_from_longest (value_type (arg1), v3);
}
}
error (_("MOD of type %s not supported"), TYPE_SAFE_NAME (type));
}
/* Special expression evaluation cases for Fortran. */ /* Special expression evaluation cases for Fortran. */
static struct value * static struct value *
@@ -1031,35 +1069,7 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,
case BINOP_MOD: case BINOP_MOD:
arg1 = evaluate_subexp (nullptr, exp, pos, noside); arg1 = evaluate_subexp (nullptr, exp, pos, noside);
arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside); arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
if (noside == EVAL_SKIP) return eval_op_f_mod (expect_type, exp, noside, arg1, arg2);
return eval_skip_value (exp);
type = value_type (arg1);
if (type->code () != value_type (arg2)->code ())
error (_("non-matching types for parameters to MOD ()"));
switch (type->code ())
{
case TYPE_CODE_FLT:
{
double d1
= target_float_to_host_double (value_contents (arg1),
value_type (arg1));
double d2
= target_float_to_host_double (value_contents (arg2),
value_type (arg2));
double d3 = fmod (d1, d2);
return value_from_host_double (type, d3);
}
case TYPE_CODE_INT:
{
LONGEST v1 = value_as_long (arg1);
LONGEST v2 = value_as_long (arg2);
if (v2 == 0)
error (_("calling MOD (N, 0) is undefined"));
LONGEST v3 = v1 - (v1 / v2) * v2;
return value_from_longest (value_type (arg1), v3);
}
}
error (_("MOD of type %s not supported"), TYPE_SAFE_NAME (type));
case UNOP_FORTRAN_CEILING: case UNOP_FORTRAN_CEILING:
{ {