Skip to content

Commit 590398b

Browse files
norayrnorayr
committed
update of bootstrap files.
1 parent 32ec675 commit 590398b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+580
-560
lines changed

‎bootstrap/unix-44/Compiler.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspamS */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspamS */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16
@@ -89,7 +89,7 @@ static void Compiler_PropagateElementaryTypeSizes (void)
8989
OPT_sintobj->typ = OPT_sinttyp;
9090
OPT_intobj->typ = OPT_inttyp;
9191
OPT_lintobj->typ = OPT_linttyp;
92-
switch (OPM_LongintSize) {
92+
switch (OPM_SetSize) {
9393
case 4:
9494
OPT_settyp = OPT_set32typ;
9595
break;

‎bootstrap/unix-44/Configuration.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
1919
__DEFMOD;
2020
__REGMOD("Configuration", 0);
2121
/* BEGIN */
22-
__MOVE("2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
22+
__MOVE("2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
2323
__ENDMOD;
2424
}

‎bootstrap/unix-44/Configuration.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef Configuration__h
44
#define Configuration__h

‎bootstrap/unix-44/Files.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16
@@ -966,7 +966,9 @@ void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x)
966966
{
967967
CHAR b[4];
968968
INT32 i;
969-
i = (INT32)x;
969+
UINT64 y;
970+
y = x;
971+
i = __VAL(INT32, y);
970972
b[0] = __CHR(i);
971973
b[1] = __CHR(__ASHR(i, 8));
972974
b[2] = __CHR(__ASHR(i, 16));

‎bootstrap/unix-44/Files.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef Files__h
44
#define Files__h

‎bootstrap/unix-44/Heap.c

+68-70
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. rtsSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. rtsSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16
@@ -665,79 +665,77 @@ void Heap_GC (BOOLEAN markStack)
665665
Heap_Module m;
666666
INT32 i0, i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15, i16, i17, i18, i19, i20, i21, i22, i23;
667667
INT32 cand[10000];
668-
if (Heap_lockdepth == 0 || (Heap_lockdepth == 1 && !markStack)) {
669-
Heap_Lock();
670-
m = (Heap_Module)(ADDRESS)Heap_modules;
671-
while (m != NIL) {
672-
if (m->enumPtrs != NIL) {
673-
(*m->enumPtrs)(Heap_MarkP);
674-
}
675-
m = m->next;
668+
Heap_Lock();
669+
m = (Heap_Module)(ADDRESS)Heap_modules;
670+
while (m != NIL) {
671+
if (m->enumPtrs != NIL) {
672+
(*m->enumPtrs)(Heap_MarkP);
676673
}
677-
if (markStack) {
678-
i0 = -100;
679-
i1 = -101;
680-
i2 = -102;
681-
i3 = -103;
682-
i4 = -104;
683-
i5 = -105;
684-
i6 = -106;
685-
i7 = -107;
686-
i8 = 1;
687-
i9 = 2;
688-
i10 = 3;
689-
i11 = 4;
690-
i12 = 5;
691-
i13 = 6;
692-
i14 = 7;
693-
i15 = 8;
694-
i16 = 9;
695-
i17 = 10;
696-
i18 = 11;
697-
i19 = 12;
698-
i20 = 13;
699-
i21 = 14;
700-
i22 = 15;
701-
i23 = 16;
702-
for (;;) {
703-
i0 += 1;
704-
i1 += 2;
705-
i2 += 3;
706-
i3 += 4;
707-
i4 += 5;
708-
i5 += 6;
709-
i6 += 7;
710-
i7 += 8;
711-
i8 += 9;
712-
i9 += 10;
713-
i10 += 11;
714-
i11 += 12;
715-
i12 += 13;
716-
i13 += 14;
717-
i14 += 15;
718-
i15 += 16;
719-
i16 += 17;
720-
i17 += 18;
721-
i18 += 19;
722-
i19 += 20;
723-
i20 += 21;
724-
i21 += 22;
725-
i22 += 23;
726-
i23 += 24;
727-
if ((i0 == -99 && i15 == 24)) {
728-
Heap_MarkStack(32, (void*)cand, 10000);
729-
break;
730-
}
731-
}
732-
if (((((((((((((((((((((((i0 + i1) + i2) + i3) + i4) + i5) + i6) + i7) + i8) + i9) + i10) + i11) + i12) + i13) + i14) + i15) + i16) + i17) + i18) + i19) + i20) + i21) + i22) + i23 > 10000) {
733-
return;
674+
m = m->next;
675+
}
676+
if (markStack) {
677+
i0 = -100;
678+
i1 = -101;
679+
i2 = -102;
680+
i3 = -103;
681+
i4 = -104;
682+
i5 = -105;
683+
i6 = -106;
684+
i7 = -107;
685+
i8 = 1;
686+
i9 = 2;
687+
i10 = 3;
688+
i11 = 4;
689+
i12 = 5;
690+
i13 = 6;
691+
i14 = 7;
692+
i15 = 8;
693+
i16 = 9;
694+
i17 = 10;
695+
i18 = 11;
696+
i19 = 12;
697+
i20 = 13;
698+
i21 = 14;
699+
i22 = 15;
700+
i23 = 16;
701+
for (;;) {
702+
i0 += 1;
703+
i1 += 2;
704+
i2 += 3;
705+
i3 += 4;
706+
i4 += 5;
707+
i5 += 6;
708+
i6 += 7;
709+
i7 += 8;
710+
i8 += 9;
711+
i9 += 10;
712+
i10 += 11;
713+
i11 += 12;
714+
i12 += 13;
715+
i13 += 14;
716+
i14 += 15;
717+
i15 += 16;
718+
i16 += 17;
719+
i17 += 18;
720+
i18 += 19;
721+
i19 += 20;
722+
i20 += 21;
723+
i21 += 22;
724+
i22 += 23;
725+
i23 += 24;
726+
if ((i0 == -99 && i15 == 24)) {
727+
Heap_MarkStack(32, (void*)cand, 10000);
728+
break;
734729
}
735730
}
736-
Heap_CheckFin();
737-
Heap_Scan();
738-
Heap_Finalize();
739-
Heap_Unlock();
731+
if (((((((((((((((((((((((i0 + i1) + i2) + i3) + i4) + i5) + i6) + i7) + i8) + i9) + i10) + i11) + i12) + i13) + i14) + i15) + i16) + i17) + i18) + i19) + i20) + i21) + i22) + i23 > 10000) {
732+
return;
733+
}
740734
}
735+
Heap_CheckFin();
736+
Heap_Scan();
737+
Heap_Finalize();
738+
Heap_Unlock();
741739
}
742740

743741
void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize)

‎bootstrap/unix-44/Heap.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. rtsSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. rtsSF */
22

33
#ifndef Heap__h
44
#define Heap__h

‎bootstrap/unix-44/Modules.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16

‎bootstrap/unix-44/Modules.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef Modules__h
44
#define Modules__h

‎bootstrap/unix-44/OPB.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16

‎bootstrap/unix-44/OPB.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef OPB__h
44
#define OPB__h

‎bootstrap/unix-44/OPC.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16

‎bootstrap/unix-44/OPC.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef OPC__h
44
#define OPC__h

‎bootstrap/unix-44/OPM.c

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16
@@ -27,7 +27,7 @@ export INT16 OPM_AddressSize;
2727
static INT16 OPM_GlobalAlignment;
2828
export INT16 OPM_Alignment;
2929
export UINT32 OPM_GlobalOptions, OPM_Options;
30-
export INT16 OPM_ShortintSize, OPM_IntegerSize, OPM_LongintSize;
30+
export INT16 OPM_ShortintSize, OPM_IntegerSize, OPM_LongintSize, OPM_SetSize;
3131
export INT64 OPM_MaxIndex;
3232
export LONGREAL OPM_MinReal, OPM_MaxReal, OPM_MinLReal, OPM_MaxLReal;
3333
export BOOLEAN OPM_noerr;
@@ -338,7 +338,7 @@ BOOLEAN OPM_OpenPar (void)
338338
OPM_LogWLn();
339339
OPM_LogWStr((CHAR*)" -O2 Original Oberon / Oberon-2: 8 bit SHORTINT, 16 bit INTEGER, 32 bit LONGINT and SET.", 95);
340340
OPM_LogWLn();
341-
OPM_LogWStr((CHAR*)" -OC Component Pascal: 16 bit SHORTINT, 32 bit INTEGER, 64 bit LONGINT and SET.", 95);
341+
OPM_LogWStr((CHAR*)" -OC Component Pascal: 16 bit SHORTINT, 32 bit INTEGER and SET, 64 bit LONGINT.", 95);
342342
OPM_LogWLn();
343343
OPM_LogWStr((CHAR*)" -OV Alternate large model: 8 bit SHORTINT, 32 bit INTEGER, 64 bit LONGINT and SET.", 95);
344344
OPM_LogWLn();
@@ -410,21 +410,25 @@ void OPM_InitOptions (void)
410410
OPM_ShortintSize = 1;
411411
OPM_IntegerSize = 2;
412412
OPM_LongintSize = 4;
413+
OPM_SetSize = 4;
413414
break;
414415
case 'C':
415416
OPM_ShortintSize = 2;
416417
OPM_IntegerSize = 4;
417418
OPM_LongintSize = 8;
419+
OPM_SetSize = 4;
418420
break;
419421
case 'V':
420422
OPM_ShortintSize = 1;
421423
OPM_IntegerSize = 4;
422424
OPM_LongintSize = 8;
425+
OPM_SetSize = 8;
423426
break;
424427
default:
425428
OPM_ShortintSize = 1;
426429
OPM_IntegerSize = 2;
427430
OPM_LongintSize = 4;
431+
OPM_SetSize = 4;
428432
break;
429433
}
430434
__MOVE(OPM_InstallDir, OPM_ResourceDir, 1024);

‎bootstrap/unix-44/OPM.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef OPM__h
44
#define OPM__h
@@ -9,7 +9,7 @@
99
import CHAR OPM_Model[10];
1010
import INT16 OPM_AddressSize, OPM_Alignment;
1111
import UINT32 OPM_GlobalOptions, OPM_Options;
12-
import INT16 OPM_ShortintSize, OPM_IntegerSize, OPM_LongintSize;
12+
import INT16 OPM_ShortintSize, OPM_IntegerSize, OPM_LongintSize, OPM_SetSize;
1313
import INT64 OPM_MaxIndex;
1414
import LONGREAL OPM_MinReal, OPM_MaxReal, OPM_MinLReal, OPM_MaxLReal;
1515
import BOOLEAN OPM_noerr;

‎bootstrap/unix-44/OPP.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16

‎bootstrap/unix-44/OPP.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef OPP__h
44
#define OPP__h

‎bootstrap/unix-44/OPS.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16

‎bootstrap/unix-44/OPS.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef OPS__h
44
#define OPS__h

‎bootstrap/unix-44/OPT.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16

‎bootstrap/unix-44/OPT.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef OPT__h
44
#define OPT__h

‎bootstrap/unix-44/OPV.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16

‎bootstrap/unix-44/OPV.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef OPV__h
44
#define OPV__h

‎bootstrap/unix-44/Out.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16

‎bootstrap/unix-44/Out.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef Out__h
44
#define Out__h

‎bootstrap/unix-44/Platform.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16

‎bootstrap/unix-44/Platform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#ifndef Platform__h
44
#define Platform__h

‎bootstrap/unix-44/Reals.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* voc 2.1.0 [2019/11/01]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
1+
/* voc 2.1.0 [2022/03/15]. Bootstrapping compiler for address size 8, alignment 8. xrtspaSF */
22

33
#define SHORTINT INT8
44
#define INTEGER INT16

0 commit comments

Comments
 (0)