From 6ef66fa5421ef261643b27bef03129d97cf5f828 Mon Sep 17 00:00:00 2001 From: Norayr Chilingarian Date: Wed, 23 Oct 2013 17:54:58 +0400 Subject: [PATCH] ported ulmStrings, ulmConstStrings. changed hidden fields limit in OPM module. makefiles --- makefile | 34 +++++++++++++++++--------------- makefile.gnuc.armv6j | 34 +++++++++++++++++--------------- makefile.gnuc.armv6j_hardfp | 34 +++++++++++++++++--------------- makefile.gnuc.armv7a_hardfp | 34 +++++++++++++++++--------------- makefile.gnuc.x86 | 34 +++++++++++++++++--------------- makefile.gnuc.x86_64 | 34 +++++++++++++++++--------------- showdef | Bin 433254 -> 433254 bytes src/lib/ulm/ulmConstStrings.Mod | 26 ++++++++++++------------ src/voc/OPM.cmdln.Mod | 2 +- voc | Bin 1324849 -> 1324849 bytes vocstatic | Bin 1324849 -> 1324849 bytes vocstatic.linux.gnuc.x86_64 | Bin 1324849 -> 1324849 bytes 12 files changed, 122 insertions(+), 110 deletions(-) diff --git a/makefile b/makefile index ce9fa93b..1a55142f 100644 --- a/makefile +++ b/makefile @@ -12,7 +12,8 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC = $(SETPATH) ./voc VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon @@ -70,22 +71,22 @@ stage2: # this prepares modules necessary to build the compiler itself stage3: - $(VOCSTATIC) -siapxPS SYSTEM.Mod - $(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod - $(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod - $(VOCSTATIC) -sxPS Files.Mod - $(VOCSTATIC) -sxPS OakFiles.Mod - $(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod + $(VOCSTATIC0) -siapxPS SYSTEM.Mod + $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod + $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod + $(VOCSTATIC0) -sxPS Files.Mod + $(VOCSTATIC0) -sxPS OakFiles.Mod + $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod # build the compiler stage4: - $(VOCSTATIC) -sPS extTools.Mod - $(VOCSTATIC) -sPS OPM.cmdln.Mod - $(VOCSTATIC) -sxPS OPS.Mod - $(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod - $(VOCSTATIC) -smPS voc.Mod - $(VOCSTATIC) -smPS BrowserCmd.Mod - $(VOCSTATIC) -smPS OCatCmd.Mod + $(VOCSTATIC0) -sPS extTools.Mod + $(VOCSTATIC0) -sPS OPM.cmdln.Mod + $(VOCSTATIC0) -sxPS OPS.Mod + $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod + $(VOCSTATIC0) -smPS voc.Mod + $(VOCSTATIC0) -smPS BrowserCmd.Mod + $(VOCSTATIC0) -smPS OCatCmd.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -153,6 +154,7 @@ stage6: $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmPrint.Mod + $(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod stage7: #objects := $(wildcard *.o) @@ -166,11 +168,11 @@ clean: # rm_objects := rm $(wildcard *.o) # objects rm *.o - rm *.sym + rm *.so rm *.h rm *.c rm *.a - rm *.so + rm *.sym coco: $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m diff --git a/makefile.gnuc.armv6j b/makefile.gnuc.armv6j index 80f78e3a..8262fbe7 100644 --- a/makefile.gnuc.armv6j +++ b/makefile.gnuc.armv6j @@ -12,7 +12,8 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC = $(SETPATH) ./voc VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon @@ -70,22 +71,22 @@ stage2: # this prepares modules necessary to build the compiler itself stage3: - $(VOCSTATIC) -siapxPS SYSTEM.Mod - $(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod - $(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod - $(VOCSTATIC) -sxPS Files.Mod - $(VOCSTATIC) -sxPS OakFiles.Mod - $(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod + $(VOCSTATIC0) -siapxPS SYSTEM.Mod + $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod + $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod + $(VOCSTATIC0) -sxPS Files.Mod + $(VOCSTATIC0) -sxPS OakFiles.Mod + $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod # build the compiler stage4: - $(VOCSTATIC) -sPS extTools.Mod - $(VOCSTATIC) -sPS OPM.cmdln.Mod - $(VOCSTATIC) -sxPS OPS.Mod - $(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod - $(VOCSTATIC) -smPS voc.Mod - $(VOCSTATIC) -smPS BrowserCmd.Mod - $(VOCSTATIC) -smPS OCatCmd.Mod + $(VOCSTATIC0) -sPS extTools.Mod + $(VOCSTATIC0) -sPS OPM.cmdln.Mod + $(VOCSTATIC0) -sxPS OPS.Mod + $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod + $(VOCSTATIC0) -smPS voc.Mod + $(VOCSTATIC0) -smPS BrowserCmd.Mod + $(VOCSTATIC0) -smPS OCatCmd.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -153,6 +154,7 @@ stage6: $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmPrint.Mod + $(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod stage7: #objects := $(wildcard *.o) @@ -166,11 +168,11 @@ clean: # rm_objects := rm $(wildcard *.o) # objects rm *.o - rm *.sym + rm *.so rm *.h rm *.c rm *.a - rm *.so + rm *.sym coco: $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m diff --git a/makefile.gnuc.armv6j_hardfp b/makefile.gnuc.armv6j_hardfp index c03d9a65..d64f8651 100644 --- a/makefile.gnuc.armv6j_hardfp +++ b/makefile.gnuc.armv6j_hardfp @@ -12,7 +12,8 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC = $(SETPATH) ./voc VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon @@ -70,22 +71,22 @@ stage2: # this prepares modules necessary to build the compiler itself stage3: - $(VOCSTATIC) -siapxPS SYSTEM.Mod - $(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod - $(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod - $(VOCSTATIC) -sxPS Files.Mod - $(VOCSTATIC) -sxPS OakFiles.Mod - $(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod + $(VOCSTATIC0) -siapxPS SYSTEM.Mod + $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod + $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod + $(VOCSTATIC0) -sxPS Files.Mod + $(VOCSTATIC0) -sxPS OakFiles.Mod + $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod # build the compiler stage4: - $(VOCSTATIC) -sPS extTools.Mod - $(VOCSTATIC) -sPS OPM.cmdln.Mod - $(VOCSTATIC) -sxPS OPS.Mod - $(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod - $(VOCSTATIC) -smPS voc.Mod - $(VOCSTATIC) -smPS BrowserCmd.Mod - $(VOCSTATIC) -smPS OCatCmd.Mod + $(VOCSTATIC0) -sPS extTools.Mod + $(VOCSTATIC0) -sPS OPM.cmdln.Mod + $(VOCSTATIC0) -sxPS OPS.Mod + $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod + $(VOCSTATIC0) -smPS voc.Mod + $(VOCSTATIC0) -smPS BrowserCmd.Mod + $(VOCSTATIC0) -smPS OCatCmd.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -153,6 +154,7 @@ stage6: $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmPrint.Mod + $(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod stage7: #objects := $(wildcard *.o) @@ -166,11 +168,11 @@ clean: # rm_objects := rm $(wildcard *.o) # objects rm *.o - rm *.sym + rm *.so rm *.h rm *.c rm *.a - rm *.so + rm *.sym coco: $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m diff --git a/makefile.gnuc.armv7a_hardfp b/makefile.gnuc.armv7a_hardfp index bad9b636..6fd454b4 100644 --- a/makefile.gnuc.armv7a_hardfp +++ b/makefile.gnuc.armv7a_hardfp @@ -12,7 +12,8 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC = $(SETPATH) ./voc VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon @@ -70,22 +71,22 @@ stage2: # this prepares modules necessary to build the compiler itself stage3: - $(VOCSTATIC) -siapxPS SYSTEM.Mod - $(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod - $(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod - $(VOCSTATIC) -sxPS Files.Mod - $(VOCSTATIC) -sxPS OakFiles.Mod - $(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod + $(VOCSTATIC0) -siapxPS SYSTEM.Mod + $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod + $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod + $(VOCSTATIC0) -sxPS Files.Mod + $(VOCSTATIC0) -sxPS OakFiles.Mod + $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod # build the compiler stage4: - $(VOCSTATIC) -sPS extTools.Mod - $(VOCSTATIC) -sPS OPM.cmdln.Mod - $(VOCSTATIC) -sxPS OPS.Mod - $(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod - $(VOCSTATIC) -smPS voc.Mod - $(VOCSTATIC) -smPS BrowserCmd.Mod - $(VOCSTATIC) -smPS OCatCmd.Mod + $(VOCSTATIC0) -sPS extTools.Mod + $(VOCSTATIC0) -sPS OPM.cmdln.Mod + $(VOCSTATIC0) -sxPS OPS.Mod + $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod + $(VOCSTATIC0) -smPS voc.Mod + $(VOCSTATIC0) -smPS BrowserCmd.Mod + $(VOCSTATIC0) -smPS OCatCmd.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -153,6 +154,7 @@ stage6: $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmPrint.Mod + $(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod stage7: #objects := $(wildcard *.o) @@ -166,11 +168,11 @@ clean: # rm_objects := rm $(wildcard *.o) # objects rm *.o - rm *.sym + rm *.so rm *.h rm *.c rm *.a - rm *.so + rm *.sym coco: $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m diff --git a/makefile.gnuc.x86 b/makefile.gnuc.x86 index 3540e354..ec16e8df 100644 --- a/makefile.gnuc.x86 +++ b/makefile.gnuc.x86 @@ -12,7 +12,8 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC = $(SETPATH) ./voc VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon @@ -70,22 +71,22 @@ stage2: # this prepares modules necessary to build the compiler itself stage3: - $(VOCSTATIC) -siapxPS SYSTEM.Mod - $(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod - $(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod - $(VOCSTATIC) -sxPS Files.Mod - $(VOCSTATIC) -sxPS OakFiles.Mod - $(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod + $(VOCSTATIC0) -siapxPS SYSTEM.Mod + $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod + $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod + $(VOCSTATIC0) -sxPS Files.Mod + $(VOCSTATIC0) -sxPS OakFiles.Mod + $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod # build the compiler stage4: - $(VOCSTATIC) -sPS extTools.Mod - $(VOCSTATIC) -sPS OPM.cmdln.Mod - $(VOCSTATIC) -sxPS OPS.Mod - $(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod - $(VOCSTATIC) -smPS voc.Mod - $(VOCSTATIC) -smPS BrowserCmd.Mod - $(VOCSTATIC) -smPS OCatCmd.Mod + $(VOCSTATIC0) -sPS extTools.Mod + $(VOCSTATIC0) -sPS OPM.cmdln.Mod + $(VOCSTATIC0) -sxPS OPS.Mod + $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod + $(VOCSTATIC0) -smPS voc.Mod + $(VOCSTATIC0) -smPS BrowserCmd.Mod + $(VOCSTATIC0) -smPS OCatCmd.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -153,6 +154,7 @@ stage6: $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmPrint.Mod + $(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod stage7: #objects := $(wildcard *.o) @@ -166,11 +168,11 @@ clean: # rm_objects := rm $(wildcard *.o) # objects rm *.o - rm *.sym + rm *.so rm *.h rm *.c rm *.a - rm *.so + rm *.sym coco: $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m diff --git a/makefile.gnuc.x86_64 b/makefile.gnuc.x86_64 index ce9fa93b..1a55142f 100644 --- a/makefile.gnuc.x86_64 +++ b/makefile.gnuc.x86_64 @@ -12,7 +12,8 @@ INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH) SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP):src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/coco:src/test VOC = voc -VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) +VOCSTATIC = $(SETPATH) ./voc VOCPARAM = $(shell ./vocparam > voc.par) VERSION = GNU_Linux_$(TARCH) LIBNAME = VishapOberon @@ -70,22 +71,22 @@ stage2: # this prepares modules necessary to build the compiler itself stage3: - $(VOCSTATIC) -siapxPS SYSTEM.Mod - $(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod - $(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod - $(VOCSTATIC) -sxPS Files.Mod - $(VOCSTATIC) -sxPS OakFiles.Mod - $(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod + $(VOCSTATIC0) -siapxPS SYSTEM.Mod + $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod + $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod + $(VOCSTATIC0) -sxPS Files.Mod + $(VOCSTATIC0) -sxPS OakFiles.Mod + $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod # build the compiler stage4: - $(VOCSTATIC) -sPS extTools.Mod - $(VOCSTATIC) -sPS OPM.cmdln.Mod - $(VOCSTATIC) -sxPS OPS.Mod - $(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod - $(VOCSTATIC) -smPS voc.Mod - $(VOCSTATIC) -smPS BrowserCmd.Mod - $(VOCSTATIC) -smPS OCatCmd.Mod + $(VOCSTATIC0) -sPS extTools.Mod + $(VOCSTATIC0) -sPS OPM.cmdln.Mod + $(VOCSTATIC0) -sxPS OPS.Mod + $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod + $(VOCSTATIC0) -smPS voc.Mod + $(VOCSTATIC0) -smPS BrowserCmd.Mod + $(VOCSTATIC0) -smPS OCatCmd.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -153,6 +154,7 @@ stage6: $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmPrint.Mod + $(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod stage7: #objects := $(wildcard *.o) @@ -166,11 +168,11 @@ clean: # rm_objects := rm $(wildcard *.o) # objects rm *.o - rm *.sym + rm *.so rm *.h rm *.c rm *.a - rm *.so + rm *.sym coco: $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m diff --git a/showdef b/showdef index 6963c10ad975d15675f9192840c80505c4600223..29d896a275b93de22ad542e451c4fd63e78b393e 100755 GIT binary patch delta 59 zcmaF1L+aTMsfI0#@&_3?wksTDe8~c&xsEYPDFbQMmyGjS89CaIzGDPpCLm@8VwUYk J-?1)S3jnyl84dsd delta 59 zcmaF1L+aTMsfI0#@&_52wksTDe8~c&xsEYPDFbQMmyGjS8JXITzGDPp5X}t4EZdL1 IV_mow0JV4+_5c6? diff --git a/src/lib/ulm/ulmConstStrings.Mod b/src/lib/ulm/ulmConstStrings.Mod index 86dd0bb2..86a5bf81 100644 --- a/src/lib/ulm/ulmConstStrings.Mod +++ b/src/lib/ulm/ulmConstStrings.Mod @@ -45,12 +45,12 @@ ---------------------------------------------------------------------------- *) -MODULE ConstStrings; +MODULE ulmConstStrings; (* WORM-device for strings *) - IMPORT Disciplines, Events, Objects, Process, Services, Streams, Strings, - Texts, Types; + IMPORT Disciplines := ulmDisciplines, Events := ulmEvents, Objects := ulmObjects, Process := ulmProcess, Services := ulmServices, Streams := ulmStreams, Strings := ulmStrings, + Texts := ulmTexts, Types := ulmTypes; CONST tabsize = 1031; (* should be a prime number *) @@ -74,8 +74,8 @@ MODULE ConstStrings; RECORD (Disciplines.ObjectRec) (* read-only *) - len*: Streams.Count; (* length of string in bytes *) - hashval*: LONGINT; (* hash value *) + len-: Streams.Count; (* length of string in bytes *) + hashval-: LONGINT; (* hash value *) (* private part *) domain: Domain; length: Streams.Count; (* private copy of length *) @@ -84,7 +84,7 @@ MODULE ConstStrings; next: String; (* list of strings with same hash value *) END; - TYPE + TYPE DomainRec* = RECORD (Disciplines.ObjectRec) @@ -214,9 +214,9 @@ MODULE ConstStrings; offset := buf.free; WHILE len > 0 DO IF len <= bufsize - domain.tail.free THEN - INC(domain.tail.free, len); len := 0; + INC(domain.tail.free, SHORT(len)); len := 0; ELSE - DEC(len, bufsize - domain.tail.free); + DEC(len, bufsize - LONG(domain.tail.free)); domain.tail.free := bufsize; NewBuffer; END; @@ -427,7 +427,7 @@ MODULE ConstStrings; INC(count, s.count); EXIT END; - INC(count, bytes); DEC(len, bytes); INC(offset, bytes); + INC(count, bytes); DEC(len, bytes); INC(offset, SHORT(bytes)); IF offset >= bufsize THEN buf := buf.next; offset := 0; @@ -480,7 +480,7 @@ MODULE ConstStrings; END; END ReadByte; - PROCEDURE ReadBuf(s: Streams.Stream; VAR buf: ARRAY OF BYTE; + PROCEDURE ReadBuf(s: Streams.Stream; VAR buf: ARRAY OF Types.Byte(*BYTE*); off, cnt: Streams.Count) : Streams.Count; VAR bytes, max: Streams.Count; @@ -530,10 +530,10 @@ MODULE ConstStrings; END; WHILE s.pos < realpos DO IF realpos - s.pos < bufsize - s.offset THEN - INC(s.offset, realpos - s.pos); + INC(s.offset, SHORT(realpos - s.pos)); s.pos := realpos; ELSE - INC(s.pos, bufsize - s.offset); + INC(s.pos, LONG(bufsize - s.offset)); s.offset := 0; s.buf := s.buf.next; END; @@ -572,4 +572,4 @@ BEGIN if.tell := Tell; Events.Handler(Process.startOfGarbageCollection, FreeHandler); Services.CreateType(type, "ConstStrings.ReadStream", "Streams.Stream"); -END ConstStrings. +END ulmConstStrings. diff --git a/src/voc/OPM.cmdln.Mod b/src/voc/OPM.cmdln.Mod index 4f01cf7e..9f5e55f9 100644 --- a/src/voc/OPM.cmdln.Mod +++ b/src/voc/OPM.cmdln.Mod @@ -64,7 +64,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) MaxGPtr* = MAX(LONGINT); (* maximal number of hidden fields in an exported record: *) - MaxHdFld* = 512; + MaxHdFld* = 2048; HdPtrName* = "@ptr"; HdProcName* = "@proc"; diff --git a/voc b/voc index 23db325f4c239f0f35dbb541886b717260d6be01..5a61e0f70e28eb3c5eb604cf506a2f9a18c3355c 100755 GIT binary patch delta 115 zcmWm3ISxQT7(n6t80*+Ot+>ye!zEByZlP9*L^5a6ID@D7@``u8=6cO|%P>i3$4MTK n_KP$voe$ZSgll&S9JuhH;3L5QBg9Ccks?Em0wpTjoweRRZwe@o delta 115 zcmWl~w+(p= mk+$Rcklhz&)u-U!g$Ex2LPUs>AcaDP90f{LsBe8XYWo0Yf+%ye!zEByZlP9*L^5a6ID@D7@``u8=6cO|%P>i3$4MTK n_KP$voe$ZSgll&S9JuhH;3L5QBg9Ccks?Em0wpTjoweRRZwe@o delta 115 zcmWl~w+(p= mk+$Rcklhz&)u-U!g$Ex2LPUs>AcaDP90f{LsBe8XYWo0Yf+%ye!zEByZlP9*L^5a6ID@D7@``u8=6cO|%P>i3$4MTK n_KP$voe$ZSgll&S9JuhH;3L5QBg9Ccks?Em0wpTjoweRRZwe@o delta 115 zcmWl~w+(p= mk+$Rcklhz&)u-U!g$Ex2LPUs>AcaDP90f{LsBe8XYWo0Yf+%