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

Use SET64 representation in the compiler.

Browse source
This commit is contained in:
David Brown 2016-09-30 19:00:33 +01:00
parent 2e02f9204c
commit 7238be5257
38 changed files with 119 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bootstrap/unix-44/OPB.c
View file

@ -471,7 +471,7 @@ void OPB_In (OPT_Node *x, OPT_Node y)
if (k < 0 || k > (int64)OPM_MaxSet) { if (k < 0 || k > (int64)OPM_MaxSet) {
OPB_err(202); OPB_err(202);
} else if (y->class == 7) { } else if (y->class == 7) {
(*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 32)); (*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 64));
(*x)->obj = NIL; (*x)->obj = NIL;
} else { } else {
OPB_BindNodes(12, OPT_booltyp, &*x, y); OPB_BindNodes(12, OPT_booltyp, &*x, y);
@ -2483,7 +2483,7 @@ void OPB_StaticLink (int8 dlev)
scope = OPT_topScope; scope = OPT_topScope;
while (dlev > 0) { while (dlev > 0) {
dlev -= 1; dlev -= 1;
scope->link->conval->setval |= __SETOF(3,32); scope->link->conval->setval |= __SETOF(3,64);
scope = scope->left; scope = scope->left;
} }
} }

18
bootstrap/unix-44/OPM.c
View file

@ -53,7 +53,7 @@ export void OPM_DeleteNewSym (void);
export void OPM_FPrint (int32 *fp, int64 val); export void OPM_FPrint (int32 *fp, int64 val);
export void OPM_FPrintLReal (int32 *fp, LONGREAL lr); export void OPM_FPrintLReal (int32 *fp, LONGREAL lr);
export void OPM_FPrintReal (int32 *fp, REAL real); export void OPM_FPrintReal (int32 *fp, REAL real);
export void OPM_FPrintSet (int32 *fp, uint32 set); export void OPM_FPrintSet (int32 *fp, uint64 set);
static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos); static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos);
export void OPM_Get (CHAR *ch); export void OPM_Get (CHAR *ch);
export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
@ -81,12 +81,12 @@ export int32 OPM_SymRInt (void);
export int64 OPM_SymRInt64 (void); export int64 OPM_SymRInt64 (void);
export void OPM_SymRLReal (LONGREAL *lr); export void OPM_SymRLReal (LONGREAL *lr);
export void OPM_SymRReal (REAL *r); export void OPM_SymRReal (REAL *r);
export void OPM_SymRSet (uint32 *s); export void OPM_SymRSet (uint64 *s);
export void OPM_SymWCh (CHAR ch); export void OPM_SymWCh (CHAR ch);
export void OPM_SymWInt (int64 i); export void OPM_SymWInt (int64 i);
export void OPM_SymWLReal (LONGREAL lr); export void OPM_SymWLReal (LONGREAL lr);
export void OPM_SymWReal (REAL r); export void OPM_SymWReal (REAL r);
export void OPM_SymWSet (uint32 s); export void OPM_SymWSet (uint64 s);
static void OPM_VerboseListSizes (void); static void OPM_VerboseListSizes (void);
export void OPM_Write (CHAR ch); export void OPM_Write (CHAR ch);
export void OPM_WriteHex (int64 i); export void OPM_WriteHex (int64 i);
@ -713,9 +713,9 @@ void OPM_FPrint (int32 *fp, int64 val)
*fp = __ROTL((int32)((uint32)*fp ^ __VAL(uint32, val)), 1, 32); *fp = __ROTL((int32)((uint32)*fp ^ __VAL(uint32, val)), 1, 32);
} }
void OPM_FPrintSet (int32 *fp, uint32 set) void OPM_FPrintSet (int32 *fp, uint64 set)
{ {
OPM_FPrint(&*fp, (int32)set); OPM_FPrint(&*fp, __VAL(int32, set));
} }
void OPM_FPrintReal (int32 *fp, REAL real) void OPM_FPrintReal (int32 *fp, REAL real)
@ -758,9 +758,9 @@ int64 OPM_SymRInt64 (void)
return _o_result; return _o_result;
} }
void OPM_SymRSet (uint32 *s) void OPM_SymRSet (uint64 *s)
{ {
Files_ReadNum(&OPM_oldSF, Files_Rider__typ, (void*)&*s, 4); Files_ReadNum(&OPM_oldSF, Files_Rider__typ, (void*)&*s, 8);
} }
void OPM_SymRReal (REAL *r) void OPM_SymRReal (REAL *r)
@ -812,9 +812,9 @@ void OPM_SymWInt (int64 i)
Files_WriteNum(&OPM_newSF, Files_Rider__typ, i); Files_WriteNum(&OPM_newSF, Files_Rider__typ, i);
} }
void OPM_SymWSet (uint32 s) void OPM_SymWSet (uint64 s)
{ {
Files_WriteNum(&OPM_newSF, Files_Rider__typ, (int32)s); Files_WriteNum(&OPM_newSF, Files_Rider__typ, (int64)s);
} }
void OPM_SymWReal (REAL r) void OPM_SymWReal (REAL r)

6
bootstrap/unix-44/OPM.h
View file

@ -26,7 +26,7 @@ import void OPM_DeleteNewSym (void);
import void OPM_FPrint (int32 *fp, int64 val); import void OPM_FPrint (int32 *fp, int64 val);
import void OPM_FPrintLReal (int32 *fp, LONGREAL lr); import void OPM_FPrintLReal (int32 *fp, LONGREAL lr);
import void OPM_FPrintReal (int32 *fp, REAL real); import void OPM_FPrintReal (int32 *fp, REAL real);
import void OPM_FPrintSet (int32 *fp, uint32 set); import void OPM_FPrintSet (int32 *fp, uint64 set);
import void OPM_Get (CHAR *ch); import void OPM_Get (CHAR *ch);
import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
import void OPM_InitOptions (void); import void OPM_InitOptions (void);
@ -49,12 +49,12 @@ import int32 OPM_SymRInt (void);
import int64 OPM_SymRInt64 (void); import int64 OPM_SymRInt64 (void);
import void OPM_SymRLReal (LONGREAL *lr); import void OPM_SymRLReal (LONGREAL *lr);
import void OPM_SymRReal (REAL *r); import void OPM_SymRReal (REAL *r);
import void OPM_SymRSet (uint32 *s); import void OPM_SymRSet (uint64 *s);
import void OPM_SymWCh (CHAR ch); import void OPM_SymWCh (CHAR ch);
import void OPM_SymWInt (int64 i); import void OPM_SymWInt (int64 i);
import void OPM_SymWLReal (LONGREAL lr); import void OPM_SymWLReal (LONGREAL lr);
import void OPM_SymWReal (REAL r); import void OPM_SymWReal (REAL r);
import void OPM_SymWSet (uint32 s); import void OPM_SymWSet (uint64 s);
import void OPM_Write (CHAR ch); import void OPM_Write (CHAR ch);
import void OPM_WriteHex (int64 i); import void OPM_WriteHex (int64 i);
import void OPM_WriteInt (int64 i); import void OPM_WriteInt (int64 i);

10
bootstrap/unix-44/OPP.c
View file

@ -967,7 +967,7 @@ static void GetCode__19 (void)
} }
} }
} }
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,64);
} }
static void GetParams__21 (void) static void GetParams__21 (void)
@ -999,7 +999,7 @@ static void Body__17 (void)
OPT_Node procdec = NIL, statseq = NIL; OPT_Node procdec = NIL, statseq = NIL;
int32 c; int32 c;
c = OPM_errpos; c = OPM_errpos;
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,64);
OPP_CheckSym(39); OPP_CheckSym(39);
OPP_Block(&procdec, &statseq); OPP_Block(&procdec, &statseq);
OPB_Enter(&procdec, statseq, *ProcedureDeclaration__16_s->proc); OPB_Enter(&procdec, statseq, *ProcedureDeclaration__16_s->proc);
@ -1042,7 +1042,7 @@ static void TProcDecl__23 (void)
if ((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mnolev != OPP_level)) { if ((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mnolev != OPP_level)) {
*ProcedureDeclaration__16_s->fwd = NIL; *ProcedureDeclaration__16_s->fwd = NIL;
} }
if ((((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mode == 13)) && !__IN(1, (*ProcedureDeclaration__16_s->fwd)->conval->setval, 32))) { if ((((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mode == 13)) && !__IN(1, (*ProcedureDeclaration__16_s->fwd)->conval->setval, 64))) {
*ProcedureDeclaration__16_s->proc = OPT_NewObj(); *ProcedureDeclaration__16_s->proc = OPT_NewObj();
(*ProcedureDeclaration__16_s->proc)->leaf = 1; (*ProcedureDeclaration__16_s->proc)->leaf = 1;
if ((*ProcedureDeclaration__16_s->fwd)->vis != *ProcedureDeclaration__16_s->vis) { if ((*ProcedureDeclaration__16_s->fwd)->vis != *ProcedureDeclaration__16_s->vis) {
@ -1076,7 +1076,7 @@ static void TProcDecl__23 (void)
if ((((((baseProc->vis == 1 && (*ProcedureDeclaration__16_s->proc)->vis == 0)) && recTyp->strobj != NIL)) && recTyp->strobj->vis == 1)) { if ((((((baseProc->vis == 1 && (*ProcedureDeclaration__16_s->proc)->vis == 0)) && recTyp->strobj != NIL)) && recTyp->strobj->vis == 1)) {
OPP_err(109); OPP_err(109);
} }
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(2,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(2,64);
} }
if (!*ProcedureDeclaration__16_s->forward) { if (!*ProcedureDeclaration__16_s->forward) {
Body__17(); Body__17();
@ -1136,7 +1136,7 @@ static void OPP_ProcedureDeclaration (OPT_Node *x)
if ((fwd != NIL && (fwd->mnolev != OPP_level || fwd->mode == 8))) { if ((fwd != NIL && (fwd->mnolev != OPP_level || fwd->mode == 8))) {
fwd = NIL; fwd = NIL;
} }
if ((((fwd != NIL && __IN(fwd->mode, 0xc0, 32))) && !__IN(1, fwd->conval->setval, 32))) { if ((((fwd != NIL && __IN(fwd->mode, 0xc0, 32))) && !__IN(1, fwd->conval->setval, 64))) {
proc = OPT_NewObj(); proc = OPT_NewObj();
proc->leaf = 1; proc->leaf = 1;
if (fwd->vis != vis) { if (fwd->vis != vis) {

4
bootstrap/unix-44/OPT.c
View file

@ -20,7 +20,7 @@ typedef
OPT_ConstExt ext; OPT_ConstExt ext;
int64 intval; int64 intval;
int32 intval2; int32 intval2;
uint32 setval; uint64 setval;
LONGREAL realval; LONGREAL realval;
} OPT_ConstDesc; } OPT_ConstDesc;
@ -2008,7 +2008,7 @@ static void EnumPtrs(void (*P)(void*))
__ENUMR(&OPT_impCtxt, OPT_ImpCtxt__typ, 3140, 1, P); __ENUMR(&OPT_impCtxt, OPT_ImpCtxt__typ, 3140, 1, P);
} }
__TDESC(OPT_ConstDesc, 1, 1) = {__TDFLDS("ConstDesc", 28), {0, -8}}; __TDESC(OPT_ConstDesc, 1, 1) = {__TDFLDS("ConstDesc", 32), {0, -8}};
__TDESC(OPT_ObjDesc, 1, 6) = {__TDFLDS("ObjDesc", 304), {0, 4, 8, 12, 284, 288, -28}}; __TDESC(OPT_ObjDesc, 1, 6) = {__TDFLDS("ObjDesc", 304), {0, 4, 8, 12, 284, 288, -28}};
__TDESC(OPT_StrDesc, 1, 3) = {__TDFLDS("StrDesc", 56), {44, 48, 52, -16}}; __TDESC(OPT_StrDesc, 1, 3) = {__TDFLDS("StrDesc", 56), {44, 48, 52, -16}};
__TDESC(OPT_NodeDesc, 1, 6) = {__TDFLDS("NodeDesc", 28), {0, 4, 8, 16, 20, 24, -28}}; __TDESC(OPT_NodeDesc, 1, 6) = {__TDFLDS("NodeDesc", 28), {0, 4, 8, 16, 20, 24, -28}};

2
bootstrap/unix-44/OPT.h
View file

@ -17,7 +17,7 @@ typedef
OPT_ConstExt ext; OPT_ConstExt ext;
int64 intval; int64 intval;
int32 intval2; int32 intval2;
uint32 setval; uint64 setval;
LONGREAL realval; LONGREAL realval;
} OPT_ConstDesc; } OPT_ConstDesc;

2
bootstrap/unix-44/OPV.c
View file

@ -72,7 +72,7 @@ static void OPV_GetTProcNum (OPT_Object obj)
OPT_FindField(obj->name, typ->BaseTyp, &redef); OPT_FindField(obj->name, typ->BaseTyp, &redef);
if (redef != NIL) { if (redef != NIL) {
obj->adr = __ASHL(__ASHR(redef->adr, 16), 16); obj->adr = __ASHL(__ASHR(redef->adr, 16), 16);
if (!__IN(2, obj->conval->setval, 32)) { if (!__IN(2, obj->conval->setval, 64)) {
OPM_err(119); OPM_err(119);
} }
} else { } else {

4
bootstrap/unix-48/OPB.c
View file

@ -471,7 +471,7 @@ void OPB_In (OPT_Node *x, OPT_Node y)
if (k < 0 || k > (int64)OPM_MaxSet) { if (k < 0 || k > (int64)OPM_MaxSet) {
OPB_err(202); OPB_err(202);
} else if (y->class == 7) { } else if (y->class == 7) {
(*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 32)); (*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 64));
(*x)->obj = NIL; (*x)->obj = NIL;
} else { } else {
OPB_BindNodes(12, OPT_booltyp, &*x, y); OPB_BindNodes(12, OPT_booltyp, &*x, y);
@ -2483,7 +2483,7 @@ void OPB_StaticLink (int8 dlev)
scope = OPT_topScope; scope = OPT_topScope;
while (dlev > 0) { while (dlev > 0) {
dlev -= 1; dlev -= 1;
scope->link->conval->setval |= __SETOF(3,32); scope->link->conval->setval |= __SETOF(3,64);
scope = scope->left; scope = scope->left;
} }
} }

18
bootstrap/unix-48/OPM.c
View file

@ -53,7 +53,7 @@ export void OPM_DeleteNewSym (void);
export void OPM_FPrint (int32 *fp, int64 val); export void OPM_FPrint (int32 *fp, int64 val);
export void OPM_FPrintLReal (int32 *fp, LONGREAL lr); export void OPM_FPrintLReal (int32 *fp, LONGREAL lr);
export void OPM_FPrintReal (int32 *fp, REAL real); export void OPM_FPrintReal (int32 *fp, REAL real);
export void OPM_FPrintSet (int32 *fp, uint32 set); export void OPM_FPrintSet (int32 *fp, uint64 set);
static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos); static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos);
export void OPM_Get (CHAR *ch); export void OPM_Get (CHAR *ch);
export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
@ -81,12 +81,12 @@ export int32 OPM_SymRInt (void);
export int64 OPM_SymRInt64 (void); export int64 OPM_SymRInt64 (void);
export void OPM_SymRLReal (LONGREAL *lr); export void OPM_SymRLReal (LONGREAL *lr);
export void OPM_SymRReal (REAL *r); export void OPM_SymRReal (REAL *r);
export void OPM_SymRSet (uint32 *s); export void OPM_SymRSet (uint64 *s);
export void OPM_SymWCh (CHAR ch); export void OPM_SymWCh (CHAR ch);
export void OPM_SymWInt (int64 i); export void OPM_SymWInt (int64 i);
export void OPM_SymWLReal (LONGREAL lr); export void OPM_SymWLReal (LONGREAL lr);
export void OPM_SymWReal (REAL r); export void OPM_SymWReal (REAL r);
export void OPM_SymWSet (uint32 s); export void OPM_SymWSet (uint64 s);
static void OPM_VerboseListSizes (void); static void OPM_VerboseListSizes (void);
export void OPM_Write (CHAR ch); export void OPM_Write (CHAR ch);
export void OPM_WriteHex (int64 i); export void OPM_WriteHex (int64 i);
@ -713,9 +713,9 @@ void OPM_FPrint (int32 *fp, int64 val)
*fp = __ROTL((int32)((uint32)*fp ^ __VAL(uint32, val)), 1, 32); *fp = __ROTL((int32)((uint32)*fp ^ __VAL(uint32, val)), 1, 32);
} }
void OPM_FPrintSet (int32 *fp, uint32 set) void OPM_FPrintSet (int32 *fp, uint64 set)
{ {
OPM_FPrint(&*fp, (int32)set); OPM_FPrint(&*fp, __VAL(int32, set));
} }
void OPM_FPrintReal (int32 *fp, REAL real) void OPM_FPrintReal (int32 *fp, REAL real)
@ -758,9 +758,9 @@ int64 OPM_SymRInt64 (void)
return _o_result; return _o_result;
} }
void OPM_SymRSet (uint32 *s) void OPM_SymRSet (uint64 *s)
{ {
Files_ReadNum(&OPM_oldSF, Files_Rider__typ, (void*)&*s, 4); Files_ReadNum(&OPM_oldSF, Files_Rider__typ, (void*)&*s, 8);
} }
void OPM_SymRReal (REAL *r) void OPM_SymRReal (REAL *r)
@ -812,9 +812,9 @@ void OPM_SymWInt (int64 i)
Files_WriteNum(&OPM_newSF, Files_Rider__typ, i); Files_WriteNum(&OPM_newSF, Files_Rider__typ, i);
} }
void OPM_SymWSet (uint32 s) void OPM_SymWSet (uint64 s)
{ {
Files_WriteNum(&OPM_newSF, Files_Rider__typ, (int32)s); Files_WriteNum(&OPM_newSF, Files_Rider__typ, (int64)s);
} }
void OPM_SymWReal (REAL r) void OPM_SymWReal (REAL r)

6
bootstrap/unix-48/OPM.h
View file

@ -26,7 +26,7 @@ import void OPM_DeleteNewSym (void);
import void OPM_FPrint (int32 *fp, int64 val); import void OPM_FPrint (int32 *fp, int64 val);
import void OPM_FPrintLReal (int32 *fp, LONGREAL lr); import void OPM_FPrintLReal (int32 *fp, LONGREAL lr);
import void OPM_FPrintReal (int32 *fp, REAL real); import void OPM_FPrintReal (int32 *fp, REAL real);
import void OPM_FPrintSet (int32 *fp, uint32 set); import void OPM_FPrintSet (int32 *fp, uint64 set);
import void OPM_Get (CHAR *ch); import void OPM_Get (CHAR *ch);
import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
import void OPM_InitOptions (void); import void OPM_InitOptions (void);
@ -49,12 +49,12 @@ import int32 OPM_SymRInt (void);
import int64 OPM_SymRInt64 (void); import int64 OPM_SymRInt64 (void);
import void OPM_SymRLReal (LONGREAL *lr); import void OPM_SymRLReal (LONGREAL *lr);
import void OPM_SymRReal (REAL *r); import void OPM_SymRReal (REAL *r);
import void OPM_SymRSet (uint32 *s); import void OPM_SymRSet (uint64 *s);
import void OPM_SymWCh (CHAR ch); import void OPM_SymWCh (CHAR ch);
import void OPM_SymWInt (int64 i); import void OPM_SymWInt (int64 i);
import void OPM_SymWLReal (LONGREAL lr); import void OPM_SymWLReal (LONGREAL lr);
import void OPM_SymWReal (REAL r); import void OPM_SymWReal (REAL r);
import void OPM_SymWSet (uint32 s); import void OPM_SymWSet (uint64 s);
import void OPM_Write (CHAR ch); import void OPM_Write (CHAR ch);
import void OPM_WriteHex (int64 i); import void OPM_WriteHex (int64 i);
import void OPM_WriteInt (int64 i); import void OPM_WriteInt (int64 i);

10
bootstrap/unix-48/OPP.c
View file

@ -967,7 +967,7 @@ static void GetCode__19 (void)
} }
} }
} }
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,64);
} }
static void GetParams__21 (void) static void GetParams__21 (void)
@ -999,7 +999,7 @@ static void Body__17 (void)
OPT_Node procdec = NIL, statseq = NIL; OPT_Node procdec = NIL, statseq = NIL;
int32 c; int32 c;
c = OPM_errpos; c = OPM_errpos;
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,64);
OPP_CheckSym(39); OPP_CheckSym(39);
OPP_Block(&procdec, &statseq); OPP_Block(&procdec, &statseq);
OPB_Enter(&procdec, statseq, *ProcedureDeclaration__16_s->proc); OPB_Enter(&procdec, statseq, *ProcedureDeclaration__16_s->proc);
@ -1042,7 +1042,7 @@ static void TProcDecl__23 (void)
if ((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mnolev != OPP_level)) { if ((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mnolev != OPP_level)) {
*ProcedureDeclaration__16_s->fwd = NIL; *ProcedureDeclaration__16_s->fwd = NIL;
} }
if ((((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mode == 13)) && !__IN(1, (*ProcedureDeclaration__16_s->fwd)->conval->setval, 32))) { if ((((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mode == 13)) && !__IN(1, (*ProcedureDeclaration__16_s->fwd)->conval->setval, 64))) {
*ProcedureDeclaration__16_s->proc = OPT_NewObj(); *ProcedureDeclaration__16_s->proc = OPT_NewObj();
(*ProcedureDeclaration__16_s->proc)->leaf = 1; (*ProcedureDeclaration__16_s->proc)->leaf = 1;
if ((*ProcedureDeclaration__16_s->fwd)->vis != *ProcedureDeclaration__16_s->vis) { if ((*ProcedureDeclaration__16_s->fwd)->vis != *ProcedureDeclaration__16_s->vis) {
@ -1076,7 +1076,7 @@ static void TProcDecl__23 (void)
if ((((((baseProc->vis == 1 && (*ProcedureDeclaration__16_s->proc)->vis == 0)) && recTyp->strobj != NIL)) && recTyp->strobj->vis == 1)) { if ((((((baseProc->vis == 1 && (*ProcedureDeclaration__16_s->proc)->vis == 0)) && recTyp->strobj != NIL)) && recTyp->strobj->vis == 1)) {
OPP_err(109); OPP_err(109);
} }
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(2,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(2,64);
} }
if (!*ProcedureDeclaration__16_s->forward) { if (!*ProcedureDeclaration__16_s->forward) {
Body__17(); Body__17();
@ -1136,7 +1136,7 @@ static void OPP_ProcedureDeclaration (OPT_Node *x)
if ((fwd != NIL && (fwd->mnolev != OPP_level || fwd->mode == 8))) { if ((fwd != NIL && (fwd->mnolev != OPP_level || fwd->mode == 8))) {
fwd = NIL; fwd = NIL;
} }
if ((((fwd != NIL && __IN(fwd->mode, 0xc0, 32))) && !__IN(1, fwd->conval->setval, 32))) { if ((((fwd != NIL && __IN(fwd->mode, 0xc0, 32))) && !__IN(1, fwd->conval->setval, 64))) {
proc = OPT_NewObj(); proc = OPT_NewObj();
proc->leaf = 1; proc->leaf = 1;
if (fwd->vis != vis) { if (fwd->vis != vis) {

4
bootstrap/unix-48/OPT.c
View file

@ -20,7 +20,7 @@ typedef
OPT_ConstExt ext; OPT_ConstExt ext;
int64 intval; int64 intval;
int32 intval2; int32 intval2;
uint32 setval; uint64 setval;
LONGREAL realval; LONGREAL realval;
} OPT_ConstDesc; } OPT_ConstDesc;
@ -2008,7 +2008,7 @@ static void EnumPtrs(void (*P)(void*))
__ENUMR(&OPT_impCtxt, OPT_ImpCtxt__typ, 3140, 1, P); __ENUMR(&OPT_impCtxt, OPT_ImpCtxt__typ, 3140, 1, P);
} }
__TDESC(OPT_ConstDesc, 1, 1) = {__TDFLDS("ConstDesc", 32), {0, -8}}; __TDESC(OPT_ConstDesc, 1, 1) = {__TDFLDS("ConstDesc", 40), {0, -8}};
__TDESC(OPT_ObjDesc, 1, 6) = {__TDFLDS("ObjDesc", 304), {0, 4, 8, 12, 284, 288, -28}}; __TDESC(OPT_ObjDesc, 1, 6) = {__TDFLDS("ObjDesc", 304), {0, 4, 8, 12, 284, 288, -28}};
__TDESC(OPT_StrDesc, 1, 3) = {__TDFLDS("StrDesc", 56), {44, 48, 52, -16}}; __TDESC(OPT_StrDesc, 1, 3) = {__TDFLDS("StrDesc", 56), {44, 48, 52, -16}};
__TDESC(OPT_NodeDesc, 1, 6) = {__TDFLDS("NodeDesc", 28), {0, 4, 8, 16, 20, 24, -28}}; __TDESC(OPT_NodeDesc, 1, 6) = {__TDFLDS("NodeDesc", 28), {0, 4, 8, 16, 20, 24, -28}};

2
bootstrap/unix-48/OPT.h
View file

@ -17,7 +17,7 @@ typedef
OPT_ConstExt ext; OPT_ConstExt ext;
int64 intval; int64 intval;
int32 intval2; int32 intval2;
uint32 setval; uint64 setval;
LONGREAL realval; LONGREAL realval;
} OPT_ConstDesc; } OPT_ConstDesc;

2
bootstrap/unix-48/OPV.c
View file

@ -72,7 +72,7 @@ static void OPV_GetTProcNum (OPT_Object obj)
OPT_FindField(obj->name, typ->BaseTyp, &redef); OPT_FindField(obj->name, typ->BaseTyp, &redef);
if (redef != NIL) { if (redef != NIL) {
obj->adr = __ASHL(__ASHR(redef->adr, 16), 16); obj->adr = __ASHL(__ASHR(redef->adr, 16), 16);
if (!__IN(2, obj->conval->setval, 32)) { if (!__IN(2, obj->conval->setval, 64)) {
OPM_err(119); OPM_err(119);
} }
} else { } else {

4
bootstrap/unix-88/OPB.c
View file

@ -471,7 +471,7 @@ void OPB_In (OPT_Node *x, OPT_Node y)
if (k < 0 || k > (int64)OPM_MaxSet) { if (k < 0 || k > (int64)OPM_MaxSet) {
OPB_err(202); OPB_err(202);
} else if (y->class == 7) { } else if (y->class == 7) {
(*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 32)); (*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 64));
(*x)->obj = NIL; (*x)->obj = NIL;
} else { } else {
OPB_BindNodes(12, OPT_booltyp, &*x, y); OPB_BindNodes(12, OPT_booltyp, &*x, y);
@ -2483,7 +2483,7 @@ void OPB_StaticLink (int8 dlev)
scope = OPT_topScope; scope = OPT_topScope;
while (dlev > 0) { while (dlev > 0) {
dlev -= 1; dlev -= 1;
scope->link->conval->setval |= __SETOF(3,32); scope->link->conval->setval |= __SETOF(3,64);
scope = scope->left; scope = scope->left;
} }
} }

18
bootstrap/unix-88/OPM.c
View file

@ -53,7 +53,7 @@ export void OPM_DeleteNewSym (void);
export void OPM_FPrint (int32 *fp, int64 val); export void OPM_FPrint (int32 *fp, int64 val);
export void OPM_FPrintLReal (int32 *fp, LONGREAL lr); export void OPM_FPrintLReal (int32 *fp, LONGREAL lr);
export void OPM_FPrintReal (int32 *fp, REAL real); export void OPM_FPrintReal (int32 *fp, REAL real);
export void OPM_FPrintSet (int32 *fp, uint32 set); export void OPM_FPrintSet (int32 *fp, uint64 set);
static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos); static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos);
export void OPM_Get (CHAR *ch); export void OPM_Get (CHAR *ch);
export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
@ -81,12 +81,12 @@ export int32 OPM_SymRInt (void);
export int64 OPM_SymRInt64 (void); export int64 OPM_SymRInt64 (void);
export void OPM_SymRLReal (LONGREAL *lr); export void OPM_SymRLReal (LONGREAL *lr);
export void OPM_SymRReal (REAL *r); export void OPM_SymRReal (REAL *r);
export void OPM_SymRSet (uint32 *s); export void OPM_SymRSet (uint64 *s);
export void OPM_SymWCh (CHAR ch); export void OPM_SymWCh (CHAR ch);
export void OPM_SymWInt (int64 i); export void OPM_SymWInt (int64 i);
export void OPM_SymWLReal (LONGREAL lr); export void OPM_SymWLReal (LONGREAL lr);
export void OPM_SymWReal (REAL r); export void OPM_SymWReal (REAL r);
export void OPM_SymWSet (uint32 s); export void OPM_SymWSet (uint64 s);
static void OPM_VerboseListSizes (void); static void OPM_VerboseListSizes (void);
export void OPM_Write (CHAR ch); export void OPM_Write (CHAR ch);
export void OPM_WriteHex (int64 i); export void OPM_WriteHex (int64 i);
@ -713,9 +713,9 @@ void OPM_FPrint (int32 *fp, int64 val)
*fp = __ROTL((int32)((uint32)*fp ^ __VAL(uint32, val)), 1, 32); *fp = __ROTL((int32)((uint32)*fp ^ __VAL(uint32, val)), 1, 32);
} }
void OPM_FPrintSet (int32 *fp, uint32 set) void OPM_FPrintSet (int32 *fp, uint64 set)
{ {
OPM_FPrint(&*fp, (int32)set); OPM_FPrint(&*fp, __VAL(int32, set));
} }
void OPM_FPrintReal (int32 *fp, REAL real) void OPM_FPrintReal (int32 *fp, REAL real)
@ -758,9 +758,9 @@ int64 OPM_SymRInt64 (void)
return _o_result; return _o_result;
} }
void OPM_SymRSet (uint32 *s) void OPM_SymRSet (uint64 *s)
{ {
Files_ReadNum(&OPM_oldSF, Files_Rider__typ, (void*)&*s, 4); Files_ReadNum(&OPM_oldSF, Files_Rider__typ, (void*)&*s, 8);
} }
void OPM_SymRReal (REAL *r) void OPM_SymRReal (REAL *r)
@ -812,9 +812,9 @@ void OPM_SymWInt (int64 i)
Files_WriteNum(&OPM_newSF, Files_Rider__typ, i); Files_WriteNum(&OPM_newSF, Files_Rider__typ, i);
} }
void OPM_SymWSet (uint32 s) void OPM_SymWSet (uint64 s)
{ {
Files_WriteNum(&OPM_newSF, Files_Rider__typ, (int32)s); Files_WriteNum(&OPM_newSF, Files_Rider__typ, (int64)s);
} }
void OPM_SymWReal (REAL r) void OPM_SymWReal (REAL r)

6
bootstrap/unix-88/OPM.h
View file

@ -26,7 +26,7 @@ import void OPM_DeleteNewSym (void);
import void OPM_FPrint (int32 *fp, int64 val); import void OPM_FPrint (int32 *fp, int64 val);
import void OPM_FPrintLReal (int32 *fp, LONGREAL lr); import void OPM_FPrintLReal (int32 *fp, LONGREAL lr);
import void OPM_FPrintReal (int32 *fp, REAL real); import void OPM_FPrintReal (int32 *fp, REAL real);
import void OPM_FPrintSet (int32 *fp, uint32 set); import void OPM_FPrintSet (int32 *fp, uint64 set);
import void OPM_Get (CHAR *ch); import void OPM_Get (CHAR *ch);
import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
import void OPM_InitOptions (void); import void OPM_InitOptions (void);
@ -49,12 +49,12 @@ import int32 OPM_SymRInt (void);
import int64 OPM_SymRInt64 (void); import int64 OPM_SymRInt64 (void);
import void OPM_SymRLReal (LONGREAL *lr); import void OPM_SymRLReal (LONGREAL *lr);
import void OPM_SymRReal (REAL *r); import void OPM_SymRReal (REAL *r);
import void OPM_SymRSet (uint32 *s); import void OPM_SymRSet (uint64 *s);
import void OPM_SymWCh (CHAR ch); import void OPM_SymWCh (CHAR ch);
import void OPM_SymWInt (int64 i); import void OPM_SymWInt (int64 i);
import void OPM_SymWLReal (LONGREAL lr); import void OPM_SymWLReal (LONGREAL lr);
import void OPM_SymWReal (REAL r); import void OPM_SymWReal (REAL r);
import void OPM_SymWSet (uint32 s); import void OPM_SymWSet (uint64 s);
import void OPM_Write (CHAR ch); import void OPM_Write (CHAR ch);
import void OPM_WriteHex (int64 i); import void OPM_WriteHex (int64 i);
import void OPM_WriteInt (int64 i); import void OPM_WriteInt (int64 i);

10
bootstrap/unix-88/OPP.c
View file

@ -967,7 +967,7 @@ static void GetCode__19 (void)
} }
} }
} }
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,64);
} }
static void GetParams__21 (void) static void GetParams__21 (void)
@ -999,7 +999,7 @@ static void Body__17 (void)
OPT_Node procdec = NIL, statseq = NIL; OPT_Node procdec = NIL, statseq = NIL;
int32 c; int32 c;
c = OPM_errpos; c = OPM_errpos;
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,64);
OPP_CheckSym(39); OPP_CheckSym(39);
OPP_Block(&procdec, &statseq); OPP_Block(&procdec, &statseq);
OPB_Enter(&procdec, statseq, *ProcedureDeclaration__16_s->proc); OPB_Enter(&procdec, statseq, *ProcedureDeclaration__16_s->proc);
@ -1042,7 +1042,7 @@ static void TProcDecl__23 (void)
if ((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mnolev != OPP_level)) { if ((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mnolev != OPP_level)) {
*ProcedureDeclaration__16_s->fwd = NIL; *ProcedureDeclaration__16_s->fwd = NIL;
} }
if ((((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mode == 13)) && !__IN(1, (*ProcedureDeclaration__16_s->fwd)->conval->setval, 32))) { if ((((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mode == 13)) && !__IN(1, (*ProcedureDeclaration__16_s->fwd)->conval->setval, 64))) {
*ProcedureDeclaration__16_s->proc = OPT_NewObj(); *ProcedureDeclaration__16_s->proc = OPT_NewObj();
(*ProcedureDeclaration__16_s->proc)->leaf = 1; (*ProcedureDeclaration__16_s->proc)->leaf = 1;
if ((*ProcedureDeclaration__16_s->fwd)->vis != *ProcedureDeclaration__16_s->vis) { if ((*ProcedureDeclaration__16_s->fwd)->vis != *ProcedureDeclaration__16_s->vis) {
@ -1076,7 +1076,7 @@ static void TProcDecl__23 (void)
if ((((((baseProc->vis == 1 && (*ProcedureDeclaration__16_s->proc)->vis == 0)) && recTyp->strobj != NIL)) && recTyp->strobj->vis == 1)) { if ((((((baseProc->vis == 1 && (*ProcedureDeclaration__16_s->proc)->vis == 0)) && recTyp->strobj != NIL)) && recTyp->strobj->vis == 1)) {
OPP_err(109); OPP_err(109);
} }
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(2,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(2,64);
} }
if (!*ProcedureDeclaration__16_s->forward) { if (!*ProcedureDeclaration__16_s->forward) {
Body__17(); Body__17();
@ -1136,7 +1136,7 @@ static void OPP_ProcedureDeclaration (OPT_Node *x)
if ((fwd != NIL && (fwd->mnolev != OPP_level || fwd->mode == 8))) { if ((fwd != NIL && (fwd->mnolev != OPP_level || fwd->mode == 8))) {
fwd = NIL; fwd = NIL;
} }
if ((((fwd != NIL && __IN(fwd->mode, 0xc0, 32))) && !__IN(1, fwd->conval->setval, 32))) { if ((((fwd != NIL && __IN(fwd->mode, 0xc0, 32))) && !__IN(1, fwd->conval->setval, 64))) {
proc = OPT_NewObj(); proc = OPT_NewObj();
proc->leaf = 1; proc->leaf = 1;
if (fwd->vis != vis) { if (fwd->vis != vis) {

4
bootstrap/unix-88/OPT.c
View file

@ -20,7 +20,7 @@ typedef
OPT_ConstExt ext; OPT_ConstExt ext;
int64 intval; int64 intval;
int32 intval2; int32 intval2;
uint32 setval; uint64 setval;
LONGREAL realval; LONGREAL realval;
} OPT_ConstDesc; } OPT_ConstDesc;
@ -2008,7 +2008,7 @@ static void EnumPtrs(void (*P)(void*))
__ENUMR(&OPT_impCtxt, OPT_ImpCtxt__typ, 5184, 1, P); __ENUMR(&OPT_impCtxt, OPT_ImpCtxt__typ, 5184, 1, P);
} }
__TDESC(OPT_ConstDesc, 1, 1) = {__TDFLDS("ConstDesc", 32), {0, -16}}; __TDESC(OPT_ConstDesc, 1, 1) = {__TDFLDS("ConstDesc", 40), {0, -16}};
__TDESC(OPT_ObjDesc, 1, 6) = {__TDFLDS("ObjDesc", 336), {0, 8, 16, 24, 304, 312, -56}}; __TDESC(OPT_ObjDesc, 1, 6) = {__TDFLDS("ObjDesc", 336), {0, 8, 16, 24, 304, 312, -56}};
__TDESC(OPT_StrDesc, 1, 3) = {__TDFLDS("StrDesc", 72), {48, 56, 64, -32}}; __TDESC(OPT_StrDesc, 1, 3) = {__TDFLDS("StrDesc", 72), {48, 56, 64, -32}};
__TDESC(OPT_NodeDesc, 1, 6) = {__TDFLDS("NodeDesc", 56), {0, 8, 16, 32, 40, 48, -56}}; __TDESC(OPT_NodeDesc, 1, 6) = {__TDFLDS("NodeDesc", 56), {0, 8, 16, 32, 40, 48, -56}};

2
bootstrap/unix-88/OPT.h
View file

@ -17,7 +17,7 @@ typedef
OPT_ConstExt ext; OPT_ConstExt ext;
int64 intval; int64 intval;
int32 intval2; int32 intval2;
uint32 setval; uint64 setval;
LONGREAL realval; LONGREAL realval;
} OPT_ConstDesc; } OPT_ConstDesc;

2
bootstrap/unix-88/OPV.c
View file

@ -72,7 +72,7 @@ static void OPV_GetTProcNum (OPT_Object obj)
OPT_FindField(obj->name, typ->BaseTyp, &redef); OPT_FindField(obj->name, typ->BaseTyp, &redef);
if (redef != NIL) { if (redef != NIL) {
obj->adr = __ASHL(__ASHR(redef->adr, 16), 16); obj->adr = __ASHL(__ASHR(redef->adr, 16), 16);
if (!__IN(2, obj->conval->setval, 32)) { if (!__IN(2, obj->conval->setval, 64)) {
OPM_err(119); OPM_err(119);
} }
} else { } else {

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

@ -471,7 +471,7 @@ void OPB_In (OPT_Node *x, OPT_Node y)
if (k < 0 || k > (int64)OPM_MaxSet) { if (k < 0 || k > (int64)OPM_MaxSet) {
OPB_err(202); OPB_err(202);
} else if (y->class == 7) { } else if (y->class == 7) {
(*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 32)); (*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 64));
(*x)->obj = NIL; (*x)->obj = NIL;
} else { } else {
OPB_BindNodes(12, OPT_booltyp, &*x, y); OPB_BindNodes(12, OPT_booltyp, &*x, y);
@ -2483,7 +2483,7 @@ void OPB_StaticLink (int8 dlev)
scope = OPT_topScope; scope = OPT_topScope;
while (dlev > 0) { while (dlev > 0) {
dlev -= 1; dlev -= 1;
scope->link->conval->setval |= __SETOF(3,32); scope->link->conval->setval |= __SETOF(3,64);
scope = scope->left; scope = scope->left;
} }
} }

18
bootstrap/windows-48/OPM.c
View file

@ -53,7 +53,7 @@ export void OPM_DeleteNewSym (void);
export void OPM_FPrint (int32 *fp, int64 val); export void OPM_FPrint (int32 *fp, int64 val);
export void OPM_FPrintLReal (int32 *fp, LONGREAL lr); export void OPM_FPrintLReal (int32 *fp, LONGREAL lr);
export void OPM_FPrintReal (int32 *fp, REAL real); export void OPM_FPrintReal (int32 *fp, REAL real);
export void OPM_FPrintSet (int32 *fp, uint32 set); export void OPM_FPrintSet (int32 *fp, uint64 set);
static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos); static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos);
export void OPM_Get (CHAR *ch); export void OPM_Get (CHAR *ch);
export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
@ -81,12 +81,12 @@ export int32 OPM_SymRInt (void);
export int64 OPM_SymRInt64 (void); export int64 OPM_SymRInt64 (void);
export void OPM_SymRLReal (LONGREAL *lr); export void OPM_SymRLReal (LONGREAL *lr);
export void OPM_SymRReal (REAL *r); export void OPM_SymRReal (REAL *r);
export void OPM_SymRSet (uint32 *s); export void OPM_SymRSet (uint64 *s);
export void OPM_SymWCh (CHAR ch); export void OPM_SymWCh (CHAR ch);
export void OPM_SymWInt (int64 i); export void OPM_SymWInt (int64 i);
export void OPM_SymWLReal (LONGREAL lr); export void OPM_SymWLReal (LONGREAL lr);
export void OPM_SymWReal (REAL r); export void OPM_SymWReal (REAL r);
export void OPM_SymWSet (uint32 s); export void OPM_SymWSet (uint64 s);
static void OPM_VerboseListSizes (void); static void OPM_VerboseListSizes (void);
export void OPM_Write (CHAR ch); export void OPM_Write (CHAR ch);
export void OPM_WriteHex (int64 i); export void OPM_WriteHex (int64 i);
@ -713,9 +713,9 @@ void OPM_FPrint (int32 *fp, int64 val)
*fp = __ROTL((int32)((uint32)*fp ^ __VAL(uint32, val)), 1, 32); *fp = __ROTL((int32)((uint32)*fp ^ __VAL(uint32, val)), 1, 32);
} }
void OPM_FPrintSet (int32 *fp, uint32 set) void OPM_FPrintSet (int32 *fp, uint64 set)
{ {
OPM_FPrint(&*fp, (int32)set); OPM_FPrint(&*fp, __VAL(int32, set));
} }
void OPM_FPrintReal (int32 *fp, REAL real) void OPM_FPrintReal (int32 *fp, REAL real)
@ -758,9 +758,9 @@ int64 OPM_SymRInt64 (void)
return _o_result; return _o_result;
} }
void OPM_SymRSet (uint32 *s) void OPM_SymRSet (uint64 *s)
{ {
Files_ReadNum(&OPM_oldSF, Files_Rider__typ, (void*)&*s, 4); Files_ReadNum(&OPM_oldSF, Files_Rider__typ, (void*)&*s, 8);
} }
void OPM_SymRReal (REAL *r) void OPM_SymRReal (REAL *r)
@ -812,9 +812,9 @@ void OPM_SymWInt (int64 i)
Files_WriteNum(&OPM_newSF, Files_Rider__typ, i); Files_WriteNum(&OPM_newSF, Files_Rider__typ, i);
} }
void OPM_SymWSet (uint32 s) void OPM_SymWSet (uint64 s)
{ {
Files_WriteNum(&OPM_newSF, Files_Rider__typ, (int32)s); Files_WriteNum(&OPM_newSF, Files_Rider__typ, (int64)s);
} }
void OPM_SymWReal (REAL r) void OPM_SymWReal (REAL r)

6
bootstrap/windows-48/OPM.h
View file

@ -26,7 +26,7 @@ import void OPM_DeleteNewSym (void);
import void OPM_FPrint (int32 *fp, int64 val); import void OPM_FPrint (int32 *fp, int64 val);
import void OPM_FPrintLReal (int32 *fp, LONGREAL lr); import void OPM_FPrintLReal (int32 *fp, LONGREAL lr);
import void OPM_FPrintReal (int32 *fp, REAL real); import void OPM_FPrintReal (int32 *fp, REAL real);
import void OPM_FPrintSet (int32 *fp, uint32 set); import void OPM_FPrintSet (int32 *fp, uint64 set);
import void OPM_Get (CHAR *ch); import void OPM_Get (CHAR *ch);
import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
import void OPM_InitOptions (void); import void OPM_InitOptions (void);
@ -49,12 +49,12 @@ import int32 OPM_SymRInt (void);
import int64 OPM_SymRInt64 (void); import int64 OPM_SymRInt64 (void);
import void OPM_SymRLReal (LONGREAL *lr); import void OPM_SymRLReal (LONGREAL *lr);
import void OPM_SymRReal (REAL *r); import void OPM_SymRReal (REAL *r);
import void OPM_SymRSet (uint32 *s); import void OPM_SymRSet (uint64 *s);
import void OPM_SymWCh (CHAR ch); import void OPM_SymWCh (CHAR ch);
import void OPM_SymWInt (int64 i); import void OPM_SymWInt (int64 i);
import void OPM_SymWLReal (LONGREAL lr); import void OPM_SymWLReal (LONGREAL lr);
import void OPM_SymWReal (REAL r); import void OPM_SymWReal (REAL r);
import void OPM_SymWSet (uint32 s); import void OPM_SymWSet (uint64 s);
import void OPM_Write (CHAR ch); import void OPM_Write (CHAR ch);
import void OPM_WriteHex (int64 i); import void OPM_WriteHex (int64 i);
import void OPM_WriteInt (int64 i); import void OPM_WriteInt (int64 i);

10
bootstrap/windows-48/OPP.c
View file

@ -967,7 +967,7 @@ static void GetCode__19 (void)
} }
} }
} }
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,64);
} }
static void GetParams__21 (void) static void GetParams__21 (void)
@ -999,7 +999,7 @@ static void Body__17 (void)
OPT_Node procdec = NIL, statseq = NIL; OPT_Node procdec = NIL, statseq = NIL;
int32 c; int32 c;
c = OPM_errpos; c = OPM_errpos;
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,64);
OPP_CheckSym(39); OPP_CheckSym(39);
OPP_Block(&procdec, &statseq); OPP_Block(&procdec, &statseq);
OPB_Enter(&procdec, statseq, *ProcedureDeclaration__16_s->proc); OPB_Enter(&procdec, statseq, *ProcedureDeclaration__16_s->proc);
@ -1042,7 +1042,7 @@ static void TProcDecl__23 (void)
if ((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mnolev != OPP_level)) { if ((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mnolev != OPP_level)) {
*ProcedureDeclaration__16_s->fwd = NIL; *ProcedureDeclaration__16_s->fwd = NIL;
} }
if ((((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mode == 13)) && !__IN(1, (*ProcedureDeclaration__16_s->fwd)->conval->setval, 32))) { if ((((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mode == 13)) && !__IN(1, (*ProcedureDeclaration__16_s->fwd)->conval->setval, 64))) {
*ProcedureDeclaration__16_s->proc = OPT_NewObj(); *ProcedureDeclaration__16_s->proc = OPT_NewObj();
(*ProcedureDeclaration__16_s->proc)->leaf = 1; (*ProcedureDeclaration__16_s->proc)->leaf = 1;
if ((*ProcedureDeclaration__16_s->fwd)->vis != *ProcedureDeclaration__16_s->vis) { if ((*ProcedureDeclaration__16_s->fwd)->vis != *ProcedureDeclaration__16_s->vis) {
@ -1076,7 +1076,7 @@ static void TProcDecl__23 (void)
if ((((((baseProc->vis == 1 && (*ProcedureDeclaration__16_s->proc)->vis == 0)) && recTyp->strobj != NIL)) && recTyp->strobj->vis == 1)) { if ((((((baseProc->vis == 1 && (*ProcedureDeclaration__16_s->proc)->vis == 0)) && recTyp->strobj != NIL)) && recTyp->strobj->vis == 1)) {
OPP_err(109); OPP_err(109);
} }
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(2,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(2,64);
} }
if (!*ProcedureDeclaration__16_s->forward) { if (!*ProcedureDeclaration__16_s->forward) {
Body__17(); Body__17();
@ -1136,7 +1136,7 @@ static void OPP_ProcedureDeclaration (OPT_Node *x)
if ((fwd != NIL && (fwd->mnolev != OPP_level || fwd->mode == 8))) { if ((fwd != NIL && (fwd->mnolev != OPP_level || fwd->mode == 8))) {
fwd = NIL; fwd = NIL;
} }
if ((((fwd != NIL && __IN(fwd->mode, 0xc0, 32))) && !__IN(1, fwd->conval->setval, 32))) { if ((((fwd != NIL && __IN(fwd->mode, 0xc0, 32))) && !__IN(1, fwd->conval->setval, 64))) {
proc = OPT_NewObj(); proc = OPT_NewObj();
proc->leaf = 1; proc->leaf = 1;
if (fwd->vis != vis) { if (fwd->vis != vis) {

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

@ -20,7 +20,7 @@ typedef
OPT_ConstExt ext; OPT_ConstExt ext;
int64 intval; int64 intval;
int32 intval2; int32 intval2;
uint32 setval; uint64 setval;
LONGREAL realval; LONGREAL realval;
} OPT_ConstDesc; } OPT_ConstDesc;
@ -2008,7 +2008,7 @@ static void EnumPtrs(void (*P)(void*))
__ENUMR(&OPT_impCtxt, OPT_ImpCtxt__typ, 3140, 1, P); __ENUMR(&OPT_impCtxt, OPT_ImpCtxt__typ, 3140, 1, P);
} }
__TDESC(OPT_ConstDesc, 1, 1) = {__TDFLDS("ConstDesc", 32), {0, -8}}; __TDESC(OPT_ConstDesc, 1, 1) = {__TDFLDS("ConstDesc", 40), {0, -8}};
__TDESC(OPT_ObjDesc, 1, 6) = {__TDFLDS("ObjDesc", 304), {0, 4, 8, 12, 284, 288, -28}}; __TDESC(OPT_ObjDesc, 1, 6) = {__TDFLDS("ObjDesc", 304), {0, 4, 8, 12, 284, 288, -28}};
__TDESC(OPT_StrDesc, 1, 3) = {__TDFLDS("StrDesc", 56), {44, 48, 52, -16}}; __TDESC(OPT_StrDesc, 1, 3) = {__TDFLDS("StrDesc", 56), {44, 48, 52, -16}};
__TDESC(OPT_NodeDesc, 1, 6) = {__TDFLDS("NodeDesc", 28), {0, 4, 8, 16, 20, 24, -28}}; __TDESC(OPT_NodeDesc, 1, 6) = {__TDFLDS("NodeDesc", 28), {0, 4, 8, 16, 20, 24, -28}};

2
bootstrap/windows-48/OPT.h
View file

@ -17,7 +17,7 @@ typedef
OPT_ConstExt ext; OPT_ConstExt ext;
int64 intval; int64 intval;
int32 intval2; int32 intval2;
uint32 setval; uint64 setval;
LONGREAL realval; LONGREAL realval;
} OPT_ConstDesc; } OPT_ConstDesc;

2
bootstrap/windows-48/OPV.c
View file

@ -72,7 +72,7 @@ static void OPV_GetTProcNum (OPT_Object obj)
OPT_FindField(obj->name, typ->BaseTyp, &redef); OPT_FindField(obj->name, typ->BaseTyp, &redef);
if (redef != NIL) { if (redef != NIL) {
obj->adr = __ASHL(__ASHR(redef->adr, 16), 16); obj->adr = __ASHL(__ASHR(redef->adr, 16), 16);
if (!__IN(2, obj->conval->setval, 32)) { if (!__IN(2, obj->conval->setval, 64)) {
OPM_err(119); OPM_err(119);
} }
} else { } else {

4
bootstrap/windows-88/OPB.c
View file

@ -471,7 +471,7 @@ void OPB_In (OPT_Node *x, OPT_Node y)
if (k < 0 || k > (int64)OPM_MaxSet) { if (k < 0 || k > (int64)OPM_MaxSet) {
OPB_err(202); OPB_err(202);
} else if (y->class == 7) { } else if (y->class == 7) {
(*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 32)); (*x)->conval->intval = OPB_BoolToInt(__IN(k, y->conval->setval, 64));
(*x)->obj = NIL; (*x)->obj = NIL;
} else { } else {
OPB_BindNodes(12, OPT_booltyp, &*x, y); OPB_BindNodes(12, OPT_booltyp, &*x, y);
@ -2483,7 +2483,7 @@ void OPB_StaticLink (int8 dlev)
scope = OPT_topScope; scope = OPT_topScope;
while (dlev > 0) { while (dlev > 0) {
dlev -= 1; dlev -= 1;
scope->link->conval->setval |= __SETOF(3,32); scope->link->conval->setval |= __SETOF(3,64);
scope = scope->left; scope = scope->left;
} }
} }

18
bootstrap/windows-88/OPM.c
View file

@ -53,7 +53,7 @@ export void OPM_DeleteNewSym (void);
export void OPM_FPrint (int32 *fp, int64 val); export void OPM_FPrint (int32 *fp, int64 val);
export void OPM_FPrintLReal (int32 *fp, LONGREAL lr); export void OPM_FPrintLReal (int32 *fp, LONGREAL lr);
export void OPM_FPrintReal (int32 *fp, REAL real); export void OPM_FPrintReal (int32 *fp, REAL real);
export void OPM_FPrintSet (int32 *fp, uint32 set); export void OPM_FPrintSet (int32 *fp, uint64 set);
static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos); static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos);
export void OPM_Get (CHAR *ch); export void OPM_Get (CHAR *ch);
export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
@ -81,12 +81,12 @@ export int32 OPM_SymRInt (void);
export int64 OPM_SymRInt64 (void); export int64 OPM_SymRInt64 (void);
export void OPM_SymRLReal (LONGREAL *lr); export void OPM_SymRLReal (LONGREAL *lr);
export void OPM_SymRReal (REAL *r); export void OPM_SymRReal (REAL *r);
export void OPM_SymRSet (uint32 *s); export void OPM_SymRSet (uint64 *s);
export void OPM_SymWCh (CHAR ch); export void OPM_SymWCh (CHAR ch);
export void OPM_SymWInt (int64 i); export void OPM_SymWInt (int64 i);
export void OPM_SymWLReal (LONGREAL lr); export void OPM_SymWLReal (LONGREAL lr);
export void OPM_SymWReal (REAL r); export void OPM_SymWReal (REAL r);
export void OPM_SymWSet (uint32 s); export void OPM_SymWSet (uint64 s);
static void OPM_VerboseListSizes (void); static void OPM_VerboseListSizes (void);
export void OPM_Write (CHAR ch); export void OPM_Write (CHAR ch);
export void OPM_WriteHex (int64 i); export void OPM_WriteHex (int64 i);
@ -713,9 +713,9 @@ void OPM_FPrint (int32 *fp, int64 val)
*fp = __ROTL((int32)((uint32)*fp ^ __VAL(uint32, val)), 1, 32); *fp = __ROTL((int32)((uint32)*fp ^ __VAL(uint32, val)), 1, 32);
} }
void OPM_FPrintSet (int32 *fp, uint32 set) void OPM_FPrintSet (int32 *fp, uint64 set)
{ {
OPM_FPrint(&*fp, (int32)set); OPM_FPrint(&*fp, __VAL(int32, set));
} }
void OPM_FPrintReal (int32 *fp, REAL real) void OPM_FPrintReal (int32 *fp, REAL real)
@ -758,9 +758,9 @@ int64 OPM_SymRInt64 (void)
return _o_result; return _o_result;
} }
void OPM_SymRSet (uint32 *s) void OPM_SymRSet (uint64 *s)
{ {
Files_ReadNum(&OPM_oldSF, Files_Rider__typ, (void*)&*s, 4); Files_ReadNum(&OPM_oldSF, Files_Rider__typ, (void*)&*s, 8);
} }
void OPM_SymRReal (REAL *r) void OPM_SymRReal (REAL *r)
@ -812,9 +812,9 @@ void OPM_SymWInt (int64 i)
Files_WriteNum(&OPM_newSF, Files_Rider__typ, i); Files_WriteNum(&OPM_newSF, Files_Rider__typ, i);
} }
void OPM_SymWSet (uint32 s) void OPM_SymWSet (uint64 s)
{ {
Files_WriteNum(&OPM_newSF, Files_Rider__typ, (int32)s); Files_WriteNum(&OPM_newSF, Files_Rider__typ, (int64)s);
} }
void OPM_SymWReal (REAL r) void OPM_SymWReal (REAL r)

6
bootstrap/windows-88/OPM.h
View file

@ -26,7 +26,7 @@ import void OPM_DeleteNewSym (void);
import void OPM_FPrint (int32 *fp, int64 val); import void OPM_FPrint (int32 *fp, int64 val);
import void OPM_FPrintLReal (int32 *fp, LONGREAL lr); import void OPM_FPrintLReal (int32 *fp, LONGREAL lr);
import void OPM_FPrintReal (int32 *fp, REAL real); import void OPM_FPrintReal (int32 *fp, REAL real);
import void OPM_FPrintSet (int32 *fp, uint32 set); import void OPM_FPrintSet (int32 *fp, uint64 set);
import void OPM_Get (CHAR *ch); import void OPM_Get (CHAR *ch);
import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
import void OPM_InitOptions (void); import void OPM_InitOptions (void);
@ -49,12 +49,12 @@ import int32 OPM_SymRInt (void);
import int64 OPM_SymRInt64 (void); import int64 OPM_SymRInt64 (void);
import void OPM_SymRLReal (LONGREAL *lr); import void OPM_SymRLReal (LONGREAL *lr);
import void OPM_SymRReal (REAL *r); import void OPM_SymRReal (REAL *r);
import void OPM_SymRSet (uint32 *s); import void OPM_SymRSet (uint64 *s);
import void OPM_SymWCh (CHAR ch); import void OPM_SymWCh (CHAR ch);
import void OPM_SymWInt (int64 i); import void OPM_SymWInt (int64 i);
import void OPM_SymWLReal (LONGREAL lr); import void OPM_SymWLReal (LONGREAL lr);
import void OPM_SymWReal (REAL r); import void OPM_SymWReal (REAL r);
import void OPM_SymWSet (uint32 s); import void OPM_SymWSet (uint64 s);
import void OPM_Write (CHAR ch); import void OPM_Write (CHAR ch);
import void OPM_WriteHex (int64 i); import void OPM_WriteHex (int64 i);
import void OPM_WriteInt (int64 i); import void OPM_WriteInt (int64 i);

10
bootstrap/windows-88/OPP.c
View file

@ -967,7 +967,7 @@ static void GetCode__19 (void)
} }
} }
} }
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,64);
} }
static void GetParams__21 (void) static void GetParams__21 (void)
@ -999,7 +999,7 @@ static void Body__17 (void)
OPT_Node procdec = NIL, statseq = NIL; OPT_Node procdec = NIL, statseq = NIL;
int32 c; int32 c;
c = OPM_errpos; c = OPM_errpos;
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(1,64);
OPP_CheckSym(39); OPP_CheckSym(39);
OPP_Block(&procdec, &statseq); OPP_Block(&procdec, &statseq);
OPB_Enter(&procdec, statseq, *ProcedureDeclaration__16_s->proc); OPB_Enter(&procdec, statseq, *ProcedureDeclaration__16_s->proc);
@ -1042,7 +1042,7 @@ static void TProcDecl__23 (void)
if ((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mnolev != OPP_level)) { if ((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mnolev != OPP_level)) {
*ProcedureDeclaration__16_s->fwd = NIL; *ProcedureDeclaration__16_s->fwd = NIL;
} }
if ((((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mode == 13)) && !__IN(1, (*ProcedureDeclaration__16_s->fwd)->conval->setval, 32))) { if ((((*ProcedureDeclaration__16_s->fwd != NIL && (*ProcedureDeclaration__16_s->fwd)->mode == 13)) && !__IN(1, (*ProcedureDeclaration__16_s->fwd)->conval->setval, 64))) {
*ProcedureDeclaration__16_s->proc = OPT_NewObj(); *ProcedureDeclaration__16_s->proc = OPT_NewObj();
(*ProcedureDeclaration__16_s->proc)->leaf = 1; (*ProcedureDeclaration__16_s->proc)->leaf = 1;
if ((*ProcedureDeclaration__16_s->fwd)->vis != *ProcedureDeclaration__16_s->vis) { if ((*ProcedureDeclaration__16_s->fwd)->vis != *ProcedureDeclaration__16_s->vis) {
@ -1076,7 +1076,7 @@ static void TProcDecl__23 (void)
if ((((((baseProc->vis == 1 && (*ProcedureDeclaration__16_s->proc)->vis == 0)) && recTyp->strobj != NIL)) && recTyp->strobj->vis == 1)) { if ((((((baseProc->vis == 1 && (*ProcedureDeclaration__16_s->proc)->vis == 0)) && recTyp->strobj != NIL)) && recTyp->strobj->vis == 1)) {
OPP_err(109); OPP_err(109);
} }
(*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(2,32); (*ProcedureDeclaration__16_s->proc)->conval->setval |= __SETOF(2,64);
} }
if (!*ProcedureDeclaration__16_s->forward) { if (!*ProcedureDeclaration__16_s->forward) {
Body__17(); Body__17();
@ -1136,7 +1136,7 @@ static void OPP_ProcedureDeclaration (OPT_Node *x)
if ((fwd != NIL && (fwd->mnolev != OPP_level || fwd->mode == 8))) { if ((fwd != NIL && (fwd->mnolev != OPP_level || fwd->mode == 8))) {
fwd = NIL; fwd = NIL;
} }
if ((((fwd != NIL && __IN(fwd->mode, 0xc0, 32))) && !__IN(1, fwd->conval->setval, 32))) { if ((((fwd != NIL && __IN(fwd->mode, 0xc0, 32))) && !__IN(1, fwd->conval->setval, 64))) {
proc = OPT_NewObj(); proc = OPT_NewObj();
proc->leaf = 1; proc->leaf = 1;
if (fwd->vis != vis) { if (fwd->vis != vis) {

4
bootstrap/windows-88/OPT.c
View file

@ -20,7 +20,7 @@ typedef
OPT_ConstExt ext; OPT_ConstExt ext;
int64 intval; int64 intval;
int32 intval2; int32 intval2;
uint32 setval; uint64 setval;
LONGREAL realval; LONGREAL realval;
} OPT_ConstDesc; } OPT_ConstDesc;
@ -2008,7 +2008,7 @@ static void EnumPtrs(void (*P)(void*))
__ENUMR(&OPT_impCtxt, OPT_ImpCtxt__typ, 5184, 1, P); __ENUMR(&OPT_impCtxt, OPT_ImpCtxt__typ, 5184, 1, P);
} }
__TDESC(OPT_ConstDesc, 1, 1) = {__TDFLDS("ConstDesc", 32), {0, -16}}; __TDESC(OPT_ConstDesc, 1, 1) = {__TDFLDS("ConstDesc", 40), {0, -16}};
__TDESC(OPT_ObjDesc, 1, 6) = {__TDFLDS("ObjDesc", 336), {0, 8, 16, 24, 304, 312, -56}}; __TDESC(OPT_ObjDesc, 1, 6) = {__TDFLDS("ObjDesc", 336), {0, 8, 16, 24, 304, 312, -56}};
__TDESC(OPT_StrDesc, 1, 3) = {__TDFLDS("StrDesc", 72), {48, 56, 64, -32}}; __TDESC(OPT_StrDesc, 1, 3) = {__TDFLDS("StrDesc", 72), {48, 56, 64, -32}};
__TDESC(OPT_NodeDesc, 1, 6) = {__TDFLDS("NodeDesc", 56), {0, 8, 16, 32, 40, 48, -56}}; __TDESC(OPT_NodeDesc, 1, 6) = {__TDFLDS("NodeDesc", 56), {0, 8, 16, 32, 40, 48, -56}};

2
bootstrap/windows-88/OPT.h
View file

@ -17,7 +17,7 @@ typedef
OPT_ConstExt ext; OPT_ConstExt ext;
int64 intval; int64 intval;
int32 intval2; int32 intval2;
uint32 setval; uint64 setval;
LONGREAL realval; LONGREAL realval;
} OPT_ConstDesc; } OPT_ConstDesc;

2
bootstrap/windows-88/OPV.c
View file

@ -72,7 +72,7 @@ static void OPV_GetTProcNum (OPT_Object obj)
OPT_FindField(obj->name, typ->BaseTyp, &redef); OPT_FindField(obj->name, typ->BaseTyp, &redef);
if (redef != NIL) { if (redef != NIL) {
obj->adr = __ASHL(__ASHR(redef->adr, 16), 16); obj->adr = __ASHL(__ASHR(redef->adr, 16), 16);
if (!__IN(2, obj->conval->setval, 32)) { if (!__IN(2, obj->conval->setval, 64)) {
OPM_err(119); OPM_err(119);
} }
} else { } else {

10
src/compiler/OPM.Mod
View file

@ -552,7 +552,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *)
END FPrint; END FPrint;
PROCEDURE FPrintSet*(VAR fp: LONGINT; set: SET); (*SYSTEM.SET64);*) PROCEDURE FPrintSet*(VAR fp: LONGINT; set: SYSTEM.SET64);
BEGIN FPrint(fp, SYSTEM.VAL(LONGINT, set)) BEGIN FPrint(fp, SYSTEM.VAL(LONGINT, set))
END FPrintSet; END FPrintSet;
@ -603,7 +603,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *)
BEGIN Files.ReadNum(oldSF, k); RETURN k BEGIN Files.ReadNum(oldSF, k); RETURN k
END SymRInt64; END SymRInt64;
PROCEDURE SymRSet*(VAR s: SET); (*SYSTEM.SET64);*) PROCEDURE SymRSet*(VAR s: SYSTEM.SET64);
BEGIN Files.ReadNum(oldSF, s) BEGIN Files.ReadNum(oldSF, s)
END SymRSet; END SymRSet;
@ -648,15 +648,9 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *)
BEGIN Files.WriteNum(newSF, i) BEGIN Files.WriteNum(newSF, i)
END SymWInt; END SymWInt;
(*
PROCEDURE SymWSet*(s: SYSTEM.SET64); PROCEDURE SymWSet*(s: SYSTEM.SET64);
BEGIN Files.WriteNum(newSF, SYSTEM.VAL(SYSTEM.INT64, s)) BEGIN Files.WriteNum(newSF, SYSTEM.VAL(SYSTEM.INT64, s))
END SymWSet; END SymWSet;
*)
PROCEDURE SymWSet*(s: SET);
BEGIN Files.WriteNum(newSF, SYSTEM.VAL(LONGINT, s))
END SymWSet;
PROCEDURE SymWReal*(r: REAL); PROCEDURE SymWReal*(r: REAL);
BEGIN Files.WriteReal(newSF, r) BEGIN Files.WriteReal(newSF, r)

3
src/compiler/OPT.Mod
View file

@ -15,8 +15,7 @@ TYPE
ext*: ConstExt; (* string or code for code proc *) ext*: ConstExt; (* string or code for code proc *)
intval*: SYSTEM.INT64; (* constant value or adr, proc par size, text position or least case label *) intval*: SYSTEM.INT64; (* constant value or adr, proc par size, text position or least case label *)
intval2*: LONGINT; (* string length, proc var size or larger case label *) intval2*: LONGINT; (* string length, proc var size or larger case label *)
(*setval*: SYSTEM.SET64;*) (* constant value, procedure body present or "ELSE" present in case *) setval*: SYSTEM.SET64; (* constant value, procedure body present or "ELSE" present in case *)
setval*: SET; (* constant value, procedure body present or "ELSE" present in case *)
realval*: LONGREAL (* real or longreal constant value *) realval*: LONGREAL (* real or longreal constant value *)
END; END;

2
src/test/confidence/planned-binary-change
View file

@ -1 +1 @@
25 Sep 2016 15:50:01 30 Sep 2016 18:58:19