ported ulmStrings, ulmConstStrings.

changed hidden fields limit in OPM module.
makefiles


Former-commit-id: 6ef66fa542
This commit is contained in:
Norayr Chilingarian 2013-10-23 17:54:58 +04:00
parent 1bdad841c7
commit 022dd8ef4a
12 changed files with 126 additions and 114 deletions

View file

@ -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 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 VOC = voc
VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
VOCSTATIC = $(SETPATH) ./voc
VOCPARAM = $(shell ./vocparam > voc.par) VOCPARAM = $(shell ./vocparam > voc.par)
VERSION = GNU_Linux_$(TARCH) VERSION = GNU_Linux_$(TARCH)
LIBNAME = VishapOberon LIBNAME = VishapOberon
@ -70,22 +71,22 @@ stage2:
# this prepares modules necessary to build the compiler itself # this prepares modules necessary to build the compiler itself
stage3: stage3:
$(VOCSTATIC) -siapxPS SYSTEM.Mod $(VOCSTATIC0) -siapxPS SYSTEM.Mod
$(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod
$(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod
$(VOCSTATIC) -sxPS Files.Mod $(VOCSTATIC0) -sxPS Files.Mod
$(VOCSTATIC) -sxPS OakFiles.Mod $(VOCSTATIC0) -sxPS OakFiles.Mod
$(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod
# build the compiler # build the compiler
stage4: stage4:
$(VOCSTATIC) -sPS extTools.Mod $(VOCSTATIC0) -sPS extTools.Mod
$(VOCSTATIC) -sPS OPM.cmdln.Mod $(VOCSTATIC0) -sPS OPM.cmdln.Mod
$(VOCSTATIC) -sxPS OPS.Mod $(VOCSTATIC0) -sxPS OPS.Mod
$(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod
$(VOCSTATIC) -smPS voc.Mod $(VOCSTATIC0) -smPS voc.Mod
$(VOCSTATIC) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod
$(VOCSTATIC) -smPS OCatCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod
#this is to build the compiler from C sources. #this is to build the compiler from C sources.
#this is a way to create a bootstrap binary. #this is a way to create a bootstrap binary.
@ -153,6 +154,7 @@ stage6:
$(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod
$(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod
$(VOCSTATIC) -sP ulmPrint.Mod $(VOCSTATIC) -sP ulmPrint.Mod
$(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod
stage7: stage7:
#objects := $(wildcard *.o) #objects := $(wildcard *.o)
@ -166,11 +168,11 @@ clean:
# rm_objects := rm $(wildcard *.o) # rm_objects := rm $(wildcard *.o)
# objects # objects
rm *.o rm *.o
rm *.sym rm *.so
rm *.h rm *.h
rm *.c rm *.c
rm *.a rm *.a
rm *.so rm *.sym
coco: coco:
$(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m

View file

@ -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 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 VOC = voc
VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
VOCSTATIC = $(SETPATH) ./voc
VOCPARAM = $(shell ./vocparam > voc.par) VOCPARAM = $(shell ./vocparam > voc.par)
VERSION = GNU_Linux_$(TARCH) VERSION = GNU_Linux_$(TARCH)
LIBNAME = VishapOberon LIBNAME = VishapOberon
@ -70,22 +71,22 @@ stage2:
# this prepares modules necessary to build the compiler itself # this prepares modules necessary to build the compiler itself
stage3: stage3:
$(VOCSTATIC) -siapxPS SYSTEM.Mod $(VOCSTATIC0) -siapxPS SYSTEM.Mod
$(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod
$(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod
$(VOCSTATIC) -sxPS Files.Mod $(VOCSTATIC0) -sxPS Files.Mod
$(VOCSTATIC) -sxPS OakFiles.Mod $(VOCSTATIC0) -sxPS OakFiles.Mod
$(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod
# build the compiler # build the compiler
stage4: stage4:
$(VOCSTATIC) -sPS extTools.Mod $(VOCSTATIC0) -sPS extTools.Mod
$(VOCSTATIC) -sPS OPM.cmdln.Mod $(VOCSTATIC0) -sPS OPM.cmdln.Mod
$(VOCSTATIC) -sxPS OPS.Mod $(VOCSTATIC0) -sxPS OPS.Mod
$(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod
$(VOCSTATIC) -smPS voc.Mod $(VOCSTATIC0) -smPS voc.Mod
$(VOCSTATIC) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod
$(VOCSTATIC) -smPS OCatCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod
#this is to build the compiler from C sources. #this is to build the compiler from C sources.
#this is a way to create a bootstrap binary. #this is a way to create a bootstrap binary.
@ -153,6 +154,7 @@ stage6:
$(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod
$(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod
$(VOCSTATIC) -sP ulmPrint.Mod $(VOCSTATIC) -sP ulmPrint.Mod
$(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod
stage7: stage7:
#objects := $(wildcard *.o) #objects := $(wildcard *.o)
@ -166,11 +168,11 @@ clean:
# rm_objects := rm $(wildcard *.o) # rm_objects := rm $(wildcard *.o)
# objects # objects
rm *.o rm *.o
rm *.sym rm *.so
rm *.h rm *.h
rm *.c rm *.c
rm *.a rm *.a
rm *.so rm *.sym
coco: coco:
$(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m

View file

@ -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 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 VOC = voc
VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
VOCSTATIC = $(SETPATH) ./voc
VOCPARAM = $(shell ./vocparam > voc.par) VOCPARAM = $(shell ./vocparam > voc.par)
VERSION = GNU_Linux_$(TARCH) VERSION = GNU_Linux_$(TARCH)
LIBNAME = VishapOberon LIBNAME = VishapOberon
@ -70,22 +71,22 @@ stage2:
# this prepares modules necessary to build the compiler itself # this prepares modules necessary to build the compiler itself
stage3: stage3:
$(VOCSTATIC) -siapxPS SYSTEM.Mod $(VOCSTATIC0) -siapxPS SYSTEM.Mod
$(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod
$(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod
$(VOCSTATIC) -sxPS Files.Mod $(VOCSTATIC0) -sxPS Files.Mod
$(VOCSTATIC) -sxPS OakFiles.Mod $(VOCSTATIC0) -sxPS OakFiles.Mod
$(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod
# build the compiler # build the compiler
stage4: stage4:
$(VOCSTATIC) -sPS extTools.Mod $(VOCSTATIC0) -sPS extTools.Mod
$(VOCSTATIC) -sPS OPM.cmdln.Mod $(VOCSTATIC0) -sPS OPM.cmdln.Mod
$(VOCSTATIC) -sxPS OPS.Mod $(VOCSTATIC0) -sxPS OPS.Mod
$(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod
$(VOCSTATIC) -smPS voc.Mod $(VOCSTATIC0) -smPS voc.Mod
$(VOCSTATIC) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod
$(VOCSTATIC) -smPS OCatCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod
#this is to build the compiler from C sources. #this is to build the compiler from C sources.
#this is a way to create a bootstrap binary. #this is a way to create a bootstrap binary.
@ -153,6 +154,7 @@ stage6:
$(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod
$(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod
$(VOCSTATIC) -sP ulmPrint.Mod $(VOCSTATIC) -sP ulmPrint.Mod
$(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod
stage7: stage7:
#objects := $(wildcard *.o) #objects := $(wildcard *.o)
@ -166,11 +168,11 @@ clean:
# rm_objects := rm $(wildcard *.o) # rm_objects := rm $(wildcard *.o)
# objects # objects
rm *.o rm *.o
rm *.sym rm *.so
rm *.h rm *.h
rm *.c rm *.c
rm *.a rm *.a
rm *.so rm *.sym
coco: coco:
$(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m

View file

@ -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 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 VOC = voc
VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
VOCSTATIC = $(SETPATH) ./voc
VOCPARAM = $(shell ./vocparam > voc.par) VOCPARAM = $(shell ./vocparam > voc.par)
VERSION = GNU_Linux_$(TARCH) VERSION = GNU_Linux_$(TARCH)
LIBNAME = VishapOberon LIBNAME = VishapOberon
@ -70,22 +71,22 @@ stage2:
# this prepares modules necessary to build the compiler itself # this prepares modules necessary to build the compiler itself
stage3: stage3:
$(VOCSTATIC) -siapxPS SYSTEM.Mod $(VOCSTATIC0) -siapxPS SYSTEM.Mod
$(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod
$(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod
$(VOCSTATIC) -sxPS Files.Mod $(VOCSTATIC0) -sxPS Files.Mod
$(VOCSTATIC) -sxPS OakFiles.Mod $(VOCSTATIC0) -sxPS OakFiles.Mod
$(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod
# build the compiler # build the compiler
stage4: stage4:
$(VOCSTATIC) -sPS extTools.Mod $(VOCSTATIC0) -sPS extTools.Mod
$(VOCSTATIC) -sPS OPM.cmdln.Mod $(VOCSTATIC0) -sPS OPM.cmdln.Mod
$(VOCSTATIC) -sxPS OPS.Mod $(VOCSTATIC0) -sxPS OPS.Mod
$(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod
$(VOCSTATIC) -smPS voc.Mod $(VOCSTATIC0) -smPS voc.Mod
$(VOCSTATIC) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod
$(VOCSTATIC) -smPS OCatCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod
#this is to build the compiler from C sources. #this is to build the compiler from C sources.
#this is a way to create a bootstrap binary. #this is a way to create a bootstrap binary.
@ -153,6 +154,7 @@ stage6:
$(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod
$(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod
$(VOCSTATIC) -sP ulmPrint.Mod $(VOCSTATIC) -sP ulmPrint.Mod
$(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod
stage7: stage7:
#objects := $(wildcard *.o) #objects := $(wildcard *.o)
@ -166,11 +168,11 @@ clean:
# rm_objects := rm $(wildcard *.o) # rm_objects := rm $(wildcard *.o)
# objects # objects
rm *.o rm *.o
rm *.sym rm *.so
rm *.h rm *.h
rm *.c rm *.c
rm *.a rm *.a
rm *.so rm *.sym
coco: coco:
$(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m

View file

@ -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 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 VOC = voc
VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
VOCSTATIC = $(SETPATH) ./voc
VOCPARAM = $(shell ./vocparam > voc.par) VOCPARAM = $(shell ./vocparam > voc.par)
VERSION = GNU_Linux_$(TARCH) VERSION = GNU_Linux_$(TARCH)
LIBNAME = VishapOberon LIBNAME = VishapOberon
@ -70,22 +71,22 @@ stage2:
# this prepares modules necessary to build the compiler itself # this prepares modules necessary to build the compiler itself
stage3: stage3:
$(VOCSTATIC) -siapxPS SYSTEM.Mod $(VOCSTATIC0) -siapxPS SYSTEM.Mod
$(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod
$(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod
$(VOCSTATIC) -sxPS Files.Mod $(VOCSTATIC0) -sxPS Files.Mod
$(VOCSTATIC) -sxPS OakFiles.Mod $(VOCSTATIC0) -sxPS OakFiles.Mod
$(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod
# build the compiler # build the compiler
stage4: stage4:
$(VOCSTATIC) -sPS extTools.Mod $(VOCSTATIC0) -sPS extTools.Mod
$(VOCSTATIC) -sPS OPM.cmdln.Mod $(VOCSTATIC0) -sPS OPM.cmdln.Mod
$(VOCSTATIC) -sxPS OPS.Mod $(VOCSTATIC0) -sxPS OPS.Mod
$(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod
$(VOCSTATIC) -smPS voc.Mod $(VOCSTATIC0) -smPS voc.Mod
$(VOCSTATIC) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod
$(VOCSTATIC) -smPS OCatCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod
#this is to build the compiler from C sources. #this is to build the compiler from C sources.
#this is a way to create a bootstrap binary. #this is a way to create a bootstrap binary.
@ -153,6 +154,7 @@ stage6:
$(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod
$(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod
$(VOCSTATIC) -sP ulmPrint.Mod $(VOCSTATIC) -sP ulmPrint.Mod
$(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod
stage7: stage7:
#objects := $(wildcard *.o) #objects := $(wildcard *.o)
@ -166,11 +168,11 @@ clean:
# rm_objects := rm $(wildcard *.o) # rm_objects := rm $(wildcard *.o)
# objects # objects
rm *.o rm *.o
rm *.sym rm *.so
rm *.h rm *.h
rm *.c rm *.c
rm *.a rm *.a
rm *.so rm *.sym
coco: coco:
$(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m

View file

@ -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 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 VOC = voc
VOCSTATIC = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH) VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
VOCSTATIC = $(SETPATH) ./voc
VOCPARAM = $(shell ./vocparam > voc.par) VOCPARAM = $(shell ./vocparam > voc.par)
VERSION = GNU_Linux_$(TARCH) VERSION = GNU_Linux_$(TARCH)
LIBNAME = VishapOberon LIBNAME = VishapOberon
@ -70,22 +71,22 @@ stage2:
# this prepares modules necessary to build the compiler itself # this prepares modules necessary to build the compiler itself
stage3: stage3:
$(VOCSTATIC) -siapxPS SYSTEM.Mod $(VOCSTATIC0) -siapxPS SYSTEM.Mod
$(VOCSTATIC) -sPS Args.Mod Console.Mod Unix.Mod $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod
$(VOCSTATIC) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod
$(VOCSTATIC) -sxPS Files.Mod $(VOCSTATIC0) -sxPS Files.Mod
$(VOCSTATIC) -sxPS OakFiles.Mod $(VOCSTATIC0) -sxPS OakFiles.Mod
$(VOCSTATIC) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod $(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod
# build the compiler # build the compiler
stage4: stage4:
$(VOCSTATIC) -sPS extTools.Mod $(VOCSTATIC0) -sPS extTools.Mod
$(VOCSTATIC) -sPS OPM.cmdln.Mod $(VOCSTATIC0) -sPS OPM.cmdln.Mod
$(VOCSTATIC) -sxPS OPS.Mod $(VOCSTATIC0) -sxPS OPS.Mod
$(VOCSTATIC) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod $(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod
$(VOCSTATIC) -smPS voc.Mod $(VOCSTATIC0) -smPS voc.Mod
$(VOCSTATIC) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod
$(VOCSTATIC) -smPS OCatCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod
#this is to build the compiler from C sources. #this is to build the compiler from C sources.
#this is a way to create a bootstrap binary. #this is a way to create a bootstrap binary.
@ -153,6 +154,7 @@ stage6:
$(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod $(VOCSTATIC) -sP ulmIndirectDisciplines.Mod ulmStreamDisciplines.Mod
$(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod $(VOCSTATIC) -sP ulmIEEE.Mod ulmMC68881.Mod ulmReals.Mod
$(VOCSTATIC) -sP ulmPrint.Mod $(VOCSTATIC) -sP ulmPrint.Mod
$(VOCSTATIC) -sP ulmTexts.Mod ulmStrings.Mod ulmConstStrings.Mod
stage7: stage7:
#objects := $(wildcard *.o) #objects := $(wildcard *.o)
@ -166,11 +168,11 @@ clean:
# rm_objects := rm $(wildcard *.o) # rm_objects := rm $(wildcard *.o)
# objects # objects
rm *.o rm *.o
rm *.sym rm *.so
rm *.h rm *.h
rm *.c rm *.c
rm *.a rm *.a
rm *.so rm *.sym
coco: coco:
$(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m $(JET) Sets.Mod Oberon.Mod CRS.Mod CRT.Mod CRA.Mod CRX.Mod CRP.Mod Coco.Mod -m

View file

@ -1 +1 @@
6963c10ad975d15675f9192840c80505c4600223 29d896a275b93de22ad542e451c4fd63e78b393e

View file

@ -45,12 +45,12 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
*) *)
MODULE ConstStrings; MODULE ulmConstStrings;
(* WORM-device for strings *) (* WORM-device for strings *)
IMPORT Disciplines, Events, Objects, Process, Services, Streams, Strings, IMPORT Disciplines := ulmDisciplines, Events := ulmEvents, Objects := ulmObjects, Process := ulmProcess, Services := ulmServices, Streams := ulmStreams, Strings := ulmStrings,
Texts, Types; Texts := ulmTexts, Types := ulmTypes;
CONST CONST
tabsize = 1031; (* should be a prime number *) tabsize = 1031; (* should be a prime number *)
@ -74,8 +74,8 @@ MODULE ConstStrings;
RECORD RECORD
(Disciplines.ObjectRec) (Disciplines.ObjectRec)
(* read-only *) (* read-only *)
len*: Streams.Count; (* length of string in bytes *) len-: Streams.Count; (* length of string in bytes *)
hashval*: LONGINT; (* hash value *) hashval-: LONGINT; (* hash value *)
(* private part *) (* private part *)
domain: Domain; domain: Domain;
length: Streams.Count; (* private copy of length *) length: Streams.Count; (* private copy of length *)
@ -84,7 +84,7 @@ MODULE ConstStrings;
next: String; (* list of strings with same hash value *) next: String; (* list of strings with same hash value *)
END; END;
TYPE TYPE
DomainRec* = DomainRec* =
RECORD RECORD
(Disciplines.ObjectRec) (Disciplines.ObjectRec)
@ -214,9 +214,9 @@ MODULE ConstStrings;
offset := buf.free; offset := buf.free;
WHILE len > 0 DO WHILE len > 0 DO
IF len <= bufsize - domain.tail.free THEN IF len <= bufsize - domain.tail.free THEN
INC(domain.tail.free, len); len := 0; INC(domain.tail.free, SHORT(len)); len := 0;
ELSE ELSE
DEC(len, bufsize - domain.tail.free); DEC(len, bufsize - LONG(domain.tail.free));
domain.tail.free := bufsize; domain.tail.free := bufsize;
NewBuffer; NewBuffer;
END; END;
@ -427,7 +427,7 @@ MODULE ConstStrings;
INC(count, s.count); INC(count, s.count);
EXIT EXIT
END; END;
INC(count, bytes); DEC(len, bytes); INC(offset, bytes); INC(count, bytes); DEC(len, bytes); INC(offset, SHORT(bytes));
IF offset >= bufsize THEN IF offset >= bufsize THEN
buf := buf.next; buf := buf.next;
offset := 0; offset := 0;
@ -480,7 +480,7 @@ MODULE ConstStrings;
END; END;
END ReadByte; 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; off, cnt: Streams.Count) : Streams.Count;
VAR VAR
bytes, max: Streams.Count; bytes, max: Streams.Count;
@ -530,10 +530,10 @@ MODULE ConstStrings;
END; END;
WHILE s.pos < realpos DO WHILE s.pos < realpos DO
IF realpos - s.pos < bufsize - s.offset THEN IF realpos - s.pos < bufsize - s.offset THEN
INC(s.offset, realpos - s.pos); INC(s.offset, SHORT(realpos - s.pos));
s.pos := realpos; s.pos := realpos;
ELSE ELSE
INC(s.pos, bufsize - s.offset); INC(s.pos, LONG(bufsize - s.offset));
s.offset := 0; s.offset := 0;
s.buf := s.buf.next; s.buf := s.buf.next;
END; END;
@ -572,4 +572,4 @@ BEGIN
if.tell := Tell; if.tell := Tell;
Events.Handler(Process.startOfGarbageCollection, FreeHandler); Events.Handler(Process.startOfGarbageCollection, FreeHandler);
Services.CreateType(type, "ConstStrings.ReadStream", "Streams.Stream"); Services.CreateType(type, "ConstStrings.ReadStream", "Streams.Stream");
END ConstStrings. END ulmConstStrings.

View file

@ -64,7 +64,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *)
MaxGPtr* = MAX(LONGINT); MaxGPtr* = MAX(LONGINT);
(* maximal number of hidden fields in an exported record: *) (* maximal number of hidden fields in an exported record: *)
MaxHdFld* = 512; MaxHdFld* = 2048;
HdPtrName* = "@ptr"; HdPtrName* = "@ptr";
HdProcName* = "@proc"; HdProcName* = "@proc";

View file

@ -1 +1 @@
23db325f4c239f0f35dbb541886b717260d6be01 5a61e0f70e28eb3c5eb604cf506a2f9a18c3355c

View file

@ -1 +1 @@
23db325f4c239f0f35dbb541886b717260d6be01 5a61e0f70e28eb3c5eb604cf506a2f9a18c3355c

View file

@ -1 +1 @@
23db325f4c239f0f35dbb541886b717260d6be01 5a61e0f70e28eb3c5eb604cf506a2f9a18c3355c