mirror of
https://github.com/simh/simh.git
synced 2026-01-25 19:56:25 +00:00
Merge branch 'FastAsynchIO' into simhv38-2-rc2
Conflicts: PDP11/pdp11_tq.c PDP11/pdp11_ts.c PDP11/pdp11_xq.h VAX/vax780_sbi.c VAX/vax_cpu.c makefile scp.c sim_defs.h sim_ether.c sim_timer.c
This commit is contained in:
@@ -5957,12 +5957,12 @@ int32 Debug_Entry(int32 PC, int32 inst, int32 inst2, int32 AC0, int32 AC1, int32
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32 Debug_Dump(UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
t_stat Debug_Dump(UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
{
|
||||
return SCPE_OK;
|
||||
}
|
||||
|
||||
int32 Dump_History (FILE *st, UNIT *uptr, int32 val, void *desc)
|
||||
t_stat Dump_History (FILE *st, UNIT *uptr, int32 val, void *desc)
|
||||
{
|
||||
char debmap[4], debion[4];
|
||||
t_value simeval[20];
|
||||
|
||||
@@ -228,14 +228,14 @@
|
||||
struct ndev {
|
||||
int32 mask; /* done/busy mask */
|
||||
int32 pi; /* assigned pi bit */
|
||||
int32 (*routine)(); /* dispatch routine */
|
||||
int32 (*routine)(int32, int32, int32); /* dispatch routine */
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
int32 dnum; /* device number */
|
||||
int32 mask; /* done/busy mask */
|
||||
int32 pi; /* assigned pi bit */
|
||||
int32 (*routine)(); /* dispatch routine */
|
||||
int32 (*routine)(int32, int32, int32); /* dispatch routine */
|
||||
} DIB;
|
||||
|
||||
/* Device flags (simulator representation)
|
||||
|
||||
@@ -861,7 +861,8 @@ return SCPE_ARG;
|
||||
|
||||
char *get_addr (char *cptr, t_addr addr, t_bool ext, int32 cflag, int32 *val)
|
||||
{
|
||||
int32 d, r, x, pflag;
|
||||
int32 d, x, pflag;
|
||||
t_stat r;
|
||||
char gbuf[CBUFSIZE];
|
||||
int32 dmax, dsign;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user