From ff87e23780825b8c8e84fbe917ea36c7a30e7144 Mon Sep 17 00:00:00 2001 From: Norayr Chilingarian Date: Sun, 29 Mar 2020 20:40:36 +0400 Subject: [PATCH] fixed ooc.C typesizes and made X11 examples compile. --- src/library/ooc/oocCILP32.Mod | 12 ++++++------ src/library/ooc/oocCLLP64.Mod | 14 +++++++------- src/library/ooc/oocCLP64.Mod | 14 +++++++------- src/test/x11/0/makefile | 4 ++-- src/test/x11/IFS/makefile | 5 ++--- src/test/x11/mines/makefile | 5 +++-- src/test/x11/pacman/makefile | 5 +++-- src/test/x11/tetris/Tetris.Mod | 2 +- src/test/x11/tetris/makefile | 5 +++-- src/test/x11/tron/makefile | 4 ++-- src/test/x11/vier/makefile | 5 +++-- 11 files changed, 39 insertions(+), 36 deletions(-) diff --git a/src/library/ooc/oocCILP32.Mod b/src/library/ooc/oocCILP32.Mod index e868b9f6..66a3cde1 100644 --- a/src/library/ooc/oocCILP32.Mod +++ b/src/library/ooc/oocCILP32.Mod @@ -31,13 +31,13 @@ Unix they should be fairly safe. TYPE char* = CHAR; (* 8 bits *) - signedchar* = SHORTINT; (* 8 bits *) - shortint* = RECORD a,b: SYSTEM.BYTE END; (* 16 bits *) - int* = LONGINT; (* 32 bits *) - set* = LONGINT; (* 32 bits *) - longint* = LONGINT; (* 32 bits on ILP32 (64 bits is 'long long') *) + signedchar* = SYSTEM.INT8; (* 8 bits *) + shortint* = SYSTEM.INT16; (* 16 bits *) + int* = SYSTEM.INT32; (* 32 bits *) + set* = SYSTEM.INT32; (* 32 bits *) + longint* = SYSTEM.INT32; (* 32 bits on ILP32 (64 bits is 'long long') *) (*longset* = SET; n/a *) (* 64 bit SET *) - address* = LONGINT; (* 32 bits *) + address* = SYSTEM.ADDRESS; (* 32 bits *) float* = REAL; (* 32 bits *) double* = LONGREAL; (* 64 bits *) diff --git a/src/library/ooc/oocCLLP64.Mod b/src/library/ooc/oocCLLP64.Mod index a7eadc0b..4b6add95 100644 --- a/src/library/ooc/oocCLLP64.Mod +++ b/src/library/ooc/oocCLLP64.Mod @@ -31,13 +31,13 @@ Unix they should be fairly safe. TYPE char* = CHAR; (* 8 bits *) - signedchar* = SHORTINT; (* 8 bits *) - shortint* = RECORD a,b: SYSTEM.BYTE END; (* 16 bits *) - int* = INTEGER; (* 32 bits *) - set* = INTEGER; (* 32 bits *) - longint* = INTEGER; (* 32 bits *) - longset* = SET; (* 64 bits *) - address* = LONGINT; (* 64 bits *) + signedchar* = SYSTEM.INT8; (* 8 bits *) + shortint* = SYSTEM.INT16; (* 16 bits *) + int* = SYSTEM.INT32; (* 32 bits *) + set* = SYSTEM.SET32; (* 32 bits *) + longint* = SYSTEM.INT32; (* 32 bits *) + longset* = SYSTEM.SET64; (* 64 bits *) + address* = SYSTEM.INT64; (* 64 bits *) float* = REAL; (* 32 bits *) double* = LONGREAL; (* 64 bits *) diff --git a/src/library/ooc/oocCLP64.Mod b/src/library/ooc/oocCLP64.Mod index dcc76584..0e97c566 100644 --- a/src/library/ooc/oocCLP64.Mod +++ b/src/library/ooc/oocCLP64.Mod @@ -31,13 +31,13 @@ Unix they should be fairly safe. TYPE char* = CHAR; (* 8 bits *) - signedchar* = SHORTINT; (* 8 bits *) - shortint* = RECORD a,b: SYSTEM.BYTE END; (* 16 bits *) - int* = INTEGER; (* 32 bits *) - set* = INTEGER; (* 32 bits *) - longint* = LONGINT; (* 64 bits *) - longset* = SET; (* 64 bits *) - address* = LONGINT; (* 64 bits *) + signedchar* = SYSTEM.INT8; (* 8 bits *) + shortint* = SYSTEM.INT16; (* 16 bits *) + int* = SYSTEM.INT32; (* 32 bits *) + set* = SYSTEM.INT32; (* 32 bits *) + longint* = SYSTEM.INT64; (* 64 bits *) + longset* = SYSTEM.SET64; (* 64 bits *) + address* = SYSTEM.ADDRESS; (* 64 bits *) float* = REAL; (* 32 bits *) double* = LONGREAL; (* 64 bits *) diff --git a/src/test/x11/0/makefile b/src/test/x11/0/makefile index 67bf3938..c9b9aa5a 100644 --- a/src/test/x11/0/makefile +++ b/src/test/x11/0/makefile @@ -1,12 +1,12 @@ #for old systems like RHEL4 use #CFLAGS=-L/usr/X11R6/lib -lX11 +MODX11="../../../library/oocX11" CFLAGS=-lX11 export CFLAGS -MOD = MODULES="../../../lib/oocX11" VOC = $(MOD) /opt/voc/bin/voc all: - $(VOC) -s oocX11.Mod oocXutil.Mod oocXYplane.Mod test.Mod -m + $(VOC) -s $(MODX11)/oocX11.Mod $(MODX11)/oocXutil.Mod $(MODX11)/oocXYplane.Mod test.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11 diff --git a/src/test/x11/IFS/makefile b/src/test/x11/IFS/makefile index eda916b9..0e36987d 100644 --- a/src/test/x11/IFS/makefile +++ b/src/test/x11/IFS/makefile @@ -1,11 +1,10 @@ CFLAGS=-lX11 export CFLAGS - -MOD = MODULES="../../../lib/oocX11" +MODX11="../../../library/oocX11" VOC = $(MOD) /opt/voc/bin/voc all: - $(VOC) -s oocX11.Mod oocXutil.Mod oocXYplane.Mod IFS.Mod IFStest.Mod -m + $(VOC) -s $(MODX11)/oocX11.Mod $(MODX11)/oocXutil.Mod $(MODX11)/oocXYplane.Mod IFS.Mod IFStest.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11 diff --git a/src/test/x11/mines/makefile b/src/test/x11/mines/makefile index 02d5c8b4..f31fd926 100644 --- a/src/test/x11/mines/makefile +++ b/src/test/x11/mines/makefile @@ -3,11 +3,12 @@ CFLAGS=-lX11 export CFLAGS -MOD = MODULES="../../../lib/oocX11" +MODX11="../../../library/oocX11" + VOC = $(MOD) /opt/voc/bin/voc all: - $(VOC) -s oocX11.Mod oocXutil.Mod oocXYplane.Mod compatIn.Mod Linie.Mod Minesweeper.Mod -m + $(VOC) -s $(MODX11)/oocX11.Mod $(MODX11)/oocXutil.Mod $(MODX11)/oocXYplane.Mod compatIn.Mod Linie.Mod Minesweeper.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11 diff --git a/src/test/x11/pacman/makefile b/src/test/x11/pacman/makefile index 018f29c7..a90df273 100644 --- a/src/test/x11/pacman/makefile +++ b/src/test/x11/pacman/makefile @@ -3,11 +3,12 @@ CFLAGS=-lX11 export CFLAGS -MOD = MODULES="../../../lib/oocX11" +MODX11="../../../library/oocX11" + VOC = $(MOD) /opt/voc/bin/voc all: - $(VOC) -s oocX11.Mod oocXutil.Mod oocXYplane.Mod Grafik.Mod PacMan.Mod -m + $(VOC) -s $(MODX11)/oocX11.Mod $(MODX11)/oocXutil.Mod $(MODX11)/oocXYplane.Mod Grafik.Mod PacMan.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11 diff --git a/src/test/x11/tetris/Tetris.Mod b/src/test/x11/tetris/Tetris.Mod index a3468bd9..977d9ff4 100644 --- a/src/test/x11/tetris/Tetris.Mod +++ b/src/test/x11/tetris/Tetris.Mod @@ -5,7 +5,7 @@ MODULE Tetris; (* Neuerungen: Spielparameter sind ueber Konstantendeklariert, Zweispielermodus bricht bei Limit-Linien ab, Pause-Funktion wurde eingefuehrt *) -IMPORT X:=oocXYplane, L:=Linie, In := compatIn, Out := Console, RN:=ethRandomNumbers, Ziffer, Oberon := Kernel; +IMPORT X:=oocXYplane, L:=Linie, In := compatIn, Out := Console, RN:=ethRandomNumbers, Ziffer, Oberon; CONST diff --git a/src/test/x11/tetris/makefile b/src/test/x11/tetris/makefile index ae2c5119..e7c8a4b7 100644 --- a/src/test/x11/tetris/makefile +++ b/src/test/x11/tetris/makefile @@ -3,11 +3,12 @@ CFLAGS=-lX11 export CFLAGS -MOD = MODULES="../../../lib/oocX11" +MODX11="../../../library/oocX11" + VOC = $(MOD) /opt/voc/bin/voc all: - $(VOC) -s oocX11.Mod oocXutil.Mod oocXYplane.Mod compatIn.Mod Linie.Mod Ziffer.Mod Tetris.Mod -m + $(VOC) -s $(MODX11)/oocX11.Mod $(MODX11)/oocXutil.Mod $(MODX11)/oocXYplane.Mod compatIn.Mod Linie.Mod Ziffer.Mod Tetris.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11 diff --git a/src/test/x11/tron/makefile b/src/test/x11/tron/makefile index be94ea28..48464d5e 100644 --- a/src/test/x11/tron/makefile +++ b/src/test/x11/tron/makefile @@ -3,11 +3,11 @@ CFLAGS=-lX11 export CFLAGS -MOD = MODULES="../../../lib/oocX11" +MODX11="../../../library/oocX11" VOC = $(MOD) /opt/voc/bin/voc all: - $(VOC) -s oocX11.Mod oocXutil.Mod oocXYplane.Mod compatIn.Mod Tron.Mod -m + $(VOC) -s $(MODX11)/oocX11.Mod $(MODX11)/oocXutil.Mod $(MODX11)/oocXYplane.Mod compatIn.Mod Tron.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11 diff --git a/src/test/x11/vier/makefile b/src/test/x11/vier/makefile index 2c39f530..54d4ac35 100644 --- a/src/test/x11/vier/makefile +++ b/src/test/x11/vier/makefile @@ -3,11 +3,12 @@ CFLAGS=-lX11 export CFLAGS -MOD = MODULES="../../../lib/oocX11" +MODX11="../../../library/oocX11" + VOC = $(MOD) /opt/voc/bin/voc all: - $(VOC) -s oocX11.Mod oocXutil.Mod oocXYplane.Mod compatIn.Mod Ausgabe.Mod Vier.Mod -m + $(VOC) -s $(MODX11)/oocX11.Mod $(MODX11)/oocXutil.Mod $(MODX11)/oocXYplane.Mod compatIn.Mod Ausgabe.Mod Vier.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11