[Simh] [PATCH 07 of 14] sim_printf_log() changes for PDP10

[Peter Lund]

1 file changed, 2 insertions(+), 5 deletions(-)
PDP10/pdp10_ksio.c |    7 ++-----


# HG changeset patch
# User Peter Lund <firefly at vax64.dk>
# Date 1189306538 -7200
# Node ID a5b64c9b84cadc3ea78f9c33c520ebe7cb632eca
# Parent  e8dab4b3f2943f1577f8e49f4da36673ceccd4be
sim_printf_log() changes for PDP10

diff -r e8dab4b3f294 -r a5b64c9b84ca PDP10/pdp10_ksio.c
--- a/PDP10/pdp10_ksio.c	Sun Sep 09 04:55:24 2007 +0200
+++ b/PDP10/pdp10_ksio.c	Sun Sep 09 04:55:38 2007 +0200
@@ -71,6 +71,7 @@
 
 #include "pdp10_defs.h"
 #include <setjmp.h>
+#include "sim_console.h"
 
 #define XBA_MBZ         0400000                         /* ba mbz */
 #define eaRB            (ea & ~1)
@@ -109,7 +110,6 @@ extern int32 flags;
 extern int32 flags;
 extern const int32 pi_l2bit[8];
 extern UNIT cpu_unit;
-extern FILE *sim_log;
 extern jmp_buf save_env;
 extern DEVICE *sim_devices[];
 
@@ -748,10 +748,7 @@ for (i = 0; (dptr = sim_devices[i]) != N
         (curr->ba < (dibp->ba + dibp->lnt))) ||
         ((end >= dibp->ba) &&                           /* overlap end? */
         (end < (dibp->ba + dibp->lnt)))) {
-        printf ("Device %s address conflict at %08o\n",
-            sim_dname (dptr), dibp->ba);
-        if (sim_log) fprintf (sim_log,
-            "Device %s address conflict at %08o\n",
+        sim_printf_log ("Device %s address conflict at %08o\n",
             sim_dname (dptr), dibp->ba);
         return TRUE;
         }