From c6301d07c84cf71c19ac3b3a6421fa259dd3d7a2 Mon Sep 17 00:00:00 2001 From: hachti Date: Sat, 7 Mar 2009 15:33:50 +0000 Subject: [PATCH] *** empty log message *** --- bin/super3 | 5 +++++ config/libs.config | 1 + lib/fortran/recipe/flib3.recipe | 2 +- lib/hachti/src/pl$mv.asm | 2 +- lib/iolib/Makefile | 2 +- programs/plotter/src/pentagramm.f | 6 +++--- programs/plotter/src/plotapfel2.f | 13 ++++++++----- programs/plotter/src/sinus.f | 10 ++++++++-- programs/plotter/src/stern.f | 1 + 9 files changed, 29 insertions(+), 13 deletions(-) diff --git a/bin/super3 b/bin/super3 index f2ec8f1..3ceccbf 100755 --- a/bin/super3 +++ b/bin/super3 @@ -4,6 +4,11 @@ rest $H316/sys/super3.sys echo Super 3 loaded. EOF +if [ -e "$1" ]; then + echo "echo Running $1." >> super3.do + echo "do $1" >> super3.do +fi + h316 super3.do rm -f super3.do diff --git a/config/libs.config b/config/libs.config index 9c4acdf..fbfd44e 100644 --- a/config/libs.config +++ b/config/libs.config @@ -8,6 +8,7 @@ LOAD_LIBS="\ $H316/lib/fortran/lib/math.lib\ $H316/lib/iolib/lib/io.lib\ $H316/lib/hachti/lib/stack.lib\ + $H316/lib/hachti/lib/lock.lib\ " #LOAD_LIBS="\ diff --git a/lib/fortran/recipe/flib3.recipe b/lib/fortran/recipe/flib3.recipe index 2849d03..af2dc32 100644 --- a/lib/fortran/recipe/flib3.recipe +++ b/lib/fortran/recipe/flib3.recipe @@ -21,7 +21,7 @@ org/F$B5 org/F$F5 org/F$IO org/F$HT -# obj/PCHAR + obj/PCHAR # obj/LPCHAR # obj/UCHAR obj/REBOOT diff --git a/lib/hachti/src/pl$mv.asm b/lib/hachti/src/pl$mv.asm index 89d3609..6e314c9 100644 --- a/lib/hachti/src/pl$mv.asm +++ b/lib/hachti/src/pl$mv.asm @@ -66,8 +66,8 @@ * ******************************************************************************** * - SUBR PL$RST,RST SUBR PL$MV,MOVE + SUBR PL$RST,RST SUBR PL$X,XU SUBR PL$Y,YU SUBR PL$MVR,MVR diff --git a/lib/iolib/Makefile b/lib/iolib/Makefile index 46ab507..587fc2a 100644 --- a/lib/iolib/Makefile +++ b/lib/iolib/Makefile @@ -63,7 +63,7 @@ $(OBJECT_FILES) : $(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm @ cd $(OBJ_DIR) && $(ASM_COMMAND) ../$(subst $$,\$$,$^) $(LISTING) @ cd $(OBJ_DIR) && $(LDC_COMMAND) $(notdir $(subst $$,\$$,$@)) -$(LIBS):$(LIB_DIR)/%.lib: $(RECIPE_DIR)/%$(RECIPE_SUFFIX) $(ORG_OBJDIR)/lastrun $(OBJECTS) +$(LIBS):$(LIB_DIR)/%.lib: $(RECIPE_DIR)/%$(RECIPE_SUFFIX) $(ORG_OBJDIR)/lastrun $(OBJECTS) @./buildlib.sh genlib $(RECIPE_DIR)/$(basename $(notdir $@))$(RECIPE_SUFFIX) diff --git a/programs/plotter/src/pentagramm.f b/programs/plotter/src/pentagramm.f index e7270f0..8c7f87f 100644 --- a/programs/plotter/src/pentagramm.f +++ b/programs/plotter/src/pentagramm.f @@ -1,4 +1,4 @@ -C +C DRAW A PENTAGRAM IN A CIRCLE C C C @@ -6,12 +6,12 @@ C INTEGER RADIUS REAL RADIUR,RADF C - RADIUS=100 + RADIUS=400 RADIUR=RADIUS PI=3.14159265 RADF=(2.0*PI)/360.0 C - CALL PL$RST + CALL PL$INI CALL PL$MV(RADIUS,RADIUS) CALL PL$RST C diff --git a/programs/plotter/src/plotapfel2.f b/programs/plotter/src/plotapfel2.f index 95aae1e..4f25c4c 100644 --- a/programs/plotter/src/plotapfel2.f +++ b/programs/plotter/src/plotapfel2.f @@ -41,6 +41,7 @@ C WRITE (1,55) 55 FORMAT (1H0) C + CALL PLOTI CALL CALC2 C WRITE(1, 60) @@ -108,7 +109,9 @@ CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC SUBROUTINE PLOTI INTEGER PEN,PENX COMMON /PENSTA/PEN,PENX - CALL PL$UP + CALL PL$INI + CALL PL$SCL(3.0) + CALL PL$PU PEN=0 PENX=0 RETURN @@ -120,9 +123,9 @@ C CALL PL$R IF (PEN.EQ.0) CALL PL$PD PEN=1 - CALL PL$UP + CALL PL$U CALL PL$R - CALL PL$DN + CALL PL$D PENX=PENX+2 RETURN END @@ -147,8 +150,8 @@ C PENX=PENX-1 GO TO 8000 8100 CONTINUE - CALL PL$DN - CALL PL$DN + CALL PL$D + CALL PL$D RETURN END C diff --git a/programs/plotter/src/sinus.f b/programs/plotter/src/sinus.f index 42a36ca..0e52e03 100644 --- a/programs/plotter/src/sinus.f +++ b/programs/plotter/src/sinus.f @@ -4,7 +4,9 @@ C INTEGER X,Y C C - 1000 CALL PL$RST +C + 1000 CALL PL$INI + CALL PL$SCL(2.54) C CALL GITTER CALL PL$PU @@ -54,7 +56,8 @@ C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC C SUBROUTINE GITTER - INTEGER X,Y + INTEGER X,Y,STAK(400) + CALL S$INIT(STAK,400) DO 2000 X=0,600,50 CALL LINE(X,-100,X,100) 2000 CONTINUE @@ -71,6 +74,9 @@ C CALL LINE (0,-1,600,-1) CALL LINE (-1,-100,-1,100) CALL LINE (1,-100,1,100) + CALL PL$PU + CALL PL$MV(0,110) + CALL PL$TXT(STAK,37HSinus-Demo, 08.11.2008, Ph. Hachtmann,37) C RETURN END diff --git a/programs/plotter/src/stern.f b/programs/plotter/src/stern.f index efc9c4d..e64a991 100644 --- a/programs/plotter/src/stern.f +++ b/programs/plotter/src/stern.f @@ -24,6 +24,7 @@ C C C 10000 CALL REBOOT + CALL LIBLOK END $0 -- 2.32.0