d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed problem with IN operator

Browse source
This commit is contained in:
ceriel 1993-11-16 16:31:27 +00:00
parent cc61337a9f
commit 0dde39aa63
1 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lang/m2/comp/code.c
View file

@ -647,16 +647,12 @@ CodeStd(nd)
} }
} }
RangeCheck(tpl, tpr) int
register t_type *tpl, *tpr; needs_rangecheck(tpl, tpr)
register t_type *tpl, *tpr;
{ {
/* Generate a range check if neccessary
*/
arith rlo, rhi; arith rlo, rhi;
if (options['R']) return;
if (bounded(tpl)) { if (bounded(tpl)) {
/* In this case we might need a range check. /* In this case we might need a range check.
If both types are restricted. check the bounds If both types are restricted. check the bounds
@ -668,9 +664,25 @@ RangeCheck(tpl, tpr)
if (bounded(tpr)) { if (bounded(tpr)) {
getbounds(tpr, &rlo, &rhi); getbounds(tpr, &rlo, &rhi);
if (in_range(rlo, tpl) && in_range(rhi, tpl)) { if (in_range(rlo, tpl) && in_range(rhi, tpl)) {
return; return 0;
} }
} }
return 1;
}
return 0;
}
RangeCheck(tpl, tpr)
register t_type *tpl, *tpr;
{
/* Generate a range check if neccessary
*/
arith rlo, rhi;
if (options['R']) return;
if (needs_rangecheck(tpl, tpr)) {
genrck(tpl); genrck(tpl);
return; return;
} }
@ -906,21 +918,39 @@ CodeOper(expr, true_label, false_label)
break; break;
} }
case IN: case IN: {
/* In this case, evaluate right hand side first! The /* In this case, evaluate right hand side first! The
INN instruction expects the bit number on top of the INN instruction expects the bit number on top of the
stack stack
*/ */
label l_toolarge = NO_LABEL;
CodePExpr(rightop); CodePExpr(rightop);
CodePExpr(leftop); CodePExpr(leftop);
C_loc(rightop->nd_type->set_low); C_loc(rightop->nd_type->set_low);
C_sbu(word_size); C_sbu(word_size);
if (needs_rangecheck(ElementType(rightop->nd_type), leftop->nd_type)) {
l_toolarge = ++text_label;
l_cont = ++text_label;
C_dup(word_size);
C_loc(rightop->nd_type->tp_size*8);
C_cmu(word_size);
C_zge(l_toolarge);
}
C_inn(rightop->nd_type->tp_size); C_inn(rightop->nd_type->tp_size);
if (true_label != NO_LABEL) { if (true_label != NO_LABEL) {
C_zne(true_label); C_zne(true_label);
C_bra(false_label); C_bra(false_label);
} }
if (l_toolarge != NO_LABEL) {
C_asp(word_size+rightop->nd_type->tp_size);
if (true_label != NO_LABEL) {
C_bra(false_label);
}
c_loc(0);
}
break; break;
}
case OR: case OR:
case AND: { case AND: {
label l_maybe = ++text_label, l_end = NO_LABEL; label l_maybe = ++text_label, l_end = NO_LABEL;