*** empty log message ***

diff --git a/Makefile b/Makefile
index 308ff69c3f6210579f3cfc9785496f02e9ecffae..f9a129abbc3a34c6c2284d3b5e9e69156cfa63cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,51 @@
 # Toplevel Makefile for Hachti's H316 stuff collection
 
+<<<<<<< Makefile
+# First we need the PC side tools. Nothing runs without them!
+SUBDIRS=pc-tools/ldc pc-tools/src-filters  pc-tools/boot-maker 
+
+# Now we build the libraries which are always rebuild using the original compiler and 
+# assembler tapes
+SUBDIRS+=lib/iolib lib/fortran \
+
+# Here we link the assembler - via a trick
+SUBDIRS+=systems/dap
+
+# What's missing for the systems
+SUBDIRS+=programs/tools
+
+# Now we can build the super images and slst
+SUBDIRS+=systems
+
+# The compiler is rebuilt as well!
+SUBDIRS+=programs/frtn
+
+# And all other H316 tools depending on all the other stuff
+SUBDIRS+=programs/mandelbrot\
+        programs/punchomat\
+
+
+=======
 SUBDIRS=pc-tools/ldc pc-tools/src-filters  pc-tools/boot-maker lib/iolib lib/fortran \
         lib/fortran  lib/iolib programs/mandelbrot\
         programs/punchomat programs/tools systems
+>>>>>>> 1.12
 
 #lib/fortran/vpunch-help
 
 # If you want to build the docs, too: Uncomment next line:
 #SUBDIRS+=docs/manual
+cvsclean: clean
+       touch slst/* sys/*
 
 default: 
-       $(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir)&&) /bin/true
+       @$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir)&&) /bin/true
 
 %:
        @echo $@
        $(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@;)
 
 
-.PHONY: default
+.PHONY: default cvsclean
 
 

diff --git a/bin/asm b/bin/asm
index cbf6847c4dca428d68350a5c927b0636c909e9cb..08adc2853091ef57785356cff80db2ca6154f71b 100755 (executable)
--- a/bin/asm
+++ b/bin/asm
@@ -22,6 +22,7 @@ rm  -f $name.obj
 
 cat > $name.go <<EOF
 rest  $H316/sys/dap.sys
+r
 d a 120420
 d p 1000 
 at ptr $name.par 

diff --git a/bin/asm_original b/bin/asm_original
new file mode 100755 (executable)
index 0000000..7e2080d
--- /dev/null
+++ b/bin/asm_original
@@ -0,0 +1,62 @@
+#!/bin/sh
+# Assembler wrapper for simh h316
+
+if [ ! $1 ] ; then
+    echo "Argument missing!"
+    exit 2
+fi
+
+echo "Assembling $1 with original DAP 8K SLST!"
+
+for n in $*; do
+  if [ $n == "/v" ]; then
+    VERBOSE=yes
+  fi
+done
+
+name=`basename $1 .asm`
+listfile=$name.lst
+
+cat $1 | tab | paron > $name.par
+
+rm  -f $name.lst
+rm  -f $name.obj
+
+cat > $name.go <<EOF
+at ptr $H316/honeywell/slst/dap_8k.slst
+boot ptr
+r
+d a 120420
+d p 1000 
+at ptr $name.par 
+at ptp $name.obj 
+at tty3 $listfile 
+set tty3 uascii 
+set tty3 start 
+go 
+d ptr pos 0 
+go 
+quit 
+EOF
+
+if [ "$VERBOSE" == "yes" ]; then
+  h316 $name.go 
+else
+  h316 $name.go > /dev/null
+fi
+
+
+if cat $name.lst | grep "NO ERRORS IN ABOVE ASSEMBLY">/dev/null 2>&1; then
+       if [ !  $2  ]; then
+               rm $name.lst
+               rm -f $name.par
+               rm -f $name.go
+       fi
+       echo "DAP-16 assembly successfull :-)"
+       exit 0
+fi
+cat $name.lst
+echo -e "\nDAP-16 assembly FAILED!"
+rm -f $name.obj
+exit 77
+

diff --git a/bin/dap-link.sh b/bin/dap-link.sh
deleted file mode 100755 (executable)
index 4467d7d..0000000
--- a/bin/dap-link.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-cat > dap-rebuild.go <<EOF
-rest $H316/sys/super3.sys
-at ptr $H316/obj/dap16.obj
-run 36000
-go
-at ptr $H316/obj/ios-16.obj
-go
-at ptr $H316/lib/iolib/lib/dap-lib.lib
-go
-echo now loaded before dumy:
-run 36002
-echo now satisfying....
-at ptr $H316/obj/dumy-x16.obj
-;IMPORTANT! THERE ARENT NO MORE UNSATISFIED IN THE FIRST
-;EXPORT BLOCK. SECOND BLOCK SEEMS NOT TO TRIGGER DUMMY!
-d p 36004
-go
-go
-
-at ptr $H316/obj/deccl.obj
-go
-at ptr $H316/obj/setsiz.obj
-go
-go
-
-
-r
-
-; Uncomment if you want an slst file
-;at ptp $H316/slst/dap-auto.slst
-;run 37000
-;d a 100
-;go
-;d a 17777
-;go
-;d p 1000
-;d a 120420
-
-save $H316/sys/dap.sys
-
-run 36002
-q
-EOF
-
-h316 dap-rebuild.go
-rm dap-rebuild.go
-
-

diff --git a/bin/frtn b/bin/frtn
index 42a6ce8a3f87c25f010f2d6860a05d073f726737..1f8bd7c5f273e16840efa54a4711f987df48266e 100755 (executable)
--- a/bin/frtn
+++ b/bin/frtn
@@ -22,18 +22,17 @@ at tty3 $listfile
 set tty3 uascii
 set tty3 start
 d a 311
+;d a 310
 d p 1000
 d ss1 0
 d ss2 1
 d ss3 0
 d ss4 0
 go
-quit
+;quit
 EOF
 
 h316 $name.go > /dev/null
-rm -f $name.par
-rm -f $name.go
 
 if cat $name.lst | egrep "[*]{36,40}">/dev/null 2>&1; then
        cat $name.lst
@@ -44,6 +43,9 @@ fi
 
 if [ !  $2  ]; then
        rm $name.lst
+       rm -f $name.go
+       rm -f $name.par
+
 fi
 echo "FORTRAN IV compilation successfull."
 exit 0

diff --git a/bin/frtn_original b/bin/frtn_original
new file mode 100755 (executable)
index 0000000..eb0faa9
--- /dev/null
+++ b/bin/frtn_original
@@ -0,0 +1,59 @@
+#!/bin/sh
+# FORTRAN IV compiler wrapper for simh h316
+
+if [ ! $1 ] ; then
+    echo "Argument missing!"
+    exit 2
+fi
+
+echo "Compiling $1 with original FORTRAN 8K!"
+
+name=`basename $1 .f`
+listfile=$name.lst
+
+cat $1 | tab | paron > $name.par
+rm  -f $name.lst
+rm  -f $name.obj
+
+cat > $name.go <<EOF
+at ptr $H316/honeywell/slst/frtn_8k.slst
+boot ptr
+
+r
+at ptr $name.par
+at ptp $name.obj
+at tty3 $listfile
+set tty3 uascii
+set tty3 start
+d a 311
+;d a 310
+d p 1000
+d ss1 0
+d ss2 1
+d ss3 0
+d ss4 0
+go
+;quit
+EOF
+
+h316 $name.go 
+#> /dev/null
+
+if cat $name.lst | egrep "[*]{36,40}">/dev/null 2>&1; then
+       cat $name.lst
+       echo -e "\n\nFORTRAN IV compilation FAILED!"
+       rm -f $name.obj
+       exit 77
+fi
+
+if [ !  $2  ]; then
+       rm $name.lst
+       rm -f $name.go
+       rm -f $name.par
+
+fi
+echo "FORTRAN IV compilation successfull."
+exit 0
+
+
+

diff --git a/honeywell/obj/dap16.obj b/honeywell/obj/dap16.obj
new file mode 100644 (file)
index 0000000..5764509
Binary files /dev/null and b/honeywell/obj/dap16.obj differ

diff --git a/honeywell/obj/deccl.obj b/honeywell/obj/deccl.obj
new file mode 100644 (file)
index 0000000..abbbedc
Binary files /dev/null and b/honeywell/obj/deccl.obj differ

diff --git a/honeywell/obj/dumy-x16.obj b/honeywell/obj/dumy-x16.obj
new file mode 100644 (file)
index 0000000..1ba302c
Binary files /dev/null and b/honeywell/obj/dumy-x16.obj differ

diff --git a/honeywell/obj/info.txt b/honeywell/obj/info.txt
new file mode 100644 (file)
index 0000000..abc1525
--- /dev/null
+++ b/honeywell/obj/info.txt
@@ -0,0 +1 @@
+Here we have original objects from Honeywell
\ No newline at end of file

diff --git a/honeywell/obj/ios-16.obj b/honeywell/obj/ios-16.obj
new file mode 100644 (file)
index 0000000..3c78430
Binary files /dev/null and b/honeywell/obj/ios-16.obj differ

diff --git a/honeywell/obj/ldr-apm.obj b/honeywell/obj/ldr-apm.obj
new file mode 100644 (file)
index 0000000..59de01d
Binary files /dev/null and b/honeywell/obj/ldr-apm.obj differ

diff --git a/honeywell/obj/ldr-dumy.obj b/honeywell/obj/ldr-dumy.obj
new file mode 100644 (file)
index 0000000..51cc8d2
Binary files /dev/null and b/honeywell/obj/ldr-dumy.obj differ

diff --git a/honeywell/obj/pal-ap.obj b/honeywell/obj/pal-ap.obj
new file mode 100644 (file)
index 0000000..70f85dc
Binary files /dev/null and b/honeywell/obj/pal-ap.obj differ

diff --git a/honeywell/obj/prntnz.obj b/honeywell/obj/prntnz.obj
new file mode 100644 (file)
index 0000000..51cccf7
Binary files /dev/null and b/honeywell/obj/prntnz.obj differ

diff --git a/honeywell/obj/setsiz.obj b/honeywell/obj/setsiz.obj
new file mode 100644 (file)
index 0000000..76ee59a
Binary files /dev/null and b/honeywell/obj/setsiz.obj differ

diff --git a/honeywell/slst/dap_8k.slst b/honeywell/slst/dap_8k.slst
new file mode 100644 (file)
index 0000000..1b94690
Binary files /dev/null and b/honeywell/slst/dap_8k.slst differ

diff --git a/honeywell/slst/frtn_8k.slst b/honeywell/slst/frtn_8k.slst
new file mode 100644 (file)
index 0000000..d528b88
Binary files /dev/null and b/honeywell/slst/frtn_8k.slst differ

diff --git a/honeywell/slst/ldr-apm_8k.slst b/honeywell/slst/ldr-apm_8k.slst
new file mode 100644 (file)
index 0000000..9a6f72f
Binary files /dev/null and b/honeywell/slst/ldr-apm_8k.slst differ

diff --git a/honeywell/slst/pal-ap_4k.slst b/honeywell/slst/pal-ap_4k.slst
new file mode 100644 (file)
index 0000000..4ba7221
Binary files /dev/null and b/honeywell/slst/pal-ap_4k.slst differ

diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index f6d8e427fae68ab3aa26b45f8c8a247ff31233d5..3b16d61260986c7c84caf50947b80be747595831 100644 (file)
--- a/lib/fortran/Makefile
+++ b/lib/fortran/Makefile
@@ -14,8 +14,8 @@ export MAKE
 MODULES = uc f$$w4 f$$w1 pchar fpatch lpchar 
 #vpunch font
 
-FRTN_COMMAND = frtn
-ASM_COMMAND  = asm
+FRTN_COMMAND = frtn_original
+ASM_COMMAND  = asm_original
 LDC_COMMAND  = ldc
 
 #############

diff --git a/lib/iolib/Makefile b/lib/iolib/Makefile
index 9e49a38d28dc78a6d731af04e5c4c0db35ef67f4..67b72feaa9b8c250998ebd690b491fd75eab285e 100644 (file)
--- a/lib/iolib/Makefile
+++ b/lib/iolib/Makefile
@@ -13,8 +13,8 @@ export MAKE
 
 MODULES = o$$al  o$$la o$$pl o$$pb i$$pa
 
-FRTN_COMMAND = frtn
-ASM_COMMAND  = asm
+FRTN_COMMAND = frtn_original
+ASM_COMMAND  = asm_original
 LDC_COMMAND  = ldc
 
 #############

diff --git a/lib/iolib/recipe/fortran-lib.recipe b/lib/iolib/recipe/fortran-lib.recipe
index e4ef862132af09d315e3029787a225a6134ac389..d00f8c60ba3ddd76de5931932996c2fe913ab4fb 100644 (file)
--- a/lib/iolib/recipe/fortran-lib.recipe
+++ b/lib/iolib/recipe/fortran-lib.recipe
@@ -1,16 +1,16 @@
 # These are the selfmade modules
 
 # Binary HS Punch routine
-#obj/O$PB
+obj/O$PB
 
 #Paper tape listing routine
-#obj/O$PL
+obj/O$PL
 
 # O$AL ASR comfort routine
-#obj/O$AL
+obj/O$AL
 
 # Huge Line printer routine
-#obj/O$LA
+obj/O$LA
 
 # Read Paper tape sources
 obj/I$PA
@@ -23,7 +23,7 @@ org/O$AB
 org/O$AI
 
 #org/O$AH Original ASR listing routine
-org/O$AH
+#org/O$AH
 
 
 

diff --git a/pc-tools/boot-maker/Makefile b/pc-tools/boot-maker/Makefile
index 871819fea31abb4cabce289400ca0de8104c3d5a..85faced6c2d39debc99802efe9c2fcbdb23a2e8e 100644 (file)
--- a/pc-tools/boot-maker/Makefile
+++ b/pc-tools/boot-maker/Makefile
@@ -1,13 +1,13 @@
-default: install
+default: bmaker
 
 bmaker: main.c
        gcc  -o $@ $<
 
 clean:
-       rm -f *.o bmaker ../../bin/bmaker
+       rm -f *.o bmaker 
 
-install: bmaker
-       cp bmaker ../../bin
+#install: bmaker
+#      cp bmaker ../../bin
 
 .PHONY: clean install default
 

diff --git a/pc-tools/ldc/Makefile b/pc-tools/ldc/Makefile
index 625764e12f0a60ef9ea53e5957d88ae21c3e88f8..df7c0f3850bbc0d667529917cb3a9b960248bf6f 100644 (file)
--- a/pc-tools/ldc/Makefile
+++ b/pc-tools/ldc/Makefile
@@ -1,4 +1,4 @@
-default: install
+default: ldc
 
 %.o: %.c *.h
        @echo -n Baue: $@
@@ -11,9 +11,9 @@ ldc: ldc.o process.o hw_helpers.o tape.o split.o
        @gcc -o$@  $^
 
 clean:
-       rm -f *.o ldc ../../bin/ldc
+       rm -f *.o ldc 
 
-install: ldc
-       cp ldc ../../bin
+#install: ldc
+#      cp ldc ../../bin
 
 .PHONY: default all clean install
\ No newline at end of file

diff --git a/pc-tools/src-filters/Makefile b/pc-tools/src-filters/Makefile
index 32e8d05800e74c4cf361f53ed3cb1ec3ff09f720..f7f229394a2ddf4b939b8f8d7e0a85a87e5f77b2 100644 (file)
--- a/pc-tools/src-filters/Makefile
+++ b/pc-tools/src-filters/Makefile
@@ -1,9 +1,12 @@
 PROGS=paron paroff load turn zstrip tab
 
-install: $(PROGS)
-       cp $(PROGS) ../../bin/
+default: $(PROGS)
+
+#install: $(PROGS)
+#      cp $(PROGS) ../../bin/
 
 clean:
-       rm -f $(PROGS) $(foreach p, $(PROGS),../../bin/$(p))
+       rm -f $(PROGS)
 
+.PHONY: default clean
 

diff --git a/slst/super2.txt b/slst/super2.txt
deleted file mode 100644 (file)
index 279d521..0000000
--- a/slst/super2.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Super 2 tape:
-31000-31777 Start 31000 : cleanup.obj
-32000-32777 Start 32000 : PRNTZ
-33000-36777 Start 36000 : LDR-APM
-37000-37777 Start 37000 : PAL-AP

diff --git a/sys/dap.sys b/sys/dap.sys
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/systems/Makefile b/systems/Makefile
index 887bbb03df48eaa27a8758861277ee5a1ae65f63..3caf770cffe8ed05efc13dc4ca6b027abfb6bb10 100644 (file)
--- a/systems/Makefile
+++ b/systems/Makefile
@@ -1,15 +1,16 @@
 # Makefile for system generation
 
 # Targets
-export SUPER3_SYS=$(H316)/systems/super3.sys
-export SUPER2_SYS=$(H316)/systems/super2.sys
-export SUPER3_SLST=$(H316)/systems/super3.slst
-export SUPER2_SLST=$(H316)/systems/super2.slst
-export DAP_SYS=$(H316)/systems/dap.sys
-export DAP_SLST=$(H316)/systems/dap.slst
+export SUPER3_SYS=super3.sys
+export SUPER2_SYS=super2.sys
+export SUPER3_SLST=super3.slst
+export SUPER2_SLST=super2.slst
+export DAP_SYS=dap.sys
+export DAP_SLST=dap.slst
+export SUPER_SIMPLE_SYS=super_simple.sys
 
 # Used files 
-export LDR_APM_8K=$(H316)/slst/ldr-apm.slst
+export LDR_APM_8K=$(H316)/slst/ldr-apm_8k.slst
 export LDR_APM=$(H316)/obj/ldr-apm.obj
 export LDR_DUMY=$(H316)/obj/ldr-dumy.obj
 export PRNTNZ=$(H316)/obj/prntnz.obj
@@ -24,7 +25,7 @@ export DAP_LIBRARY=$(H316)/lib/iolib/lib/dap-lib.lib
 export DUMYX16=$(H316)/obj/dumy-x16.obj
 export DECCL=$(H316)/obj/deccl.obj
 export SETSIZ=$(H316)/obj/setsiz.obj
-export SUPER_SYS_FOR_DAP=$(SUPER3_SYS)
+export SUPER_SYS_FOR_DAP=$(SUPER_SIMPLE_SYS)
 
 export MAKE
 
@@ -34,19 +35,23 @@ super2: $(SUPER2_SLST)
 super3: $(SUPER3_SLST)
 dap: $(DAP_SLST)
 
-$(DAP_SLST): $(DAP16) $(IOS16) $(DAP_LIBRARY) $(DUMYX16) $(DECCL) $(SETSIZ)\
+$(SUPER_SIMPLE_SYS): $(LDR_APM_8K) $(PAL_AP) $(LDR_APM) $(LDR_DUMY)
+       ./build_super_simple.sh
+
+$(DAP_SLST) $(DAP_SYS): $(DAP16) $(IOS16) $(DAP_LIBRARY) $(DUMYX16) $(DECCL) $(SETSIZ)\
              $(SUPER_SYS_FOR_DAP)
        ./build_dap16.sh
 
-$(SUPER2_SLST): $(LDR_APM_8K) $(LDR_APM) $(LDR_DUMY) $(PRNTNZ)\
-                $(CLEANUP) $(PAL_AP) 
+$(SUPER2_SLST) $(SUPER2_SYS): $(LDR_APM_8K) $(LDR_APM) $(LDR_DUMY) $(PRNTNZ)\
+               $(CLEANUP) $(PAL_AP) 
        ./build_super2.sh
 
-$(SUPER3_SLST): $(LDR_APM_8K) $(LDR_APM) $(LDR_DUMY) $(PRNTNZ)\
+$(SUPER3_SLST) $(SUPER3_SYS): $(LDR_APM_8K) $(LDR_APM) $(LDR_DUMY) $(PRNTNZ)\
                 $(CLEANUP2) $(BINAL) $(RESTART)
        ./build_super3.sh
 
 clean:
-       @rm -f $(SUPER2_SLST) $(SUPER2_SYS) $(SUPER3_SLST) $(SUPER3_SYS)
+       @rm -f $(SUPER2_SLST) $(SUPER2_SYS) $(SUPER3_SLST) $(SUPER3_SYS) $(DAP_SYS) $(DAP_SLST)\
+              $(SUPER_SIMPLE_SYS)
 
 .PHONY: super3
\ No newline at end of file

diff --git a/systems/build_dap16.sh b/systems/build_dap16.sh
index fc39504449146db042b4e962bf0954e4e7101eee..6567922432ee5f94e3e1a0f95edce73a91924e93 100755 (executable)
--- a/systems/build_dap16.sh
+++ b/systems/build_dap16.sh
@@ -8,7 +8,8 @@ if [ ! "$MAKE" ]; then
 fi
 
 cat > $DO_FILE <<EOF
-rest $SUPER_SYS_FOR_DAP
+REST $SUPER_SYS_FOR_DAP
+
 at ptr $DAP16
 run 36000
 go

diff --git a/systems/dap/Makefile b/systems/dap/Makefile
new file mode 100644 (file)
index 0000000..8e06533
--- /dev/null
+++ b/systems/dap/Makefile
@@ -0,0 +1,15 @@
+# A dummy makefile to keep the main Makefile's form and enable us to build the dap.sys 
+# first!
+
+default:
+       $(MAKE) -C .. dap.sys
+
+
+clean:
+       @rm -f ../dap.sys ../dap.slst
+
+.PHONY: clean
+
+%:
+       @true
+