folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KA10: Fixed depositing symbolic into register and symbolic of reg 17

Browse source
This commit is contained in:
Richard Cornwell 2023-09-27 11:00:23 -04:00 • committed by Paul Koning
parent 73918ddc12
commit 0c77f8c832
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
PDP10/kx10_cpu.c
View file

@ -446,28 +446,28 @@ UNIT cpu_unit[] = { { UDATA (&rtc_srv,
REG cpu_reg[] = { REG cpu_reg[] = {
{ ORDATAD (PC, PC, 18, "Program Counter") }, { ORDATAD (PC, PC, 18, "Program Counter") },
{ ORDATAD (FLAGS, FLAGS, 18, "Flags") }, { ORDATAD (FLAGS, FLAGS, 18, "Flags") },
{ ORDATAD (FM0, FM[00], 36, "Fast Memory") }, /* addr in memory */ { ORDATAD (FM0, FM[00], 36, "Fast Memory"), REG_VMIO }, /* addr in memory */
{ ORDATA (FM1, FM[01], 36) }, /* modified at exit */ { ORDATA (FM1, FM[01], 36), REG_VMIO }, /* modified at exit */
{ ORDATA (FM2, FM[02], 36) }, /* to SCP */ { ORDATA (FM2, FM[02], 36), REG_VMIO }, /* to SCP */
{ ORDATA (FM3, FM[03], 36) }, { ORDATA (FM3, FM[03], 36), REG_VMIO },
{ ORDATA (FM4, FM[04], 36) }, { ORDATA (FM4, FM[04], 36), REG_VMIO },
{ ORDATA (FM5, FM[05], 36) }, { ORDATA (FM5, FM[05], 36), REG_VMIO },
{ ORDATA (FM6, FM[06], 36) }, { ORDATA (FM6, FM[06], 36), REG_VMIO },
{ ORDATA (FM7, FM[07], 36) }, { ORDATA (FM7, FM[07], 36), REG_VMIO },
{ ORDATA (FM10, FM[010], 36) }, { ORDATA (FM10, FM[010], 36), REG_VMIO },
{ ORDATA (FM11, FM[011], 36) }, { ORDATA (FM11, FM[011], 36), REG_VMIO },
{ ORDATA (FM12, FM[012], 36) }, { ORDATA (FM12, FM[012], 36), REG_VMIO },
{ ORDATA (FM13, FM[013], 36) }, { ORDATA (FM13, FM[013], 36), REG_VMIO },
{ ORDATA (FM14, FM[014], 36) }, { ORDATA (FM14, FM[014], 36), REG_VMIO },
{ ORDATA (FM15, FM[015], 36) }, { ORDATA (FM15, FM[015], 36), REG_VMIO },
{ ORDATA (FM16, FM[016], 36) }, { ORDATA (FM16, FM[016], 36), REG_VMIO },
{ ORDATA (FM17, FM[017], 36) }, { ORDATA (FM17, FM[017], 36), REG_VMIO },
#if KL | KS #if KL | KS
{ BRDATA (FM, FM, 8, 36, 128)}, { BRDATA (FM, FM, 8, 36, 128), REG_VMIO},
#elif KI #elif KI
{ BRDATA (FM, FM, 8, 36, 64)}, { BRDATA (FM, FM, 8, 36, 64), REG_VMIO},
#else #else
{ BRDATA (FM, FM, 8, 36, 16)}, { BRDATA (FM, FM, 8, 36, 16), REG_VMIO},
#endif #endif
{ ORDATAD (PIR, PIR, 8, "Priority Interrupt Request") }, { ORDATAD (PIR, PIR, 8, "Priority Interrupt Request") },
{ ORDATAD (PIH, PIH, 8, "Priority Interrupt Hold") }, { ORDATAD (PIH, PIH, 8, "Priority Interrupt Hold") },

2
PDP10/kx10_sys.c
View file

@ -1349,7 +1349,7 @@ t_stat parse_sym (CONST char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32
if (strchr (cptr, ',')) { /* AC specified? */ if (strchr (cptr, ',')) { /* AC specified? */
cptr = get_glyph (cptr, gbuf, ','); /* get glyph */ cptr = get_glyph (cptr, gbuf, ','); /* get glyph */
if (gbuf[0]) { /* can be omitted */ if (gbuf[0]) { /* can be omitted */
ac = get_uint (gbuf, 8, 017 - 1, &r); ac = get_uint (gbuf, 8, 017, &r);
if (r != SCPE_OK) if (r != SCPE_OK)
return SCPE_ARG; return SCPE_ARG;
val[0] = val[0] | (ac << INST_V_AC); val[0] = val[0] | (ac << INST_V_AC);