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

Beginning to simplify build process

Browse source
This commit is contained in:
David Brown 2016-09-23 17:12:02 +01:00
parent 22a4f8e263
commit 8017aa445c
13 changed files with 56 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/compiler/OPM.cmdln.Mod
View file

@ -67,7 +67,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *)
BodyFile* = 1;
HeaderInclude* = 2;
(* C default expression integral size details. Const for now, will be var with avr_gcc/sdcc support *)
(* C default expression integral size details. Const for now, should be var for avr_gcc/sdcc support *)
CIntSize* = 4;
CIntMax* = 7FFFFFFFH;
CIntMin* = -CIntMax - 1;
@ -88,12 +88,11 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *)
SourceFileName : ARRAY 256 OF CHAR;
(* Parameter selectable sizes *)
Alignment*,
AddressSize*, SetSize*,
AddressSize*, Alignment*,
SetSize*,
ShortintSize*, IntegerSize*, LongintSize*: INTEGER;
MaxSet*: INTEGER;
MaxIndex*: SYSTEM.INT64;
MinReal*, MaxReal*, MinLReal*, MaxLReal*: LONGREAL;
@ -110,7 +109,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *)
ErrorLineStartPos, ErrorLineLimitPos, ErrorLineNumber: LONGINT; (* Limit = start of next line *)
lasterrpos: SYSTEM.INT64;
lasterrpos: LONGINT;
inR: Texts.Reader;
Log: Texts.Text;
W: Texts.Writer;
@ -479,7 +478,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *)
END ShowLine;
PROCEDURE Mark*(n: INTEGER; pos: SYSTEM.INT64);
PROCEDURE Mark*(n: INTEGER; pos: LONGINT);
BEGIN
IF pos = -1 THEN pos := 0 END;
IF n >= 0 THEN
@ -853,6 +852,10 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *)
END CloseFiles;
PROCEDURE -GetAlignment(VAR a: INTEGER) "struct {char c; long long l;} s; *a = (char*)&s.l - (char*)&s";
BEGIN
Texts.OpenWriter(W);
@ -867,9 +870,9 @@ BEGIN
Files.SetSearchPath(OBERON);
(* type sizes with configuration based defaults *)
AddressSize := Configuration.addressSize;
Alignment := Configuration.alignment;
(* Default address size and alignment are those of this compiler *)
AddressSize := SIZE(SYSTEM.ADDRESS);
GetAlignment(Alignment);
(* Default type size model is that of the original Oberon-2 implementation (-O2) *)
ShortintSize := 1;

2
src/compiler/Vishap.Mod
View file

@ -96,7 +96,7 @@ MODULE Vishap; (* J. Templ 3.2.95 *)
extTools.Assemble(OPM.modName)
ELSE
IF ~(OPM.mainprog IN OPM.opt) THEN
(* Assemble non main rogram and add object name to link list *)
(* Assemble non main program and add object name to link list *)
extTools.Assemble(OPM.modName);
Strings.Append(" ", modulesobj);
Strings.Append(OPM.modName, modulesobj);

4
src/tools/make/configure.c
View file

@ -401,15 +401,11 @@ void writeConfigurationMod() {
fprintf(fd, "MODULE Configuration;\n");
fprintf(fd, "CONST\n");
fprintf(fd, " name* = '%s';\n", oname);
fprintf(fd, " intsize* = %d;\n", intsize);
fprintf(fd, " addressSize* = %d;\n", addressSize);
fprintf(fd, " alignment* = %d;\n", alignment);
fprintf(fd, " objext* = '%s';\n", objext);
fprintf(fd, " objflag* = '%s';\n", objflag);
fprintf(fd, " linkflags* = '%s';\n", linkflags);
fprintf(fd, " libspec* = '%s';\n", libspec);
fprintf(fd, " compile* = '%s';\n", cc);
fprintf(fd, " dataModel* = '%s';\n", dataModel);
fprintf(fd, " installdir* = '%s';\n", installdir);
fprintf(fd, " staticLink* = '%s';\n", staticlink);
fprintf(fd, "VAR\n");