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

Define integer sizes before including SYSTEM.h

Browse source
This commit is contained in:
David Brown 2016-09-06 20:48:22 +01:00
parent 682fa59e42
commit ebfc60f49d
208 changed files with 1164 additions and 787 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,9 @@
/* voc 1.95 [2016/09/04] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/09/06] for gcc LP64 on cygwin xtspkaSfF */
#define INTEGER int16
#define LONGINT int32
#define SET uint32
#include "SYSTEM.h"
#include "Configuration.h"
#include "OPM.h"
@ -834,7 +839,7 @@ void OPC_TDescDecl (OPT_Struct typ)
OPC_Str1((CHAR*)", #), {", 8, typ->size);
nofptrs = 0;
OPC_PutPtrOffsets(typ, 0, &nofptrs);
OPC_Str1((CHAR*)"#}}", 4, -((nofptrs + 1) * OPM_LIntSize));
OPC_Str1((CHAR*)"#}}", 4, -((nofptrs + 1) * OPM_PointerSize));
OPC_EndStat();
}
@ -917,12 +922,20 @@ static void OPC_FillGap (int32 gap, int32 off, int32 align, int32 *n, int32 *cur
if ((*curAlign < align && gap - (adr - off) >= align)) {
gap -= (adr - off) + align;
OPC_BegStat();
if (align == OPM_IntSize) {
OPM_WriteString((CHAR*)"INTEGER", 8);
} else if (align == OPM_LIntSize) {
OPM_WriteString((CHAR*)"LONGINT", 8);
} else if (align == OPM_LRealSize) {
OPM_WriteString((CHAR*)"LONGREAL", 9);
switch (align) {
case 2:
OPM_WriteString((CHAR*)"int16", 6);
break;
case 4:
OPM_WriteString((CHAR*)"int32", 6);
break;
case 8:
OPM_WriteString((CHAR*)"int64", 6);
break;
default:
OPM_LogWLn();
OPM_LogWStr((CHAR*)"Unexpected enclosing alignment in FillGap.", 43);
break;
}
OPC_Str1((CHAR*)" _prvt#", 8, *n);
*n += 1;
@ -1210,7 +1223,8 @@ void OPC_GenHdr (OPT_Node n)
OPM_WriteLn();
OPC_CProcDefs(OPT_topScope->right, 1);
OPM_WriteLn();
OPM_WriteString((CHAR*)"#endif", 7);
OPM_WriteString((CHAR*)"#endif // ", 11);
OPM_WriteStringVar((void*)OPM_modName, 32);
OPM_WriteLn();
}
@ -1297,10 +1311,6 @@ void OPC_GenHdrIncludes (void)
OPM_WriteString((CHAR*)"__h", 4);
OPM_WriteLn();
OPM_WriteLn();
if (OPM_LIntSize == 8) {
OPM_WriteString((CHAR*)"#define LARGE", 14);
OPM_WriteLn();
}
OPC_Include((CHAR*)"SYSTEM", 7);
OPC_IncludeImports(OPT_topScope->right, 1);
OPM_WriteLn();
@ -1310,10 +1320,17 @@ void OPC_GenBdy (OPT_Node n)
{
OPM_currFile = 1;
OPC_GenHeaderMsg();
if (OPM_LIntSize == 8) {
OPM_WriteString((CHAR*)"#define LARGE", 14);
OPM_WriteLn();
}
OPM_WriteLn();
OPM_WriteString((CHAR*)"#define INTEGER int", 20);
OPM_WriteInt(__ASHL(OPT_inttyp->size, 3));
OPM_WriteLn();
OPM_WriteString((CHAR*)"#define LONGINT int", 20);
OPM_WriteInt(__ASHL(OPT_linttyp->size, 3));
OPM_WriteLn();
OPM_WriteString((CHAR*)"#define SET uint", 21);
OPM_WriteInt(__ASHL(OPT_settyp->size, 3));
OPM_WriteLn();
OPM_WriteLn();
OPC_Include((CHAR*)"SYSTEM", 7);
OPC_IncludeImports(OPT_topScope->right, 0);
OPM_WriteLn();