mirror of
https://github.com/rcornwell/sims.git
synced 2026-01-13 07:19:26 +00:00
KA10: Add display support
(includes cursory makefile changes)
This commit is contained in:
phil
parent
8f26b58deb
commit
b7caf26e0b
@ -311,6 +311,8 @@ extern DEVICE dc_dev;
|
||||
extern DEVICE dt_dev;
|
||||
extern DEVICE dk_dev;
|
||||
extern DEVICE pd_dev;
|
||||
extern DEVICE dpy_dev;
|
||||
extern DEVICE wcnsls_dev; /* MIT Spacewar Consoles */
|
||||
|
||||
extern t_stat (*dev_tab[128])(uint32 dev, uint64 *data);
|
||||
|
||||
@ -371,6 +373,8 @@ int df10_write(struct df10 *df);
|
||||
#define NUM_DEVS_RS 1
|
||||
#define NUM_DEVS_TU 1
|
||||
#define NUM_DEVS_PD ITS
|
||||
#define NUM_DEVS_DPY USE_DISPLAY
|
||||
#define NUM_DEVS_WCNSLS USE_DISPLAY
|
||||
/* Global data */
|
||||
|
||||
#define RH10_DEV 01000
|
||||
|
||||
422
PDP10/ka10_dpy.c
Normal file
422
PDP10/ka10_dpy.c
Normal file
@ -0,0 +1,422 @@
|
||||
/* ka10_dpy.c: 340 display subsystem simulator w/ PDP-6 344 interface!
|
||||
|
||||
Copyright (c) 2018, Philip L. Budne
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without limitation
|
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
PHILIP BUDNE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of Philip Budne shall not be
|
||||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from Richard Cornwell.
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
* NOTE!!! Currently only supports 340 display using the type 344 interface
|
||||
* for PDP-6 described in
|
||||
* http://www.bitsavers.org/pdf/dec/graphics/H-340_Type_340_Precision_Incremental_CRT_System_Nov64.pdf
|
||||
*
|
||||
* 340C was used in the PDP-10 VB10C display system
|
||||
* http://bitsavers.informatik.uni-stuttgart.de/pdf/dec/pdp10/periph/VB10C_Interactive_Graphics_Terminal_Jul70.pdf
|
||||
* "The basic hardware system consists of a 340/C display connected
|
||||
* directly to PDP-1O memory through a special memory channel. Several
|
||||
* important features included in the VB-10/C display are memory
|
||||
* protection and relocation, slave mode operation, raster mode, and
|
||||
* subroutining."
|
||||
*
|
||||
* reading 6.03 VBCSER
|
||||
* http://pdp-10.trailing-edge.com/dec-10-omona-u-mc9/01/vbcser.mac.html
|
||||
* There appear to be differences in the DIS (130) CONI/O bits:
|
||||
* CONI
|
||||
* 47400 are "DISPLAY INTERRUPT" bits
|
||||
* 45000 are "ILLEGAL ADDRESS OR EDGE FLAG" (same VE/HE??)
|
||||
* 40000 is "ILLEGAL ADDR"
|
||||
* 2000 is LP HIT (same)
|
||||
* 400 is STOP (same
|
||||
* CONO
|
||||
* 20000 "lock display out of memory"
|
||||
* 100 init? (same)
|
||||
* 40 "clear flags"
|
||||
* 20 "resume" (stored @DISIN4)
|
||||
* 7 PI channel?
|
||||
* DISCON = CHAN + 140 (continue?)
|
||||
* *NO* DATAO or BLKO to device 130!
|
||||
*
|
||||
* It appears that the reloc/protect mechanism is on I/O device 134.
|
||||
* (referred to by number, not symbol!)
|
||||
* DATAO sets reloc/protect, start addr
|
||||
* possibly:
|
||||
* high order 8 protection bits are left justified in left half
|
||||
* high order 8 relocation bits are left justified in right half
|
||||
*
|
||||
* Other PDP-6/10 display interfaces:
|
||||
*
|
||||
* http://bitsavers.trailing-edge.com/pdf/dec/graphics/348_Manual_1964.pdf
|
||||
* Type 348 interface to Type 30A or 30E displays.
|
||||
* "To the display, the interface looks like a PDP-1 computer"
|
||||
*
|
||||
* Also VP10/VR30 (phone book p. 487):
|
||||
* control word format:
|
||||
* INTENSITY(*),,0 ("4 dimmest, thru 13 brightest" default is 10)
|
||||
* YPOS,,XPOS (10 bit positions)
|
||||
*
|
||||
* (*)6.03 DISSER.MAC says:
|
||||
* ONLY FOR VP10 and TYPE 30.
|
||||
* N IS 3 BITS WIDE FOR 30, 2 BITS WIDE FOR VP10.
|
||||
*
|
||||
* 348 manual p.10 says: "The three flip-flops are treated as a two bit
|
||||
* signed binary number. Negative numbers are in two's complement form.
|
||||
* The most negative number (100) will produce the least intensity.
|
||||
* The largest positive number (011) results in the greatest intensity.
|
||||
*/
|
||||
|
||||
#include "ka10_defs.h"
|
||||
#include <time.h>
|
||||
|
||||
#ifndef NUM_DEVS_DPY
|
||||
#define NUM_DEVS_DPY 0
|
||||
#endif
|
||||
|
||||
#if (NUM_DEVS_DPY > 0)
|
||||
#include "display/type340.h"
|
||||
#include "display/display.h"
|
||||
|
||||
#define DPY_DEVNUM 0130
|
||||
|
||||
#define RRZ(W) ((W) & RMASK)
|
||||
#define XWD(L,R) ((((uint64)(L))<<18)|((uint64)(R)))
|
||||
|
||||
#if PDP6 | KA | KI
|
||||
extern uint64 SW; /* switch register */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* number of (real?) microseconds between svc calls
|
||||
* used to age display, poll for WS events
|
||||
* and delay "data" interrupt
|
||||
* (VB10C could steal cycles)
|
||||
*/
|
||||
#define DPY_CYCLE_US 50
|
||||
|
||||
/*
|
||||
* number of DPY_CYCLES to delay int
|
||||
* too small and host CPU doesn't run enough!
|
||||
*/
|
||||
#define INT_COUNT (500/DPY_CYCLE_US)
|
||||
|
||||
#define STAT_REG u3
|
||||
#define INT_COUNTDOWN u4
|
||||
#define XPOS us9 /* from LP hit */
|
||||
#define YPOS us10 /* from LP hit */
|
||||
|
||||
/* STAT_REG */
|
||||
#define STAT_VALID 01000000 /* internal: invisible to PDP-10 */
|
||||
|
||||
/* CONI/CONO */
|
||||
/* http://www.bitsavers.org/pdf/dec/graphics/H-340_Type_340_Precision_Incremental_CRT_System_Nov64.pdf p 2-14 */
|
||||
#define CONO_MASK 0000077 /* bits changed by CONO */
|
||||
#define CONI_MASK 0007677 /* bits read by CONI */
|
||||
|
||||
#define CONI_INT_SPEC 0007400 /* I- "special conditions" */
|
||||
#define CONI_INT_VE 0004000 /* I- b24: VER EDGE */
|
||||
#define CONI_INT_LP 0002000 /* I- b25: LIGHT PEN */
|
||||
#define CONI_INT_HE 0001000 /* I- b26: HOR EDGE */
|
||||
#define CONI_INT_SI 0000400 /* I- b27: STOP INT */
|
||||
#define CONI_INT_DONE 0000200 /* I- b28: done with second half */
|
||||
#define CONO_INIT 0000100 /* -O b29: init display */
|
||||
#define CONX_SC 0000070 /* IO special channel */
|
||||
#define CONX_DC 0000007 /* IO data channel */
|
||||
|
||||
#define CONX_SC_SHIFT 3
|
||||
#define CONX_DC_SHIFT 0
|
||||
|
||||
/* make sure ST340_XXX bits match CONI_INT_XXX bits */
|
||||
#if (ST340_VEDGE^CONI_INT_VE)|(ST340_LPHIT^CONI_INT_LP)|(ST340_HEDGE^CONI_INT_HE)|(ST340_STOP_INT^CONI_INT_SI)
|
||||
#error ST340 bits do not match CONI_INT bits!!
|
||||
#endif
|
||||
|
||||
t_stat dpy_devio(uint32 dev, uint64 *data);
|
||||
t_stat dpy_svc (UNIT *uptr);
|
||||
const char *dpy_description (DEVICE *dptr);
|
||||
|
||||
DIB dpy_dib[] = {
|
||||
{ DPY_DEVNUM, 1, &dpy_devio, NULL }};
|
||||
|
||||
UNIT dpy_unit[] = {
|
||||
{ UDATA (&dpy_svc, UNIT_IDLE, DPY_CYCLE_US) }
|
||||
};
|
||||
|
||||
#define UPTR(UNIT) (dpy_unit+(UNIT))
|
||||
|
||||
DEVICE dpy_dev = {
|
||||
"DPY", dpy_unit, NULL, NULL,
|
||||
NUM_DEVS_DPY, 0, 0, 0, 0, 0,
|
||||
NULL, NULL, NULL,
|
||||
NULL, NULL, NULL,
|
||||
&dpy_dib, DEV_DISABLE | DEV_DIS | DEV_DEBUG, 0, NULL,
|
||||
NULL, NULL, NULL, NULL, NULL, &dpy_description
|
||||
};
|
||||
|
||||
const char *dpy_description (DEVICE *dptr)
|
||||
{
|
||||
return "Type 340 Display on Type 344 interface";
|
||||
}
|
||||
|
||||
/* until it's done just one place! */
|
||||
static void dpy_set_int_done(UNIT *uptr)
|
||||
{
|
||||
uptr->STAT_REG |= CONI_INT_DONE;
|
||||
uptr->INT_COUNTDOWN = INT_COUNT;
|
||||
}
|
||||
|
||||
/* return true if display not stopped */
|
||||
int dpy_update_status (UNIT *uptr, ty340word status, int done)
|
||||
{
|
||||
int running = !(status & ST340_STOPPED);
|
||||
|
||||
/* sub in lastest bits from display */
|
||||
uptr->STAT_REG &= ~CONI_INT_SPEC;
|
||||
uptr->STAT_REG |= status & CONI_INT_SPEC;
|
||||
|
||||
/* data interrupt sent from svc routine, so CPU can run */
|
||||
if (done && running) {
|
||||
/* XXX also set in "rfd" callback: decide! */
|
||||
dpy_set_int_done(uptr);
|
||||
}
|
||||
if (uptr->STAT_REG & CONI_INT_SPEC) {
|
||||
uint32 sc = uptr->STAT_REG & CONX_SC;
|
||||
if (sc) { /* PI channel set? */
|
||||
set_interrupt(DPY_DEVNUM, sc >> CONX_SC_SHIFT);
|
||||
}
|
||||
}
|
||||
return running;
|
||||
}
|
||||
|
||||
|
||||
t_stat dpy_devio(uint32 dev, uint64 *data) {
|
||||
int unit = (dev - DPY_DEVNUM) >> 2;
|
||||
UNIT *uptr;
|
||||
int32 t;
|
||||
int32 inst;
|
||||
|
||||
if (unit < 0 || unit >= NUM_DEVS_DPY)
|
||||
return SCPE_OK;
|
||||
uptr = UPTR(unit);
|
||||
|
||||
if (!(uptr->STAT_REG & STAT_VALID)) {
|
||||
dpy_update_status(uptr, ty340_status(), 0);
|
||||
sim_activate_after(uptr, DPY_CYCLE_US);
|
||||
uptr->STAT_REG |= STAT_VALID;
|
||||
uptr->INT_COUNTDOWN = 0;
|
||||
}
|
||||
|
||||
switch (dev & 3) {
|
||||
case CONI:
|
||||
*data = (uint64)(uptr->STAT_REG & CONI_MASK);
|
||||
sim_debug(DEBUG_CONI, &dpy_dev, "DPY %03o CONI PC=%o %06o\n",
|
||||
dev, PC, (uint32)*data);
|
||||
break;
|
||||
|
||||
case CONO:
|
||||
clr_interrupt(dev);
|
||||
uptr->STAT_REG &= ~CONO_MASK;
|
||||
uptr->STAT_REG |= *data & CONO_MASK;
|
||||
if (*data & CONO_INIT)
|
||||
dpy_update_status( uptr, ty340_reset(), 1);
|
||||
sim_debug(DEBUG_CONO, &dpy_dev, "DPY %03o CONO %06o PC=%06o %06o\n",
|
||||
dev, (uint32)*data, PC, uptr->STAT_REG & ~STAT_VALID);
|
||||
break;
|
||||
|
||||
case DATAO:
|
||||
uptr->STAT_REG &= ~CONI_INT_DONE;
|
||||
uptr->INT_COUNTDOWN = 0;
|
||||
|
||||
/* if fed using BLKO from interrupt vector, PC will be wrong! */
|
||||
sim_debug(DEBUG_DATAIO, &dpy_dev, "DPY %03o DATO %012llo PC=%06o\n",
|
||||
dev, *data, PC);
|
||||
|
||||
inst = (uint32)LRZ(*data);
|
||||
if (dpy_update_status(uptr, ty340_instruction(inst), 0)) {
|
||||
/* still running */
|
||||
inst = (uint32)RRZ(*data);
|
||||
dpy_update_status(uptr, ty340_instruction(inst), 1);
|
||||
}
|
||||
break;
|
||||
|
||||
case DATAI:
|
||||
*data = XWD(uptr->YPOS, uptr->XPOS);
|
||||
sim_debug(DEBUG_DATAIO, &dpy_dev, "DPY %03o DATI %06o,,%06o PC=%06o\n",
|
||||
dev, uptr->YPOS, uptr->XPOS, PC);
|
||||
break;
|
||||
}
|
||||
return SCPE_OK;
|
||||
}
|
||||
|
||||
/* Timer service - */
|
||||
t_stat dpy_svc (UNIT *uptr)
|
||||
{
|
||||
sim_activate_after(uptr, DPY_CYCLE_US); /* requeue! */
|
||||
|
||||
display_age(DPY_CYCLE_US, 0); /* age the display */
|
||||
|
||||
if (uptr->INT_COUNTDOWN && --uptr->INT_COUNTDOWN == 0) {
|
||||
if (uptr->STAT_REG & CONI_INT_DONE) { /* delayed int? */
|
||||
uint32 dc = uptr->STAT_REG & CONX_DC;
|
||||
if (dc) { /* PI channel set? */
|
||||
set_interrupt(DPY_DEVNUM, dc>>CONX_DC_SHIFT);
|
||||
}
|
||||
}
|
||||
}
|
||||
return SCPE_OK;
|
||||
}
|
||||
|
||||
/****************
|
||||
* callbacks from type340.c
|
||||
*/
|
||||
|
||||
/* not used with Type 344 interface */
|
||||
ty340word
|
||||
ty340_fetch(ty340word addr)
|
||||
{
|
||||
}
|
||||
|
||||
/* not used with Type 344 interface */
|
||||
void
|
||||
ty340_store(ty340word addr, ty340word value)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
ty340_lp_int(ty340word x, ty340word y)
|
||||
{
|
||||
/*
|
||||
* real hardware pauses display until the CPU reads out coords
|
||||
* w/ DATAI which then continues the display
|
||||
*/
|
||||
dpy_unit[0].XPOS = x;
|
||||
dpy_unit[0].YPOS = y;
|
||||
dpy_update_status(dpy_unit, ty340_status(), 0);
|
||||
}
|
||||
|
||||
void
|
||||
ty340_rfd(void) { /* request for data */
|
||||
#ifdef TY340_NODISPLAY
|
||||
puts("ty340_rfd");
|
||||
#endif
|
||||
dpy_set_int_done(dpy_unit);
|
||||
}
|
||||
|
||||
void
|
||||
cpu_get_switches(unsigned long *p1, unsigned long *p2) {
|
||||
#if PDP6 | KA | KI
|
||||
*p1 = LRZ(SW);
|
||||
*p2 = RRZ(SW);
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
cpu_set_switches(unsigned long w1, unsigned long w2) {
|
||||
#if PDP6 | KA | KI
|
||||
SW = XWD(w1,w2);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
* MIT Spacewar console switches
|
||||
* WCNSLS is the mnemonic defined/used in the SPCWAR sources
|
||||
*/
|
||||
#if NUM_DEVS_WCNSLS > 0
|
||||
#define WCNSLS_DEVNUM 0420
|
||||
|
||||
t_stat wcnsls_devio(uint32 dev, uint64 *data);
|
||||
const char *wcnsls_description (DEVICE *dptr);
|
||||
|
||||
DIB wcnsls_dib[] = {
|
||||
{ WCNSLS_DEVNUM, 1, &wcnsls_devio, NULL }};
|
||||
|
||||
UNIT wcnsls_unit[] = {
|
||||
{ UDATA (NULL, UNIT_IDLE, 0) }};
|
||||
|
||||
DEVICE wcnsls_dev = {
|
||||
"WCNSLS", wcnsls_unit, NULL, NULL,
|
||||
NUM_DEVS_WCNSLS, 0, 0, 0, 0, 0,
|
||||
NULL, NULL, NULL,
|
||||
NULL, NULL, NULL,
|
||||
&wcnsls_dib, DEV_DISABLE | DEV_DIS | DEV_DEBUG, 0, NULL,
|
||||
NULL, NULL, NULL, NULL, NULL, &wcnsls_description
|
||||
};
|
||||
|
||||
const char *wcnsls_description (DEVICE *dptr)
|
||||
{
|
||||
return "MIT Spacewar Consoles";
|
||||
}
|
||||
|
||||
t_stat wcnsls_devio(uint32 dev, uint64 *data) {
|
||||
uint64 switches;
|
||||
|
||||
switch (dev & 3) {
|
||||
case CONO:
|
||||
/* CONO WCNSLS,40 ;enable spacewar consoles */
|
||||
break;
|
||||
|
||||
case DATAI:
|
||||
switches = 0777777777777LL; /* 1 is off */
|
||||
|
||||
/*
|
||||
* map 32-bit "spacewar_switches" value to what PDP-6/10 game expects
|
||||
* (four 9-bit bytes)
|
||||
*/
|
||||
/* bits inside the bytes */
|
||||
#define CCW 0400 /* counter clockwise (L) */
|
||||
#define CW 0200 /* clockwise (R) */
|
||||
#define THRUST 0100
|
||||
#define HYPER 040
|
||||
#define FIRE 020
|
||||
|
||||
/* shift values for the players' bytes */
|
||||
#define UR 0 /* upper right: enterprise "top plug" */
|
||||
#define LR 9 /* lower right: klingon "second plug" */
|
||||
#define LL 18 /* lower left: thin ship "third plug" */
|
||||
#define UL 27 /* upper left: fat ship "bottom plug" */
|
||||
|
||||
#if 1
|
||||
#define DEBUGSW(X) (void)0
|
||||
#else
|
||||
#define DEBUGSW(X) printf X
|
||||
#endif
|
||||
|
||||
#define SWSW(UC, LC, BIT, POS36, FUNC36) \
|
||||
if (spacewar_switches & BIT) { \
|
||||
switches &= ~(((uint64)FUNC36)<<POS36); \
|
||||
DEBUGSW(("mapping %#o %s %s to %03o<<%d\r\n", \
|
||||
(uint32)BIT, #POS36, #FUNC36, FUNC36, POS36)); \
|
||||
}
|
||||
SPACEWAR_SWITCHES;
|
||||
#undef SWSW
|
||||
|
||||
if (spacewar_switches)
|
||||
DEBUGSW(("in %#lo out %#llo\r\n", spacewar_switches, switches));
|
||||
|
||||
*data = switches;
|
||||
sim_debug(DEBUG_DATAIO, &wcnsls_dev, "WCNSLS %03o DATI %012llo PC=%06o\n",
|
||||
dev, switches, PC);
|
||||
break;
|
||||
}
|
||||
return SCPE_OK;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
@ -128,6 +128,12 @@ DEVICE *sim_devices[] = {
|
||||
#endif
|
||||
#if (NUM_DEVS_PD > 0)
|
||||
&pd_dev,
|
||||
#endif
|
||||
#if (NUM_DEVS_DPY > 0)
|
||||
&dpy_dev,
|
||||
#if (NUM_DEVS_WCNSLS > 0)
|
||||
&wcnsls_dev,
|
||||
#endif
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
11
makefile
11
makefile
@ -1105,8 +1105,15 @@ KA10 = ${KA10D}/ka10_cpu.c ${KA10D}/ka10_sys.c ${KA10D}/ka10_df.c \
|
||||
${KA10D}/ka10_rp.c ${KA10D}/ka10_rc.c ${KA10D}/ka10_dt.c \
|
||||
${KA10D}/ka10_dk.c ${KA10D}/ka10_cr.c ${KA10D}/ka10_cp.c \
|
||||
${KA10D}/ka10_tu.c ${KA10D}/ka10_rs.c ${KA10D}/ka10_pd.c
|
||||
KA10_OPT = -DKA=1 -DUSE_INT64 -I $(KA10D) -DUSE_SIM_CARD
|
||||
KA10_OPT = -DKA=1 -DUSE_INT64 -I $(KA10D) -DUSE_SIM_CARD -DUSE_DISPLAY
|
||||
|
||||
ifneq ($(TYPE340),)
|
||||
# ONLY tested on Ubuntu 16.04, using X11 display support:
|
||||
KA10_DPY=-DUSE_DISPLAY \
|
||||
${KA10D}/ka10_dpy.c display/type340.c display/display.c \
|
||||
display/x11.c
|
||||
KA10_DPY_LDFLAGS =-lm -lX11 -lXt
|
||||
endif
|
||||
|
||||
KI10D = PDP10
|
||||
KI10 = ${KA10D}/ka10_cpu.c ${KA10D}/ka10_sys.c ${KA10D}/ka10_df.c \
|
||||
@ -1223,7 +1230,7 @@ pdp10-ka : ${BIN}pdp10-ka${EXE}
|
||||
|
||||
${BIN}pdp10-ka${EXE} : ${KA10} ${SIM}
|
||||
${MKDIRBIN}
|
||||
${CC} ${KA10} ${SIM} ${KA10_OPT} $(CC_OUTSPEC) ${LDFLAGS}
|
||||
${CC} ${KA10} ${KA10_DPY} ${SIM} ${KA10_OPT} $(CC_OUTSPEC) ${LDFLAGS} ${KA10_LDFLAGS} ${KA10_DPY_LDFLAGS}
|
||||
ifeq ($(WIN32),)
|
||||
cp ${BIN}pdp10-ka${EXE} ${BIN}ka10${EXE}
|
||||
else
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user