[Simh] [PATCH 06 of 14] sim_printf_log() changes for PDP11
Peter Lund
firefly at vax64.dk
Mon Sep 10 17:09:40 EDT 2007
7 files changed, 13 insertions(+), 30 deletions(-)
PDP11/pdp11_cpu.c | 1 -
PDP11/pdp11_cpumod.c | 5 ++---
PDP11/pdp11_dz.c | 8 +++-----
PDP11/pdp11_io.c | 12 +++---------
PDP11/pdp11_rh.c | 9 +++------
PDP11/pdp11_vh.c | 1 -
PDP11/pdp11_xu.c | 7 ++-----
# HG changeset patch
# User Peter Lund <firefly at vax64.dk>
# Date 1189306524 -7200
# Node ID e8dab4b3f2943f1577f8e49f4da36673ceccd4be
# Parent 95d944b6fab5ea634d52cd2c46cb5bbf3a3b3621
sim_printf_log() changes for PDP11
diff -r 95d944b6fab5 -r e8dab4b3f294 PDP11/pdp11_cpu.c
--- a/PDP11/pdp11_cpu.c Sun Sep 09 04:55:09 2007 +0200
+++ b/PDP11/pdp11_cpu.c Sun Sep 09 04:55:24 2007 +0200
@@ -248,7 +248,6 @@ typedef struct {
/* Global state */
-extern FILE *sim_log;
uint16 *M = NULL; /* memory */
int32 REGFILE[6][2] = { 0 }; /* R0-R5, two sets */
diff -r 95d944b6fab5 -r e8dab4b3f294 PDP11/pdp11_cpumod.c
--- a/PDP11/pdp11_cpumod.c Sun Sep 09 04:55:09 2007 +0200
+++ b/PDP11/pdp11_cpumod.c Sun Sep 09 04:55:24 2007 +0200
@@ -42,6 +42,7 @@
#include "pdp11_defs.h"
#include "pdp11_cpumod.h"
#include <time.h>
+#include "sim_console.h"
/* Byte write macros for system registers */
@@ -80,7 +81,6 @@ extern int32 R[8];
extern int32 R[8];
extern DEVICE cpu_dev, *sim_devices[];
extern UNIT cpu_unit;
-extern FILE *sim_log;
extern int32 STKLIM, PIRQ;
extern uint32 cpu_model, cpu_type, cpu_opt;
extern int32 clk_fie, clk_fnxm, clk_tps, clk_default;
@@ -1122,8 +1122,7 @@ for (i = 0; (dptr = sim_devices[i]) != N
if ((dptr->flags & DEV_DISABLE) && /* disable-able? */
!(dptr->flags & DEV_DIS) && /* enabled? */
((dptr->flags & mask) == 0)) { /* not allowed? */
- printf ("Disabling %s\n", sim_dname (dptr));
- if (sim_log) fprintf (sim_log, "Disabling %s\n", sim_dname (dptr));
+ sim_printf_log ("Disabling %s\n", sim_dname (dptr));
dptr->flags = dptr->flags | DEV_DIS;
}
}
diff -r 95d944b6fab5 -r e8dab4b3f294 PDP11/pdp11_dz.c
--- a/PDP11/pdp11_dz.c Sun Sep 09 04:55:09 2007 +0200
+++ b/PDP11/pdp11_dz.c Sun Sep 09 04:55:24 2007 +0200
@@ -75,6 +75,7 @@ extern int32 int_req[IPL_HLVL];
#include "sim_sock.h"
#include "sim_tmxr.h"
+#include "sim_console.h"
#if !defined (DZ_MUXES)
#define DZ_MUXES 1
@@ -141,7 +142,6 @@ extern int32 int_req[IPL_HLVL];
extern int32 IREQ (HLVL);
extern int32 sim_switches;
-extern FILE *sim_log;
extern int32 tmxr_poll; /* calibrated delay */
uint16 dz_csr[DZ_MUXES] = { 0 }; /* csr */
@@ -593,12 +593,10 @@ if (r != SCPE_OK) return r;
if (r != SCPE_OK) return r; /* error? */
if (sim_switches & SWMASK ('M')) { /* modem control? */
dz_mctl = 1;
- printf ("Modem control activated\n");
- if (sim_log) fprintf (sim_log, "Modem control activated\n");
+ sim_printf_log ("Modem control activated\n");
if (sim_switches & SWMASK ('A')) { /* autodisconnect? */
dz_auto = 1;
- printf ("Auto disconnect activated\n");
- if (sim_log) fprintf (sim_log, "Auto disconnect activated\n");
+ sim_printf_log ("Auto disconnect activated\n");
}
}
return SCPE_OK;
diff -r 95d944b6fab5 -r e8dab4b3f294 PDP11/pdp11_io.c
--- a/PDP11/pdp11_io.c Sun Sep 09 04:55:09 2007 +0200
+++ b/PDP11/pdp11_io.c Sun Sep 09 04:55:24 2007 +0200
@@ -43,6 +43,7 @@
*/
#include "pdp11_defs.h"
+#include "sim_console.h"
extern uint16 *M;
extern int32 int_req[IPL_HLVL];
@@ -52,7 +53,6 @@ extern int32 cpu_log;
extern int32 cpu_log;
extern int32 autcon_enb;
extern int32 uba_last;
-extern FILE *sim_log;
extern DEVICE *sim_devices[], cpu_dev;
extern UNIT cpu_unit;
@@ -489,10 +489,7 @@ for (i = 0; i < dibp->vnum; i++) {
(int_ack[ilvl][ibit] != dibp->ack[i])) ||
(int_vec[ilvl][ibit] && vec &&
(int_vec[ilvl][ibit] != vec))) {
- printf ("Device %s interrupt slot conflict at %d\n",
- sim_dname (dptr), idx);
- if (sim_log) fprintf (sim_log,
- "Device %s interrupt slot conflict at %d\n",
+ sim_printf_log ("Device %s interrupt slot conflict at %d\n",
sim_dname (dptr), idx);
return SCPE_STOP;
}
@@ -505,10 +502,7 @@ for (i = 0; i < (int32) dibp->lnt; i = i
(iodispR[idx] != dibp->rd)) ||
(iodispW[idx] && dibp->wr &&
(iodispW[idx] != dibp->wr))) {
- 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 SCPE_STOP;
}
diff -r 95d944b6fab5 -r e8dab4b3f294 PDP11/pdp11_rh.c
--- a/PDP11/pdp11_rh.c Sun Sep 09 04:55:09 2007 +0200
+++ b/PDP11/pdp11_rh.c Sun Sep 09 04:55:24 2007 +0200
@@ -56,6 +56,8 @@
#else /* PDP-11 version */
#include "pdp11_defs.h"
#endif
+
+#include "sim_console.h"
/* CS1 - base + 000 - control/status 1 */
@@ -161,8 +163,6 @@ extern uint16 *M;
extern uint16 *M;
extern int32 int_req[IPL_HLVL];
extern UNIT cpu_unit;
-extern FILE *sim_deb;
-extern FILE *sim_log;
extern int32 sim_switches;
t_stat mba_reset (DEVICE *dptr);
@@ -785,10 +785,7 @@ if ((mbregR[idx] && dibp->rd &&
(mbregW[idx] != dibp->wr)) ||
(mbabort[idx] && dibp->ack[0] &&
(mbabort[idx] != dibp->ack[0]))) {
- printf ("Massbus %s assignment conflict at %d\n",
- sim_dname (dptr), dibp->ba);
- if (sim_log) fprintf (sim_log,
- "Massbus %s assignment conflict at %d\n",
+ sim_printf_log ("Massbus %s assignment conflict at %d\n",
sim_dname (dptr), dibp->ba);
return SCPE_STOP;
}
diff -r 95d944b6fab5 -r e8dab4b3f294 PDP11/pdp11_vh.c
--- a/PDP11/pdp11_vh.c Sun Sep 09 04:55:09 2007 +0200
+++ b/PDP11/pdp11_vh.c Sun Sep 09 04:55:24 2007 +0200
@@ -80,7 +80,6 @@ extern int32 tmxr_poll, clk_tps;
extern int32 tmxr_poll, clk_tps;
/* convert ms to SIMH time units based on tmxr_poll polls per second */
#define MS2SIMH(ms) (((ms) * clk_tps) / 1000)
-extern FILE *sim_log;
#ifndef VH_MUXES
#define VH_MUXES (4)
diff -r 95d944b6fab5 -r e8dab4b3f294 PDP11/pdp11_xu.c
--- a/PDP11/pdp11_xu.c Sun Sep 09 04:55:09 2007 +0200
+++ b/PDP11/pdp11_xu.c Sun Sep 09 04:55:24 2007 +0200
@@ -84,9 +84,9 @@
*/
#include "pdp11_xu.h"
+#include "sim_console.h"
extern int32 tmxr_poll, tmr_poll, clk_tps, cpu_astop;
-extern FILE *sim_log;
t_stat xu_rd(int32* data, int32 PA, int32 access);
t_stat xu_wr(int32 data, int32 PA, int32 access);
@@ -1221,7 +1221,6 @@ void xu_process_transmit(CTLR* xu)
void xu_port_command (CTLR* xu)
{
- char* msg;
int command = xu->var->pcsr0 & PCSR0_PCMD;
int state = xu->var->pcsr1 & PCSR1_STATE;
int bits;
@@ -1302,9 +1301,7 @@ void xu_port_command (CTLR* xu)
case CMD_BOOT: /* BOOT */
/* not implemented */
- msg = "%s: BOOT command not implemented!\n";
- printf (msg, xu->dev->name);
- if (sim_log) fprintf(sim_log, msg, xu->dev->name);
+ sim_printf_log ("%s: BOOT command not implemented!\n", xu->dev->name);
xu->var->pcsr0 |= PCSR0_PCEI;
break;
More information about the Simh
mailing list