vishapoberon/compiler
1
0
Fork 0
mirror of https://github.com/vishapoberon/compiler.git synced 2026-04-06 04:02:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set size testing and constant size propagation.

Browse source
This commit is contained in:
David Brown 2016-09-30 20:30:58 +01:00
parent 7238be5257
commit d344c9ce80
13 changed files with 126 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

26
bootstrap/windows-48/OPB.c
View file

@ -468,7 +468,7 @@ void OPB_In (OPT_Node *x, OPT_Node y)
} else if ((f == 4 && y->typ->form == 7)) {
if ((*x)->class == 7) {
k = (*x)->conval->intval;
if (k < 0 || k > (int64)OPM_MaxSet) {
if (k < 0 || k >= (int64)__ASHL(y->typ->size, 3)) {
OPB_err(202);
} else if (y->class == 7) {
(*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 64));
@ -584,7 +584,11 @@ void OPB_MOp (int8 op, OPT_Node *x)
} else if (__IN(f, 0x60, 32)) {
z->conval->realval = -z->conval->realval;
} else {
z->conval->setval = ~z->conval->setval;
if (z->typ->size == 8) {
z->conval->setval = ~z->conval->setval;
} else {
z->conval->setval = z->conval->setval ^ 0xffffffff;
}
}
z->obj = NIL;
} else {
@ -959,6 +963,7 @@ static void OPB_ConstOp (int16 op, OPT_Node x, OPT_Node y)
}
} else if (f == 7) {
xval->setval = (xval->setval & yval->setval);
OPB_SetSetType(x);
} else if (f != 0) {
OPB_err(101);
}
@ -983,6 +988,7 @@ static void OPB_ConstOp (int16 op, OPT_Node x, OPT_Node y)
}
} else if (f == 7) {
xval->setval = xval->setval ^ yval->setval;
OPB_SetSetType(x);
} else if (f != 0) {
OPB_err(102);
}
@ -1037,6 +1043,7 @@ static void OPB_ConstOp (int16 op, OPT_Node x, OPT_Node y)
}
} else if (f == 7) {
xval->setval = xval->setval | yval->setval;
OPB_SetSetType(x);
} else if (f != 0) {
OPB_err(105);
}
@ -1059,6 +1066,7 @@ static void OPB_ConstOp (int16 op, OPT_Node x, OPT_Node y)
}
} else if (f == 7) {
xval->setval = (xval->setval & ~yval->setval);
OPB_SetSetType(x);
} else if (f != 0) {
OPB_err(106);
}
@ -1514,19 +1522,20 @@ void OPB_SetRange (OPT_Node *x, OPT_Node y)
} else if (((*x)->typ->form == 4 && y->typ->form == 4)) {
if ((*x)->class == 7) {
k = (*x)->conval->intval;
if (0 > k || k > (int64)OPM_MaxSet) {
if (0 > k || k > 31) {
OPB_err(202);
}
}
if (y->class == 7) {
l = y->conval->intval;
if (0 > l || l > (int64)OPM_MaxSet) {
if (0 > l || l > 31) {
OPB_err(202);
}
}
if (((*x)->class == 7 && y->class == 7)) {
if (k <= l) {
(*x)->conval->setval = __SETRNG(k, l, 32);
OPB_SetSetType(*x);
} else {
OPB_err(201);
(*x)->conval->setval = __SETRNG(l, k, 32);
@ -1550,8 +1559,9 @@ void OPB_SetElem (OPT_Node *x)
OPB_err(93);
} else if ((*x)->class == 7) {
k = (*x)->conval->intval;
if ((0 <= k && k <= (int64)OPM_MaxSet)) {
if ((0 <= k && k <= 31)) {
(*x)->conval->setval = __SETOF(k,32);
OPB_SetSetType(*x);
} else {
OPB_err(202);
}
@ -1581,13 +1591,13 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode)
OPB_err(113);
}
break;
case 2: case 3: case 7:
case 2: case 3:
if (g != f) {
OPB_err(113);
}
break;
case 4:
if (g != 4 || x->size < y->size) {
case 4: case 7:
if (g != f || x->size < y->size) {
OPB_err(113);
}
break;

4
bootstrap/windows-48/OPC.c
View file

@ -1859,7 +1859,7 @@ void OPC_Len (OPT_Object obj, OPT_Struct array, int64 dim)
void OPC_Constant (OPT_Const con, int16 form)
{
int16 i;
uint32 s;
uint64 s;
int32 hex;
BOOLEAN skipLeading;
switch (form) {
@ -1891,7 +1891,7 @@ void OPC_Constant (OPT_Const con, int16 form)
do {
i -= 1;
hex = __ASHL(hex, 1);
if (__IN(i, s, 32)) {
if (__IN(i, s, 64)) {
hex += 1;
}
} while (!(__MASK(i, -8) == 0));