From: hachti <hachti>
Date: Mon, 28 May 2007 01:15:15 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://gitweb.hachti.de/?p=h316.git;a=commitdiff_plain;h=1f281d4826c416ec3cf4952d9c1f9409c77a9fa1

*** empty log message ***
---

diff --git a/bin/fboot b/bin/fboot
index 6a23624..9e43a5c 100755
--- a/bin/fboot
+++ b/bin/fboot
@@ -15,7 +15,7 @@ echo $objname
 LIBS="$H316/lib/fortran/lib/flib1.lib\
 	$H316/lib/fortran/lib/flib2.lib\
 	$H316/lib/fortran/lib/flib3.lib\
-	$H316/lib/iolib/lib/io.lib\
+	$H316/lib/iolib/lib/io.lib
 "
 
 
@@ -40,8 +40,8 @@ cat >> $locname.go <<EOF
 !echo -e "\n************************"
 run 36002
 ! echo -e "\n************************"
-set cpu history=65536
-set break 0-17
+
+r
 at ptp /dev/lp0
 d p 37000
 d a 1000
diff --git a/bin/fload b/bin/fload
index 8dbd257..ca69753 100755
--- a/bin/fload
+++ b/bin/fload
@@ -34,10 +34,11 @@ for library in $LIBS; do
     fi
     echo "at ptr $library" >> $locname.go
     echo "go" >> $locname.go
+    echo "! echo loading $library" >> $locname.go
 done
 
 cat >> $locname.go <<EOF
-!echo -e "\n************************"
+! echo -e "\n************************"
 run 36002
 ! echo -e "\n************************"
 set cpu history=65536
diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index 3b16d61..9fb1c4f 100644
--- a/lib/fortran/Makefile
+++ b/lib/fortran/Makefile
@@ -11,8 +11,7 @@ export ORG_OBJDIR=org
 
 export MAKE
 
-MODULES = uc f$$w4 f$$w1 pchar fpatch lpchar 
-#vpunch font
+MODULES = uc f$$w4 f$$w1 pchar fpatch lpchar reboot vpunch font
 
 FRTN_COMMAND = frtn_original
 ASM_COMMAND  = asm_original
diff --git a/lib/fortran/recipe/flib3.recipe b/lib/fortran/recipe/flib3.recipe
index 40a2c88..3cfe653 100644
--- a/lib/fortran/recipe/flib3.recipe
+++ b/lib/fortran/recipe/flib3.recipe
@@ -24,3 +24,4 @@ org/F$HT
     obj/PCHAR
     obj/LPCHAR
     obj/UCHAR
+   obj/REBOOT
diff --git a/lib/fortran/recipe/vpunch.recipe b/lib/fortran/recipe/vpunch.recipe
index 3d3ec1e..dd98f06 100644
--- a/lib/fortran/recipe/vpunch.recipe
+++ b/lib/fortran/recipe/vpunch.recipe
@@ -1,2 +1,2 @@
-#obj/VPUNCH
-#obj/FONT
+obj/VPUNCH
+obj/FONT
diff --git a/lib/fortran/src/f$w4.asm b/lib/fortran/src/f$w4.asm
index 7c7d670..82c62ae 100644
--- a/lib/fortran/src/f$w4.asm
+++ b/lib/fortran/src/f$w4.asm
@@ -54,13 +54,14 @@ FW4F	LDA*	FW4H
 	ANA	='377
 	ERA	='120000
 	STA*	FW4H
-FW4G	CALL	O$LC	CARRIAGE RETURN ONLY
-	CALL 	O$LP	OUTPUT ONE LINE OF INFORMATION
+FW4G	CALL 	O$LP	OUTPUT ONE LINE OF INFORMATION
 FW4H	***	**
+	CALL	O$LC	CARRIAGE RETURN ONLY
+	CALL 	O$LF
 	IRS	FW4A
 	JMP*	FW4A
 FW4J	DAC	**
-	CALL	O$LF	LF ONLY
+*	CALL	O$LF	LF ONLY
 	IRS	CNTR
 	JMP*	FW4J
 	LDA	=-17
diff --git a/lib/iolib/Makefile b/lib/iolib/Makefile
index a0a5068..67b72fe 100644
--- a/lib/iolib/Makefile
+++ b/lib/iolib/Makefile
@@ -11,7 +11,7 @@ export ORG_OBJDIR=org
 
 export MAKE
 
-MODULES = o$$al  o$$la-laser o$$la o$$pl o$$pb i$$pa
+MODULES = o$$al  o$$la o$$pl o$$pb i$$pa
 
 FRTN_COMMAND = frtn_original
 ASM_COMMAND  = asm_original
diff --git a/programs/mandelbrot/src/apfel4.f b/programs/mandelbrot/src/apfel4.f
index cadee73..1f16654 100644
--- a/programs/mandelbrot/src/apfel4.f
+++ b/programs/mandelbrot/src/apfel4.f
@@ -24,7 +24,7 @@ C
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
 C                        START MESSAGE
   100  WRITE (1,10)
-   10  FORMAT (46HMANDELBROT-DEMO 3RC1 02.04.2006, PH. HACHTMANN,
+   10  FORMAT (46HMANDELBROT-DEMO 4 06.01.2007, PH. HACHTMANN,
      + 20H - PRELIMIMARY ISSUE)
 C
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
diff --git a/programs/punchomat/src/punchomat.f b/programs/punchomat/src/punchomat.f
index 78b5474..0a75af0 100644
--- a/programs/punchomat/src/punchomat.f
+++ b/programs/punchomat/src/punchomat.f
@@ -1,19 +1,23 @@
 CCCCCC PUNCHOMAT-HAUPTPROGRAMM, 31.05.2005
 C
        DIMENSION PUFF(40)
+       INTEGER PUFF
 C
-       WRITE(1,1000)
+       WRITE(4,1000)
 1000   FORMAT(45HPHILIPP HACHTMANN'S COOL VISIBLE PUNCH DEMO! )
        WRITE(1,1001)
 1001   FORMAT (10H27.05.2005)
 C
 C
-666    WRITE (1, 1002)
+666    WRITE (4, 1002)
 1002   FORMAT (2HPP)
+C
        READ (1,1003) PUFF
+       WRITE (4,1002)
 1003   FORMAT (40A2)
-1004   FORMAT (40A2)      
-       WRITE (4,1004)PUFF
+1004   FORMAT (4H--->,40A2)      
+       WRITE (4,1004) PUFF
+       CALL REBOOT
        GO TO 666
        END
 $0