mirror of
https://github.com/vishapoberon/compiler.git
synced 2026-04-06 04:02:25 +00:00
More LONGINTS changed to Address. Remove special FetchAddress code in Heap.
This commit is contained in:
David Brown
parent
f13130bbd3
commit
7efd5a0158
201 changed files with 1227 additions and 1132 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 1.95 [2016/09/12] for gcc LP64 on cygwin xtspkaSfF */
|
||||
/* voc 1.95 [2016/09/14] for gcc LP64 on cygwin xtspkaSfF */
|
||||
|
||||
#define INTEGER int32
|
||||
#define LONGINT int64
|
||||
|
|
@ -345,7 +345,7 @@ void OPB_Index (OPT_Node *x, OPT_Node y)
|
|||
f = y->typ->form;
|
||||
if ((*x)->class >= 7) {
|
||||
OPB_err(79);
|
||||
} else if (f != 4 || __IN(y->class, 0x0300)) {
|
||||
} else if (f != 4 || __IN(y->class, 0x0300, 64)) {
|
||||
OPB_err(80);
|
||||
y->typ = OPT_inttyp;
|
||||
}
|
||||
|
|
@ -372,7 +372,7 @@ void OPB_Field (OPT_Node *x, OPT_Object y)
|
|||
if ((*x)->class >= 7) {
|
||||
OPB_err(77);
|
||||
}
|
||||
if ((y != NIL && __IN(y->mode, 0x2010))) {
|
||||
if ((y != NIL && __IN(y->mode, 0x2010, 64))) {
|
||||
OPB_BindNodes(2, y->typ, &*x, NIL);
|
||||
(*x)->obj = y;
|
||||
(*x)->readonly = (*x)->left->readonly || (y->vis == 2 && y->mnolev < 0);
|
||||
|
|
@ -476,7 +476,7 @@ void OPB_In (OPT_Node *x, OPT_Node y)
|
|||
if (k < 0 || k > (int64)OPM_MaxSet) {
|
||||
OPB_err(202);
|
||||
} else if (y->class == 7) {
|
||||
(*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval));
|
||||
(*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 64));
|
||||
(*x)->obj = NIL;
|
||||
} else {
|
||||
OPB_BindNodes(12, OPT_booltyp, &*x, y);
|
||||
|
|
@ -572,12 +572,12 @@ void OPB_MOp (int8 op, OPT_Node *x)
|
|||
}
|
||||
break;
|
||||
case 6:
|
||||
if (!__IN(f, 0x70)) {
|
||||
if (!__IN(f, 0x70, 64)) {
|
||||
OPB_err(96);
|
||||
}
|
||||
break;
|
||||
case 7:
|
||||
if (__IN(f, 0xf0)) {
|
||||
if (__IN(f, 0xf0, 64)) {
|
||||
if (z->class == 7) {
|
||||
if (f == 4) {
|
||||
if (z->conval->intval == (-9223372036854775807-1)) {
|
||||
|
|
@ -586,7 +586,7 @@ void OPB_MOp (int8 op, OPT_Node *x)
|
|||
z->conval->intval = -z->conval->intval;
|
||||
OPB_SetIntType(z);
|
||||
}
|
||||
} else if (__IN(f, 0x60)) {
|
||||
} else if (__IN(f, 0x60, 64)) {
|
||||
z->conval->realval = -z->conval->realval;
|
||||
} else {
|
||||
z->conval->setval = ~z->conval->setval;
|
||||
|
|
@ -600,7 +600,7 @@ void OPB_MOp (int8 op, OPT_Node *x)
|
|||
}
|
||||
break;
|
||||
case 21:
|
||||
if (__IN(f, 0x70)) {
|
||||
if (__IN(f, 0x70, 64)) {
|
||||
if (z->class == 7) {
|
||||
if (f == 4) {
|
||||
if (z->conval->intval == (-9223372036854775807-1)) {
|
||||
|
|
@ -747,7 +747,7 @@ void OPB_CheckParameters (OPT_Object fp, OPT_Object ap, BOOLEAN checkNames)
|
|||
|
||||
static void OPB_CheckProc (OPT_Struct x, OPT_Object y)
|
||||
{
|
||||
if (__IN(y->mode, 0x04c0)) {
|
||||
if (__IN(y->mode, 0x04c0, 64)) {
|
||||
if (y->mode == 6) {
|
||||
if (y->mnolev == 0) {
|
||||
y->mode = 7;
|
||||
|
|
@ -923,7 +923,7 @@ static void OPB_ConstOp (int32 op, OPT_Node x, OPT_Node y)
|
|||
}
|
||||
break;
|
||||
case 9:
|
||||
if (!__IN(g, 0x1800)) {
|
||||
if (!__IN(g, 0x1800, 64)) {
|
||||
OPB_err(100);
|
||||
}
|
||||
break;
|
||||
|
|
@ -954,7 +954,7 @@ static void OPB_ConstOp (int32 op, OPT_Node x, OPT_Node y)
|
|||
} else {
|
||||
OPB_err(204);
|
||||
}
|
||||
} else if (__IN(f, 0x60)) {
|
||||
} else if (__IN(f, 0x60, 64)) {
|
||||
temp = __ABS(yval->realval) <= (LONGREAL)1;
|
||||
if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 / (LONGREAL)__ABS(yval->realval)) {
|
||||
xval->realval = xval->realval * yval->realval;
|
||||
|
|
@ -978,7 +978,7 @@ static void OPB_ConstOp (int32 op, OPT_Node x, OPT_Node y)
|
|||
xval->realval = (LONGREAL)1;
|
||||
}
|
||||
x->typ = OPT_realtyp;
|
||||
} else if (__IN(f, 0x60)) {
|
||||
} else if (__IN(f, 0x60, 64)) {
|
||||
temp = __ABS(yval->realval) >= (LONGREAL)1;
|
||||
if (temp || __ABS(xval->realval) <= 1.79769296342094e+308 * __ABS(yval->realval)) {
|
||||
xval->realval = xval->realval / yval->realval;
|
||||
|
|
@ -1032,7 +1032,7 @@ static void OPB_ConstOp (int32 op, OPT_Node x, OPT_Node y)
|
|||
} else {
|
||||
OPB_err(206);
|
||||
}
|
||||
} else if (__IN(f, 0x60)) {
|
||||
} else if (__IN(f, 0x60, 64)) {
|
||||
temp = (yval->realval >= (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 - yval->realval);
|
||||
if (temp || (yval->realval < (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 - yval->realval)) {
|
||||
xval->realval = xval->realval + yval->realval;
|
||||
|
|
@ -1054,7 +1054,7 @@ static void OPB_ConstOp (int32 op, OPT_Node x, OPT_Node y)
|
|||
} else {
|
||||
OPB_err(207);
|
||||
}
|
||||
} else if (__IN(f, 0x60)) {
|
||||
} else if (__IN(f, 0x60, 64)) {
|
||||
temp = (yval->realval >= (LONGREAL)0 && xval->realval >= -1.79769296342094e+308 + yval->realval);
|
||||
if (temp || (yval->realval < (LONGREAL)0 && xval->realval <= 1.79769296342094e+308 + yval->realval)) {
|
||||
xval->realval = xval->realval - yval->realval;
|
||||
|
|
@ -1082,28 +1082,28 @@ static void OPB_ConstOp (int32 op, OPT_Node x, OPT_Node y)
|
|||
xval->intval = OPB_BoolToInt(ConstCmp__14() != 9);
|
||||
break;
|
||||
case 11:
|
||||
if (__IN(f, 0x0a84)) {
|
||||
if (__IN(f, 0x0a84, 64)) {
|
||||
OPB_err(108);
|
||||
} else {
|
||||
xval->intval = OPB_BoolToInt(ConstCmp__14() == 11);
|
||||
}
|
||||
break;
|
||||
case 12:
|
||||
if (__IN(f, 0x0a84)) {
|
||||
if (__IN(f, 0x0a84, 64)) {
|
||||
OPB_err(108);
|
||||
} else {
|
||||
xval->intval = OPB_BoolToInt(ConstCmp__14() != 13);
|
||||
}
|
||||
break;
|
||||
case 13:
|
||||
if (__IN(f, 0x0a84)) {
|
||||
if (__IN(f, 0x0a84, 64)) {
|
||||
OPB_err(108);
|
||||
} else {
|
||||
xval->intval = OPB_BoolToInt(ConstCmp__14() == 13);
|
||||
}
|
||||
break;
|
||||
case 14:
|
||||
if (__IN(f, 0x0a84)) {
|
||||
if (__IN(f, 0x0a84, 64)) {
|
||||
OPB_err(108);
|
||||
} else {
|
||||
xval->intval = OPB_BoolToInt(ConstCmp__14() != 11);
|
||||
|
|
@ -1136,7 +1136,7 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ)
|
|||
(*x)->conval->intval = 1;
|
||||
}
|
||||
}
|
||||
} else if (__IN(g, 0x60)) {
|
||||
} else if (__IN(g, 0x60, 64)) {
|
||||
(*x)->conval->realval = (*x)->conval->intval;
|
||||
(*x)->conval->intval = -1;
|
||||
} else {
|
||||
|
|
@ -1145,8 +1145,8 @@ static void OPB_Convert (OPT_Node *x, OPT_Struct typ)
|
|||
OPB_err(220);
|
||||
}
|
||||
}
|
||||
} else if (__IN(f, 0x60)) {
|
||||
if (__IN(g, 0x60)) {
|
||||
} else if (__IN(f, 0x60, 64)) {
|
||||
if (__IN(g, 0x60, 64)) {
|
||||
OPB_CheckRealType(g, 203, (*x)->conval);
|
||||
} else {
|
||||
r = (*x)->conval->realval;
|
||||
|
|
@ -1195,8 +1195,8 @@ static BOOLEAN strings__41 (OPT_Node *x, OPT_Node *y)
|
|||
{
|
||||
BOOLEAN _o_result;
|
||||
BOOLEAN ok, xCharArr, yCharArr;
|
||||
xCharArr = (__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 8;
|
||||
yCharArr = (__IN((*y)->typ->comp, 0x0c) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 8;
|
||||
xCharArr = (__IN((*x)->typ->comp, 0x0c, 64) && (*x)->typ->BaseTyp->form == 3) || *Op__38_s->f == 8;
|
||||
yCharArr = (__IN((*y)->typ->comp, 0x0c, 64) && (*y)->typ->BaseTyp->form == 3) || *Op__38_s->g == 8;
|
||||
if ((((xCharArr && *Op__38_s->g == 3)) && (*y)->class == 7)) {
|
||||
OPB_CharToString(*y);
|
||||
*Op__38_s->g = 8;
|
||||
|
|
@ -1255,7 +1255,7 @@ void OPB_Op (int8 op, OPT_Node *x, OPT_Node y)
|
|||
case 4:
|
||||
if ((g == 4 && y->typ->size < z->typ->size)) {
|
||||
OPB_Convert(&y, z->typ);
|
||||
} else if (__IN(g, 0x70)) {
|
||||
} else if (__IN(g, 0x70, 64)) {
|
||||
OPB_Convert(&z, y->typ);
|
||||
} else {
|
||||
OPB_err(100);
|
||||
|
|
@ -1264,23 +1264,23 @@ void OPB_Op (int8 op, OPT_Node *x, OPT_Node y)
|
|||
case 5:
|
||||
if (g == 4) {
|
||||
OPB_Convert(&y, z->typ);
|
||||
} else if (__IN(g, 0x60)) {
|
||||
} else if (__IN(g, 0x60, 64)) {
|
||||
OPB_Convert(&z, y->typ);
|
||||
} else {
|
||||
OPB_err(100);
|
||||
}
|
||||
break;
|
||||
case 6:
|
||||
if (__IN(g, 0x70)) {
|
||||
if (__IN(g, 0x70, 64)) {
|
||||
OPB_Convert(&y, z->typ);
|
||||
} else if (__IN(g, 0x60)) {
|
||||
} else if (__IN(g, 0x60, 64)) {
|
||||
OPB_Convert(&y, z->typ);
|
||||
} else {
|
||||
OPB_err(100);
|
||||
}
|
||||
break;
|
||||
case 9:
|
||||
if (!__IN(g, 0x1800)) {
|
||||
if (!__IN(g, 0x1800, 64)) {
|
||||
OPB_err(100);
|
||||
}
|
||||
break;
|
||||
|
|
@ -1341,7 +1341,7 @@ void OPB_Op (int8 op, OPT_Node *x, OPT_Node y)
|
|||
y->obj = NIL;
|
||||
}
|
||||
}
|
||||
} else if (!__IN(f, 0xe1)) {
|
||||
} else if (!__IN(f, 0xe1, 64)) {
|
||||
OPB_err(105);
|
||||
typ = OPT_undftyp;
|
||||
}
|
||||
|
|
@ -1357,7 +1357,7 @@ void OPB_Op (int8 op, OPT_Node *x, OPT_Node y)
|
|||
OPB_Convert(&z, OPT_realtyp);
|
||||
OPB_Convert(&y, OPT_realtyp);
|
||||
typ = OPT_realtyp;
|
||||
} else if (__IN(f, 0x60)) {
|
||||
} else if (__IN(f, 0x60, 64)) {
|
||||
if ((y->class == 7 && y->conval->realval == (LONGREAL)0)) {
|
||||
OPB_err(205);
|
||||
}
|
||||
|
|
@ -1424,7 +1424,7 @@ void OPB_Op (int8 op, OPT_Node *x, OPT_Node y)
|
|||
}
|
||||
break;
|
||||
case 6:
|
||||
if (!__IN(f, 0xf1)) {
|
||||
if (!__IN(f, 0xf1, 64)) {
|
||||
OPB_err(105);
|
||||
typ = OPT_undftyp;
|
||||
}
|
||||
|
|
@ -1443,7 +1443,7 @@ void OPB_Op (int8 op, OPT_Node *x, OPT_Node y)
|
|||
}
|
||||
break;
|
||||
case 7:
|
||||
if (!__IN(f, 0xf1)) {
|
||||
if (!__IN(f, 0xf1, 64)) {
|
||||
OPB_err(106);
|
||||
typ = OPT_undftyp;
|
||||
}
|
||||
|
|
@ -1467,7 +1467,7 @@ void OPB_Op (int8 op, OPT_Node *x, OPT_Node y)
|
|||
}
|
||||
break;
|
||||
case 9: case 10:
|
||||
if (__IN(f, 0x1aff) || strings__41(&z, &y)) {
|
||||
if (__IN(f, 0x1aff, 64) || strings__41(&z, &y)) {
|
||||
typ = OPT_booltyp;
|
||||
} else {
|
||||
OPB_err(107);
|
||||
|
|
@ -1476,7 +1476,7 @@ void OPB_Op (int8 op, OPT_Node *x, OPT_Node y)
|
|||
NewOp__39(op, typ, &z, y);
|
||||
break;
|
||||
case 11: case 12: case 13: case 14:
|
||||
if (__IN(f, 0x79) || strings__41(&z, &y)) {
|
||||
if (__IN(f, 0x79, 64) || strings__41(&z, &y)) {
|
||||
typ = OPT_booltyp;
|
||||
} else {
|
||||
OPM_LogWLn();
|
||||
|
|
@ -1518,10 +1518,10 @@ void OPB_SetRange (OPT_Node *x, OPT_Node y)
|
|||
}
|
||||
if (((*x)->class == 7 && y->class == 7)) {
|
||||
if (k <= l) {
|
||||
(*x)->conval->setval = __SETRNG(k, l);
|
||||
(*x)->conval->setval = __SETRNG(k, l, 64);
|
||||
} else {
|
||||
OPB_err(201);
|
||||
(*x)->conval->setval = __SETRNG(l, k);
|
||||
(*x)->conval->setval = __SETRNG(l, k, 64);
|
||||
}
|
||||
(*x)->obj = NIL;
|
||||
} else {
|
||||
|
|
@ -1543,7 +1543,7 @@ void OPB_SetElem (OPT_Node *x)
|
|||
} else if ((*x)->class == 7) {
|
||||
k = (*x)->conval->intval;
|
||||
if ((0 <= k && k <= (int64)OPM_MaxSet)) {
|
||||
(*x)->conval->setval = __SETOF(k);
|
||||
(*x)->conval->setval = __SETOF(k,64);
|
||||
} else {
|
||||
OPB_err(202);
|
||||
}
|
||||
|
|
@ -1588,7 +1588,7 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode)
|
|||
case 0: case 8:
|
||||
break;
|
||||
case 1:
|
||||
if (!((__IN(g, 0x1a) && y->size == 1))) {
|
||||
if (!((__IN(g, 0x1a, 64) && y->size == 1))) {
|
||||
OPB_err(113);
|
||||
}
|
||||
break;
|
||||
|
|
@ -1603,12 +1603,12 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode)
|
|||
}
|
||||
break;
|
||||
case 5:
|
||||
if (!__IN(g, 0x30)) {
|
||||
if (!__IN(g, 0x30, 64)) {
|
||||
OPB_err(113);
|
||||
}
|
||||
break;
|
||||
case 6:
|
||||
if (!__IN(g, 0x70)) {
|
||||
if (!__IN(g, 0x70, 64)) {
|
||||
OPB_err(113);
|
||||
}
|
||||
break;
|
||||
|
|
@ -1656,7 +1656,7 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode)
|
|||
if (ynode->conval->intval2 > x->n) {
|
||||
OPB_err(114);
|
||||
}
|
||||
} else if ((__IN(y->comp, 0x0c) && y->BaseTyp == OPT_chartyp)) {
|
||||
} else if ((__IN(y->comp, 0x0c, 64) && y->BaseTyp == OPT_chartyp)) {
|
||||
} else {
|
||||
OPB_err(113);
|
||||
}
|
||||
|
|
@ -1664,7 +1664,7 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode)
|
|||
OPB_err(113);
|
||||
}
|
||||
} else if ((x->comp == 3 && x->BaseTyp == OPT_chartyp)) {
|
||||
if ((__IN(y->comp, 0x0c) && y->BaseTyp == OPT_chartyp)) {
|
||||
if ((__IN(y->comp, 0x0c, 64) && y->BaseTyp == OPT_chartyp)) {
|
||||
} else {
|
||||
OPB_err(113);
|
||||
}
|
||||
|
|
@ -1691,7 +1691,7 @@ static void OPB_CheckAssign (OPT_Struct x, OPT_Node ynode)
|
|||
OPM_LogWLn();
|
||||
break;
|
||||
}
|
||||
if ((((((ynode->class == 7 && g < f)) && __IN(g, 0x30))) && __IN(f, 0x70))) {
|
||||
if ((((((ynode->class == 7 && g < f)) && __IN(g, 0x30, 64))) && __IN(f, 0x70, 64))) {
|
||||
OPB_Convert(&ynode, x);
|
||||
}
|
||||
}
|
||||
|
|
@ -1729,7 +1729,7 @@ void OPB_StPar0 (OPT_Node *par0, int32 fctno)
|
|||
OPB_err(76);
|
||||
}
|
||||
f = x->typ->BaseTyp->comp;
|
||||
if (__IN(f, 0x1c)) {
|
||||
if (__IN(f, 0x1c, 64)) {
|
||||
if (f == 3) {
|
||||
typ = x->typ->BaseTyp;
|
||||
}
|
||||
|
|
@ -1762,7 +1762,7 @@ void OPB_StPar0 (OPT_Node *par0, int32 fctno)
|
|||
case 5:
|
||||
if (x->class == 8 || x->class == 9) {
|
||||
OPB_err(126);
|
||||
} else if (__IN(f, 0x60)) {
|
||||
} else if (__IN(f, 0x60, 64)) {
|
||||
OPB_Convert(&x, OPT_linttyp);
|
||||
} else {
|
||||
OPB_err(111);
|
||||
|
|
@ -1837,7 +1837,7 @@ void OPB_StPar0 (OPT_Node *par0, int32 fctno)
|
|||
case 9:
|
||||
if (x->class == 8 || x->class == 9) {
|
||||
OPB_err(126);
|
||||
} else if (__IN(f, 0x11)) {
|
||||
} else if (__IN(f, 0x11, 64)) {
|
||||
OPB_Convert(&x, OPT_chartyp);
|
||||
} else {
|
||||
OPB_err(111);
|
||||
|
|
@ -1898,7 +1898,7 @@ void OPB_StPar0 (OPT_Node *par0, int32 fctno)
|
|||
}
|
||||
break;
|
||||
case 17:
|
||||
if (!__IN(x->typ->comp, 0x0c)) {
|
||||
if (!__IN(x->typ->comp, 0x0c, 64)) {
|
||||
OPB_err(131);
|
||||
}
|
||||
break;
|
||||
|
|
@ -1909,7 +1909,7 @@ void OPB_StPar0 (OPT_Node *par0, int32 fctno)
|
|||
}
|
||||
if (x->class == 8 || x->class == 9) {
|
||||
OPB_err(126);
|
||||
} else if (((!__IN(x->typ->comp, 0x0c) || x->typ->BaseTyp->form != 3) && f != 8)) {
|
||||
} else if (((!__IN(x->typ->comp, 0x0c, 64) || x->typ->BaseTyp->form != 3) && f != 8)) {
|
||||
OPB_err(111);
|
||||
}
|
||||
break;
|
||||
|
|
@ -1933,7 +1933,7 @@ void OPB_StPar0 (OPT_Node *par0, int32 fctno)
|
|||
if (x->class != 8) {
|
||||
OPB_err(110);
|
||||
x = OPB_NewIntConst(1);
|
||||
} else if (__IN(f, 0x18fe) || __IN(x->typ->comp, 0x14)) {
|
||||
} else if (__IN(f, 0x18fe, 64) || __IN(x->typ->comp, 0x14, 64)) {
|
||||
(*OPB_typSize)(x->typ);
|
||||
x->typ->pvused = 1;
|
||||
x = OPB_NewIntConst(x->typ->size);
|
||||
|
|
@ -1948,7 +1948,7 @@ void OPB_StPar0 (OPT_Node *par0, int32 fctno)
|
|||
case 22: case 23:
|
||||
if (x->class == 8 || x->class == 9) {
|
||||
OPB_err(126);
|
||||
} else if (!__IN(f, 0x9a)) {
|
||||
} else if (!__IN(f, 0x9a, 64)) {
|
||||
OPB_err(111);
|
||||
}
|
||||
break;
|
||||
|
|
@ -1957,7 +1957,7 @@ void OPB_StPar0 (OPT_Node *par0, int32 fctno)
|
|||
OPB_err(126);
|
||||
} else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) {
|
||||
OPB_Convert(&x, OPT_linttyp);
|
||||
} else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == (int64)OPM_PointerSize))) {
|
||||
} else if (!((__IN(x->typ->form, 0x0810, 64) && x->typ->size == (int64)OPM_PointerSize))) {
|
||||
OPB_err(111);
|
||||
x->typ = OPT_linttyp;
|
||||
}
|
||||
|
|
@ -1974,7 +1974,7 @@ void OPB_StPar0 (OPT_Node *par0, int32 fctno)
|
|||
case 29:
|
||||
if (x->class != 8) {
|
||||
OPB_err(110);
|
||||
} else if (__IN(f, 0x0501) || x->typ->comp == 3) {
|
||||
} else if (__IN(f, 0x0501, 64) || x->typ->comp == 3) {
|
||||
OPB_err(111);
|
||||
}
|
||||
break;
|
||||
|
|
@ -2070,11 +2070,11 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, int8 fctno)
|
|||
} else if (x->typ->size == 1) {
|
||||
L = (int32)x->conval->intval;
|
||||
typ = p->typ;
|
||||
while ((L > 0 && __IN(typ->comp, 0x0c))) {
|
||||
while ((L > 0 && __IN(typ->comp, 0x0c, 64))) {
|
||||
typ = typ->BaseTyp;
|
||||
L -= 1;
|
||||
}
|
||||
if (L != 0 || !__IN(typ->comp, 0x0c)) {
|
||||
if (L != 0 || !__IN(typ->comp, 0x0c, 64)) {
|
||||
OPB_err(132);
|
||||
} else {
|
||||
x->obj = NIL;
|
||||
|
|
@ -2098,7 +2098,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, int8 fctno)
|
|||
case 18:
|
||||
if (OPB_NotVar(x)) {
|
||||
OPB_err(112);
|
||||
} else if ((__IN(x->typ->comp, 0x0c) && x->typ->BaseTyp->form == 3)) {
|
||||
} else if ((__IN(x->typ->comp, 0x0c, 64) && x->typ->BaseTyp->form == 3)) {
|
||||
if (x->readonly) {
|
||||
OPB_err(76);
|
||||
}
|
||||
|
|
@ -2172,7 +2172,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, int8 fctno)
|
|||
case 24: case 25: case 26: case 27:
|
||||
if (x->class == 8 || x->class == 9) {
|
||||
OPB_err(126);
|
||||
} else if (__IN(f, 0x18ff)) {
|
||||
} else if (__IN(f, 0x18ff, 64)) {
|
||||
if (fctno == 24 || fctno == 26) {
|
||||
if (OPB_NotVar(x)) {
|
||||
OPB_err(112);
|
||||
|
|
@ -2198,7 +2198,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, int8 fctno)
|
|||
p->typ = OPT_booltyp;
|
||||
break;
|
||||
case 29:
|
||||
if (((x->class == 8 || x->class == 9) || __IN(f, 0x0501)) || x->typ->comp == 3) {
|
||||
if (((x->class == 8 || x->class == 9) || __IN(f, 0x0501, 64)) || x->typ->comp == 3) {
|
||||
OPB_err(126);
|
||||
}
|
||||
if ((x->class != 7 && x->typ->size < p->typ->size)) {
|
||||
|
|
@ -2230,7 +2230,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, int8 fctno)
|
|||
OPB_err(126);
|
||||
} else if ((((x->class == 7 && f == 4)) && x->typ->size < OPT_linttyp->size)) {
|
||||
OPB_Convert(&x, OPT_linttyp);
|
||||
} else if (!((__IN(x->typ->form, 0x0810) && x->typ->size == (int64)OPM_PointerSize))) {
|
||||
} else if (!((__IN(x->typ->form, 0x0810, 64) && x->typ->size == (int64)OPM_PointerSize))) {
|
||||
OPB_err(111);
|
||||
x->typ = OPT_linttyp;
|
||||
}
|
||||
|
|
@ -2384,12 +2384,12 @@ static void OPB_DynArrParCheck (OPT_Struct ftyp, OPT_Struct atyp, BOOLEAN fvarpa
|
|||
ftyp = ftyp->BaseTyp;
|
||||
atyp = atyp->BaseTyp;
|
||||
if ((fvarpar && ftyp == OPT_bytetyp)) {
|
||||
if (!__IN(f, 0x0c) || !((__IN(atyp->form, 0x1e) && atyp->size == 1))) {
|
||||
if (__IN(18, OPM_opt)) {
|
||||
if (!__IN(f, 0x0c, 64) || !((__IN(atyp->form, 0x1e, 64) && atyp->size == 1))) {
|
||||
if (__IN(18, OPM_opt, 64)) {
|
||||
OPB_err(-301);
|
||||
}
|
||||
}
|
||||
} else if (__IN(f, 0x0c)) {
|
||||
} else if (__IN(f, 0x0c, 64)) {
|
||||
if (ftyp->comp == 3) {
|
||||
OPB_DynArrParCheck(ftyp, atyp, fvarpar);
|
||||
} else if (ftyp != atyp) {
|
||||
|
|
@ -2428,7 +2428,7 @@ static void OPB_CheckReceiver (OPT_Node *x, OPT_Object fp)
|
|||
|
||||
void OPB_PrepCall (OPT_Node *x, OPT_Object *fpar)
|
||||
{
|
||||
if (((*x)->obj != NIL && __IN((*x)->obj->mode, 0x22c0))) {
|
||||
if (((*x)->obj != NIL && __IN((*x)->obj->mode, 0x22c0, 64))) {
|
||||
*fpar = (*x)->obj->link;
|
||||
if ((*x)->obj->mode == 13) {
|
||||
OPB_CheckReceiver(&(*x)->left, *fpar);
|
||||
|
|
@ -2467,7 +2467,7 @@ void OPB_Param (OPT_Node ap, OPT_Object fp)
|
|||
OPB_err(111);
|
||||
}
|
||||
} else if ((fp->typ == OPT_sysptrtyp && ap->typ->form == 11)) {
|
||||
} else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x1e) && ap->typ->size == 1)))))) {
|
||||
} else if ((ap->typ != fp->typ && !((fp->typ->form == 1 && ((__IN(ap->typ->form, 0x1e, 64) && ap->typ->size == 1)))))) {
|
||||
OPB_err(123);
|
||||
} else if ((fp->typ->form == 11 && ap->class == 5)) {
|
||||
OPB_err(123);
|
||||
|
|
@ -2494,7 +2494,7 @@ void OPB_StaticLink (int8 dlev)
|
|||
scope = OPT_topScope;
|
||||
while (dlev > 0) {
|
||||
dlev -= 1;
|
||||
scope->link->conval->setval |= __SETOF(3);
|
||||
scope->link->conval->setval |= __SETOF(3,64);
|
||||
scope = scope->left;
|
||||
}
|
||||
}
|
||||
|
|
@ -2589,7 +2589,7 @@ void OPB_Assign (OPT_Node *x, OPT_Node y)
|
|||
y->conval->intval = 0;
|
||||
OPB_Index(&*x, OPB_NewIntConst(0));
|
||||
}
|
||||
if ((((((__IN((*x)->typ->comp, 0x0c) && (*x)->typ->BaseTyp == OPT_chartyp)) && __IN(y->typ->comp, 0x0c))) && y->typ->BaseTyp == OPT_chartyp)) {
|
||||
if ((((((__IN((*x)->typ->comp, 0x0c, 64) && (*x)->typ->BaseTyp == OPT_chartyp)) && __IN(y->typ->comp, 0x0c, 64))) && y->typ->BaseTyp == OPT_chartyp)) {
|
||||
subcl = 18;
|
||||
} else {
|
||||
subcl = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue