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

VAX: Added support for the NEXT command to step over subroutine calls BSBB, BSBW, JSB, CALLS and CALLG

Browse source
This commit is contained in:
Mark Pizzolato 2014-04-14 14:23:06 -07:00
parent 8f3e6438a3
commit d3bdc26a94
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
VAX/vax_cpu.c
View file

@ -380,6 +380,7 @@ extern t_stat cpu_boot (int32 unitno, DEVICE *dptr);
extern int32 con_halt (int32 code, int32 cc); extern int32 con_halt (int32 code, int32 cc);
t_stat cpu_reset (DEVICE *dptr); t_stat cpu_reset (DEVICE *dptr);
t_bool cpu_is_pc_a_subroutine_call (t_addr **ret_addrs);
t_stat cpu_ex (t_value *vptr, t_addr exta, UNIT *uptr, int32 sw); t_stat cpu_ex (t_value *vptr, t_addr exta, UNIT *uptr, int32 sw);
t_stat cpu_dep (t_value val, t_addr exta, UNIT *uptr, int32 sw); t_stat cpu_dep (t_value val, t_addr exta, UNIT *uptr, int32 sw);
t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc); t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
@ -3193,6 +3194,7 @@ mapen = 0;
FLUSH_ISTR; /* init I-stream */ FLUSH_ISTR; /* init I-stream */
if (M == NULL) { /* first time init? */ if (M == NULL) { /* first time init? */
sim_brk_types = sim_brk_dflt = SWMASK ('E'); sim_brk_types = sim_brk_dflt = SWMASK ('E');
sim_vm_is_subroutine_call = cpu_is_pc_a_subroutine_call;
pcq_r = find_reg ("PCQ", NULL, dptr); pcq_r = find_reg ("PCQ", NULL, dptr);
if (pcq_r == NULL) if (pcq_r == NULL)
return SCPE_IERR; return SCPE_IERR;
@ -3205,6 +3207,27 @@ if (M == NULL) { /* first time init? */
return build_dib_tab (); return build_dib_tab ();
} }
t_bool cpu_is_pc_a_subroutine_call (t_addr **ret_addrs)
{
static t_addr returns[2] = {0, 0};
if (SCPE_OK != get_aval (PC, &cpu_dev, &cpu_unit)) /* get data */
return FALSE;
switch (sim_eval[0])
{
case BSBB:
case BSBW:
case JSB:
case CALLG:
case CALLS:
returns[0] = PC + (1 - fprint_sym (stdnul, PC, sim_eval, &cpu_unit, SWMASK ('M')));
*ret_addrs = returns;
return TRUE;
default:
return FALSE;
}
}
/* Memory examine */ /* Memory examine */
t_stat cpu_ex (t_value *vptr, t_addr exta, UNIT *uptr, int32 sw) t_stat cpu_ex (t_value *vptr, t_addr exta, UNIT *uptr, int32 sw)