Improvements for writing tape marks.

Author: larsbrinkhoff

dis.h

@@ -113,6 +113,9 @@ extern int      get_7track_record (FILE *f, word_t **buffer);
 extern int      get_9track_record (FILE *f, word_t **buffer);
 extern void     write_7track_record (FILE *f, word_t *buffer, int);
 extern void     write_9track_record (FILE *f, word_t *buffer, int);
+extern void     write_tape_mark (FILE *f);
+extern void     write_tape_eof (FILE *f);
+extern void     write_tape_eot (FILE *f);
 extern word_t	get_core_word (FILE *f);
 extern void	write_core_word (FILE *f, word_t word);
 extern void	read_raw_at (FILE *f, struct pdp10_memory *memory,

tape-word.c

@@ -21,6 +21,7 @@
 static word_t record[65536];
 static int reclen = 0;
 static int beginning_of_tape = 1;
+static int marks = 0;
 
 static int
 get_byte (FILE *f)
@@ -76,6 +77,11 @@ static void write_reclen (FILE *f, int n)
   fputc ((n >> 8) & 0377, f);
   fputc ((n >> 16) & 0377, f);
   fputc ((n >> 24) & 0377, f);
+
+  if (n == 0)
+    marks++;
+  else
+    marks = 0;
 }
 
 int get_9track_record (FILE *f, word_t **buffer)
@@ -290,11 +296,20 @@ write_tape_mark (FILE *f)
   write_tape_record (f, NULL, 0);
 }
 
+void
+write_tape_eof (FILE *f)
+{
+  int i;
+  for (i = marks; i < 1; i++)
+    write_tape_mark (f);
+}
+
 void
 write_tape_eot (FILE *f)
 {
-  write_tape_mark (f);
-  write_tape_mark (f);
+  int i;
+  for (i = marks; i < 2; i++)
+    write_tape_mark (f);
 }
 
 static void
@@ -311,10 +326,10 @@ write_tape_word (FILE *f, word_t word)
     {
       if (word & (START_RECORD|START_FILE|START_TAPE))
 	flush_record (f);
-      if (word & (START_FILE|START_TAPE))
+      if (word & START_FILE)
 	write_tape_mark (f);
       if (word & START_TAPE)
-	write_tape_mark (f);
+	write_tape_eot (f);
     }
   beginning_of_tape = 0;
 
@@ -327,6 +342,7 @@ flush_tape_word (FILE *f)
   flush_record (f);
   write_tape_eot (f);
   beginning_of_tape = 1;
+  marks = 0;
 }
 
 struct word_format tape_word_format = {