OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jcf-write.c (generate_bytecode_conditional): Handle binops UNLT_EXPR, UNLE_EXPR, UNGT_EXPR, UNGE_EXPR, UNEQ_EXPR, and LTGT_EXPR.

Browse Source 
* jcf-write.c (generate_bytecode_conditional): Handle binops
	UNLT_EXPR, UNLE_EXPR, UNGT_EXPR, UNGE_EXPR, UNEQ_EXPR, and LTGT_EXPR.
	(generate_bytecode_insns): Likewise.

From-SVN: r82402
This commit is contained in:
Bryce McKinlay 2004-05-28 23:59:49 +00:00 committed by Bryce McKinlay
parent b3dd05b10a
commit 138c4fd484
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/java/ChangeLog
View File

@ -1,3 +1,9 @@
2004-05-28 Bryce McKinlay <mckinlay@redhat.com>
* jcf-write.c (generate_bytecode_conditional): Handle binops UNLT_EXPR, UNLE_EXPR,
UNGT_EXPR, UNGE_EXPR, UNEQ_EXPR, and LTGT_EXPR.
(generate_bytecode_insns): Likewise.
2004-05-28 Bryce McKinlay <mckinlay@redhat.com> 2004-05-28 Bryce McKinlay <mckinlay@redhat.com>
* check-init.c (check_init): Handle binops UNLT_EXPR, UNLE_EXPR, * check-init.c (check_init): Handle binops UNLT_EXPR, UNLE_EXPR,

35
gcc/java/jcf-write.c
View File

@ -1093,6 +1093,8 @@ generate_bytecode_conditional (tree exp,
tree exp0, exp1, type; tree exp0, exp1, type;
int save_SP = state->code_SP; int save_SP = state->code_SP;
enum java_opcode op, negop; enum java_opcode op, negop;
bool unordered = 0;
switch (TREE_CODE (exp)) switch (TREE_CODE (exp))
{ {
case INTEGER_CST: case INTEGER_CST:
@ -1164,25 +1166,52 @@ generate_bytecode_conditional (tree exp,
emit_goto (false_label, state); emit_goto (false_label, state);
} }
break; break;
case UNEQ_EXPR:
unordered = 1;
case EQ_EXPR: case EQ_EXPR:
op = OPCODE_if_icmpeq; op = OPCODE_if_icmpeq;
goto compare; goto compare;
case LTGT_EXPR:
unordered = 1;
case NE_EXPR: case NE_EXPR:
op = OPCODE_if_icmpne; op = OPCODE_if_icmpne;
goto compare; goto compare;
case UNLT_EXPR:
unordered = 1;
case GT_EXPR: case GT_EXPR:
op = OPCODE_if_icmpgt; op = OPCODE_if_icmpgt;
goto compare; goto compare;
case UNGT_EXPR:
unordered = 1;
case LT_EXPR: case LT_EXPR:
op = OPCODE_if_icmplt; op = OPCODE_if_icmplt;
goto compare; goto compare;
case UNLE_EXPR:
unordered = 1;
case GE_EXPR: case GE_EXPR:
op = OPCODE_if_icmpge; op = OPCODE_if_icmpge;
goto compare; goto compare;
case UNGE_EXPR:
unordered = 1;
case LE_EXPR: case LE_EXPR:
op = OPCODE_if_icmple; op = OPCODE_if_icmple;
goto compare; goto compare;
compare: compare:
if (unordered)
{
struct jcf_block *tmp = true_label;
true_label = false_label;
false_label = tmp;
true_branch_first = !true_branch_first;
}
exp0 = TREE_OPERAND (exp, 0); exp0 = TREE_OPERAND (exp, 0);
exp1 = TREE_OPERAND (exp, 1); exp1 = TREE_OPERAND (exp, 1);
type = TREE_TYPE (exp0); type = TREE_TYPE (exp0);
@ -1549,6 +1578,12 @@ generate_bytecode_insns (tree exp, int target, struct jcf_partial *state)
case LT_EXPR: case LT_EXPR:
case GE_EXPR: case GE_EXPR:
case LE_EXPR: case LE_EXPR:
case UNLT_EXPR:
case UNLE_EXPR:
case UNGT_EXPR:
case UNGE_EXPR:
case UNEQ_EXPR:
case LTGT_EXPR:
{ {
struct jcf_block *then_label = gen_jcf_label (state); struct jcf_block *then_label = gen_jcf_label (state);
struct jcf_block *else_label = gen_jcf_label (state); struct jcf_block *else_label = gen_jcf_label (state);