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

SCP: Use internal device SCP-PROCESS for SCP level debugging

Browse source
This commit is contained in:
Mark Pizzolato 2019-01-22 15:48:48 -08:00
parent 68e442358b
commit bacf1a7445
3 changed files with 70 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
VAX/vax_cpu.c
View file

@ -437,9 +437,6 @@ DEBTAB cpu_deb[] = {
{ "FLTFAULT", LOG_CPU_FAULT_FLT, "floating fault activities" }, { "FLTFAULT", LOG_CPU_FAULT_FLT, "floating fault activities" },
{ "CMODFAULT", LOG_CPU_FAULT_CMODE, "cmode fault activities" }, { "CMODFAULT", LOG_CPU_FAULT_CMODE, "cmode fault activities" },
{ "MCHKFAULT", LOG_CPU_FAULT_MCHK, "machine check fault activities" }, { "MCHKFAULT", LOG_CPU_FAULT_MCHK, "machine check fault activities" },
{ "EVENT", SIM_DBG_EVENT, "event dispatch activities" },
{ "ACTIVATE", SIM_DBG_ACTIVATE, "queue insertion activities" },
{ "ASYNCH", SIM_DBG_AIO_QUEUE, "asynch queue activities" },
{ NULL, 0 } { NULL, 0 }
}; };

128
scp.c
View file

@ -323,6 +323,40 @@
else if ((sim_switch_number >= 2) && (sim_switch_number <= 36)) val = sim_switch_number; \ else if ((sim_switch_number >= 2) && (sim_switch_number <= 36)) val = sim_switch_number; \
else val = dft; else val = dft;
#define SIM_DBG_EVENT 0x01000000 /* event dispatch activities */
#define SIM_DBG_ACTIVATE 0x02000000 /* queue insertion activities */
#define SIM_DBG_AIO_QUEUE 0x04000000 /* asynch event queue activities */
#define SIM_DBG_EXP_STACK 0x08000000 /* expression stack activities */
#define SIM_DBG_EXP_EVAL 0x10000000 /* expression evaluation activities */
#define SIM_DBG_BRK_ACTION 0x20000000 /* action activities */
#define SIM_DBG_DO 0x40000000 /* do activities */
static DEBTAB scp_debug[] = {
{"EVENT", SIM_DBG_EVENT, "Event Dispatch Activities"},
{"ACTIVATE", SIM_DBG_ACTIVATE, "Event Queue Insertion Activities"},
{"QUEUE", SIM_DBG_AIO_QUEUE, "Asynch Event Queue Activities"},
{"EXPSTACK", SIM_DBG_EXP_STACK, "Expression Stack Activities"},
{"EXPEVAL", SIM_DBG_EXP_EVAL, "Expression Evaluation Activities"},
{"ACTION", SIM_DBG_BRK_ACTION, "If/Breakpoint/Expect Action Activities"},
{"DO", SIM_DBG_DO, "Do Command/Expansion Activities"},
{0}
};
static const char *sim_scp_description (DEVICE *dptr)
{
return "SCP Event and Internal Command Processing";
}
static UNIT scp_unit;
DEVICE sim_scp_dev = {
"SCP-PROCESS", &scp_unit, NULL, NULL,
1, 0, 0, 0, 0, 0,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, DEV_NOSAVE|DEV_DEBUG, 0,
scp_debug, NULL, NULL, NULL, NULL, NULL,
sim_scp_description};
/* Asynch I/O support */ /* Asynch I/O support */
#if defined (SIM_ASYNCH_IO) #if defined (SIM_ASYNCH_IO)
pthread_mutex_t sim_asynch_lock = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t sim_asynch_lock = PTHREAD_MUTEX_INITIALIZER;
@ -352,7 +386,7 @@ if (AIO_QUEUE_VAL != QUEUE_LIST_END) { /* List !Empty */
q = AIO_QUEUE_VAL; q = AIO_QUEUE_VAL;
} while (q != AIO_QUEUE_SET(QUEUE_LIST_END, q)); } while (q != AIO_QUEUE_SET(QUEUE_LIST_END, q));
while (q != QUEUE_LIST_END) { /* List !Empty */ while (q != QUEUE_LIST_END) { /* List !Empty */
sim_debug (SIM_DBG_AIO_QUEUE, sim_dflt_dev, "Migrating Asynch event for %s after %d instructions\n", sim_uname(q), q->a_event_time); sim_debug (SIM_DBG_AIO_QUEUE, &sim_scp_dev, "Migrating Asynch event for %s after %d instructions\n", sim_uname(q), q->a_event_time);
++migrated; ++migrated;
uptr = q; uptr = q;
q = q->a_next; q = q->a_next;
@ -367,7 +401,7 @@ if (AIO_QUEUE_VAL != QUEUE_LIST_END) { /* List !Empty */
AIO_IUNLOCK; AIO_IUNLOCK;
uptr->a_activate_call (uptr, a_event_time); uptr->a_activate_call (uptr, a_event_time);
if (uptr->a_check_completion) { if (uptr->a_check_completion) {
sim_debug (SIM_DBG_AIO_QUEUE, sim_dflt_dev, "Calling Completion Check for asynch event on %s\n", sim_uname(uptr)); sim_debug (SIM_DBG_AIO_QUEUE, &sim_scp_dev, "Calling Completion Check for asynch event on %s\n", sim_uname(uptr));
uptr->a_check_completion (uptr); uptr->a_check_completion (uptr);
} }
AIO_ILOCK; AIO_ILOCK;
@ -380,7 +414,7 @@ return migrated;
void sim_aio_activate (ACTIVATE_API caller, UNIT *uptr, int32 event_time) void sim_aio_activate (ACTIVATE_API caller, UNIT *uptr, int32 event_time)
{ {
AIO_ILOCK; AIO_ILOCK;
sim_debug (SIM_DBG_AIO_QUEUE, sim_dflt_dev, "Queueing Asynch event for %s after %d instructions\n", sim_uname(uptr), event_time); sim_debug (SIM_DBG_AIO_QUEUE, &sim_scp_dev, "Queueing Asynch event for %s after %d instructions\n", sim_uname(uptr), event_time);
if (uptr->a_next) { if (uptr->a_next) {
uptr->a_activate_call = sim_activate_abs; uptr->a_activate_call = sim_activate_abs;
} }
@ -608,13 +642,6 @@ struct timespec cmd_time; /* */
static SCHTAB sim_stabr; /* Register search specifier */ static SCHTAB sim_stabr; /* Register search specifier */
static SCHTAB sim_staba; /* Memory search specifier */ static SCHTAB sim_staba; /* Memory search specifier */
static DEBTAB sim_dflt_debug[] = {
{"EVENT", SIM_DBG_EVENT, "Event Dispatching"},
{"ACTIVATE", SIM_DBG_ACTIVATE, "Event Scheduling"},
{"AIO_QUEUE", SIM_DBG_AIO_QUEUE, "Asynchronous Event Queueing"},
{0}
};
static const char *sim_int_step_description (DEVICE *dptr) static const char *sim_int_step_description (DEVICE *dptr)
{ {
return "Step/Next facility"; return "Step/Next facility";
@ -2502,6 +2529,7 @@ if (sim_timer_init ()) {
read_line_p ("Hit Return to exit: ", cbuf, sizeof (cbuf) - 1, stdin); read_line_p ("Hit Return to exit: ", cbuf, sizeof (cbuf) - 1, stdin);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
sim_register_internal_device (&sim_scp_dev);
sim_register_internal_device (&sim_expect_dev); sim_register_internal_device (&sim_expect_dev);
sim_register_internal_device (&sim_step_dev); sim_register_internal_device (&sim_step_dev);
@ -2541,11 +2569,6 @@ setenv ("SIM_REGEX_TYPE", "PCREPOSIX", 1); /* Publish regex type */
#elif defined (HAVE_REGEX_H) #elif defined (HAVE_REGEX_H)
setenv ("SIM_REGEX_TYPE", "REGEX", 1); /* Publish regex type */ setenv ("SIM_REGEX_TYPE", "REGEX", 1); /* Publish regex type */
#endif #endif
if (((sim_dflt_dev->flags & DEV_DEBUG) == 0) && /* default device without debug? */
(sim_dflt_dev->debflags == NULL)) {
sim_dflt_dev->flags |= DEV_DEBUG; /* connect default event debugging */
sim_dflt_dev->debflags = sim_dflt_debug;
}
if (*argv[0]) { /* sim name arg? */ if (*argv[0]) { /* sim name arg? */
char *np; /* "path.ini" */ char *np; /* "path.ini" */
@ -3516,7 +3539,7 @@ if (flag >= 0) { /* Only bump nesting fro
} }
} }
sim_debug (SIM_DBG_DO, sim_dflt_dev, "do_cmd_label(%d, flag=%d, '%s', '%s')\n", sim_do_depth, flag, fcptr, label ? label : ""); sim_debug (SIM_DBG_DO, &sim_scp_dev, "do_cmd_label(%d, flag=%d, '%s', '%s')\n", sim_do_depth, flag, fcptr, label ? label : "");
if (NULL == (c = sim_filepath_parts (cbuf, "f"))) { if (NULL == (c = sim_filepath_parts (cbuf, "f"))) {
stat = SCPE_MEM; stat = SCPE_MEM;
goto Cleanup_Return; goto Cleanup_Return;
@ -3561,9 +3584,9 @@ do {
stat = SCPE_OK; /* set good return */ stat = SCPE_OK; /* set good return */
break; break;
} }
sim_debug (SIM_DBG_DO, sim_dflt_dev, "Input Command: %s\n", cbuf); sim_debug (SIM_DBG_DO, &sim_scp_dev, "Input Command: %s\n", cbuf);
sim_sub_args (cbuf, sizeof(cbuf), do_arg); /* substitute args */ sim_sub_args (cbuf, sizeof(cbuf), do_arg); /* substitute args */
sim_debug (SIM_DBG_DO, sim_dflt_dev, "Expanded Command: %s\n", cbuf); sim_debug (SIM_DBG_DO, &sim_scp_dev, "Expanded Command: %s\n", cbuf);
if (*cptr == 0) /* ignore blank */ if (*cptr == 0) /* ignore blank */
continue; continue;
if (echo) /* echo if -v */ if (echo) /* echo if -v */
@ -3597,7 +3620,7 @@ do {
} }
else else
stat = SCPE_UNK; /* bad cmd given */ stat = SCPE_UNK; /* bad cmd given */
sim_debug (SIM_DBG_DO, sim_dflt_dev, "Command '%s', Result: 0x%X - %s\n", cmdp ? cmdp->name : "", stat, sim_error_text (stat)); sim_debug (SIM_DBG_DO, &sim_scp_dev, "Command '%s', Result: 0x%X - %s\n", cmdp ? cmdp->name : "", stat, sim_error_text (stat));
echo = sim_do_echo; /* Allow for SET VERIFY */ echo = sim_do_echo; /* Allow for SET VERIFY */
stat_nomessage = stat & SCPE_NOMESSAGE; /* extract possible message supression flag */ stat_nomessage = stat & SCPE_NOMESSAGE; /* extract possible message supression flag */
stat_nomessage = stat_nomessage || (!sim_show_message);/* Apply global suppression */ stat_nomessage = stat_nomessage || (!sim_show_message);/* Apply global suppression */
@ -3669,7 +3692,7 @@ if ((flag >= 0) || (!sim_on_inherit)) {
} }
sim_on_check[sim_do_depth] = 0; /* clear on mode */ sim_on_check[sim_do_depth] = 0; /* clear on mode */
} }
sim_debug (SIM_DBG_DO, sim_dflt_dev, "do_cmd_label - exiting - stat:%d (%d, flag=%d, '%s', '%s')\n", stat, sim_do_depth, flag, fcptr, label ? label : ""); sim_debug (SIM_DBG_DO, &sim_scp_dev, "do_cmd_label - exiting - stat:%d (%d, flag=%d, '%s', '%s')\n", stat, sim_do_depth, flag, fcptr, label ? label : "");
if (flag >= 0) { if (flag >= 0) {
sim_brk_clract (); /* defang breakpoint actions */ sim_brk_clract (); /* defang breakpoint actions */
--sim_do_depth; /* unwind nesting */ --sim_do_depth; /* unwind nesting */
@ -6650,17 +6673,6 @@ for (i = 0; sim_internal_device_count && (dptr = sim_internal_devices[i]); ++i)
return SCPE_OK; return SCPE_OK;
} }
static DEBTAB scp_debug[] = {
{"EVENT", SIM_DBG_EVENT, "event dispatch activities"},
{"ACTIVATE", SIM_DBG_ACTIVATE, "queue insertion activities"},
{"QUEUE", SIM_DBG_AIO_QUEUE, "asynch event queue activities"},
{"EXPSTACK", SIM_DBG_EXP_STACK, "expression stack activities"},
{"EXPEVAL", SIM_DBG_EXP_EVAL, "expression evaluation activities"},
{"ACTION", SIM_DBG_BRK_ACTION, "action activities"},
{"DO", SIM_DBG_DO, "do activities"},
{0}
};
t_stat sim_add_debug_flags (DEVICE *dptr, DEBTAB *debflags) t_stat sim_add_debug_flags (DEVICE *dptr, DEBTAB *debflags)
{ {
dptr->flags |= DEV_DEBUG; dptr->flags |= DEV_DEBUG;
@ -10601,7 +10613,7 @@ UPDATE_SIM_TIME; /* update sim time */
if (sim_clock_queue == QUEUE_LIST_END) { /* queue empty? */ if (sim_clock_queue == QUEUE_LIST_END) { /* queue empty? */
sim_interval = noqueue_time = NOQUEUE_WAIT; /* flag queue empty */ sim_interval = noqueue_time = NOQUEUE_WAIT; /* flag queue empty */
sim_debug (SIM_DBG_EVENT, sim_dflt_dev, "Queue Empty New Interval = %d\n", sim_interval); sim_debug (SIM_DBG_EVENT, &sim_scp_dev, "Queue Empty New Interval = %d\n", sim_interval);
return SCPE_OK; return SCPE_OK;
} }
sim_processing_event = TRUE; sim_processing_event = TRUE;
@ -10616,11 +10628,11 @@ do {
sim_interval = noqueue_time = NOQUEUE_WAIT; sim_interval = noqueue_time = NOQUEUE_WAIT;
AIO_EVENT_BEGIN(uptr); AIO_EVENT_BEGIN(uptr);
if (uptr->usecs_remaining) { if (uptr->usecs_remaining) {
sim_debug (SIM_DBG_EVENT, sim_dflt_dev, "Requeueing %s after %.0f usecs\n", sim_uname (uptr), uptr->usecs_remaining); sim_debug (SIM_DBG_EVENT, &sim_scp_dev, "Requeueing %s after %.0f usecs\n", sim_uname (uptr), uptr->usecs_remaining);
reason = sim_timer_activate_after (uptr, uptr->usecs_remaining); reason = sim_timer_activate_after (uptr, uptr->usecs_remaining);
} }
else { else {
sim_debug (SIM_DBG_EVENT, sim_dflt_dev, "Processing Event for %s\n", sim_uname (uptr)); sim_debug (SIM_DBG_EVENT, &sim_scp_dev, "Processing Event for %s\n", sim_uname (uptr));
if (uptr->action != NULL) if (uptr->action != NULL)
reason = uptr->action (uptr); reason = uptr->action (uptr);
else else
@ -10642,10 +10654,10 @@ do {
if (sim_clock_queue == QUEUE_LIST_END) { /* queue empty? */ if (sim_clock_queue == QUEUE_LIST_END) { /* queue empty? */
sim_interval = noqueue_time = NOQUEUE_WAIT; /* flag queue empty */ sim_interval = noqueue_time = NOQUEUE_WAIT; /* flag queue empty */
sim_debug (SIM_DBG_EVENT, sim_dflt_dev, "Processing Queue Complete New Interval = %d\n", sim_interval); sim_debug (SIM_DBG_EVENT, &sim_scp_dev, "Processing Queue Complete New Interval = %d\n", sim_interval);
} }
else else
sim_debug (SIM_DBG_EVENT, sim_dflt_dev, "Processing Queue Complete New Interval = %d(%s)\n", sim_interval, sim_uname(sim_clock_queue)); sim_debug (SIM_DBG_EVENT, &sim_scp_dev, "Processing Queue Complete New Interval = %d(%s)\n", sim_interval, sim_uname(sim_clock_queue));
if ((reason == SCPE_OK) && stop_cpu) { if ((reason == SCPE_OK) && stop_cpu) {
stop_cpu = FALSE; stop_cpu = FALSE;
@ -10681,7 +10693,7 @@ if (sim_is_active (uptr)) /* already active? */
return SCPE_OK; return SCPE_OK;
UPDATE_SIM_TIME; /* update sim time */ UPDATE_SIM_TIME; /* update sim time */
sim_debug (SIM_DBG_ACTIVATE, sim_dflt_dev, "Activating %s delay=%d\n", sim_uname (uptr), event_time); sim_debug (SIM_DBG_ACTIVATE, &sim_scp_dev, "Activating %s delay=%d\n", sim_uname (uptr), event_time);
prvptr = NULL; prvptr = NULL;
accum = 0; accum = 0;
@ -10815,7 +10827,7 @@ if (sim_clock_queue == QUEUE_LIST_END)
UPDATE_SIM_TIME; /* update sim time */ UPDATE_SIM_TIME; /* update sim time */
if (!sim_is_active (uptr)) if (!sim_is_active (uptr))
return SCPE_OK; return SCPE_OK;
sim_debug (SIM_DBG_EVENT, sim_dflt_dev, "Canceling Event for %s\n", sim_uname(uptr)); sim_debug (SIM_DBG_EVENT, &sim_scp_dev, "Canceling Event for %s\n", sim_uname(uptr));
nptr = QUEUE_LIST_END; nptr = QUEUE_LIST_END;
if (sim_clock_queue == uptr) { if (sim_clock_queue == uptr) {
@ -11394,7 +11406,7 @@ else {
sim_brk_clract (); /* no more */ sim_brk_clract (); /* no more */
} }
sim_trim_endspc (buf); sim_trim_endspc (buf);
sim_debug (SIM_DBG_BRK_ACTION, sim_dflt_dev, "sim_brk_getact(%d) - Returning: '%s'\n", sim_do_depth, buf); sim_debug (SIM_DBG_BRK_ACTION, &sim_scp_dev, "sim_brk_getact(%d) - Returning: '%s'\n", sim_do_depth, buf);
return buf; return buf;
} }
@ -11403,7 +11415,7 @@ return buf;
char *sim_brk_clract (void) char *sim_brk_clract (void)
{ {
if (sim_brk_act[sim_do_depth]) if (sim_brk_act[sim_do_depth])
sim_debug (SIM_DBG_BRK_ACTION, sim_dflt_dev, "sim_brk_clract(%d) - Clearing: '%s'\n", sim_do_depth, sim_brk_act[sim_do_depth]); sim_debug (SIM_DBG_BRK_ACTION, &sim_scp_dev, "sim_brk_clract(%d) - Clearing: '%s'\n", sim_do_depth, sim_brk_act[sim_do_depth]);
free (sim_brk_act_buf[sim_do_depth]); free (sim_brk_act_buf[sim_do_depth]);
return sim_brk_act[sim_do_depth] = sim_brk_act_buf[sim_do_depth] = NULL; return sim_brk_act[sim_do_depth] = sim_brk_act_buf[sim_do_depth] = NULL;
} }
@ -11424,13 +11436,13 @@ if (action) {
strlcpy (sim_brk_act_buf[sim_do_depth], action, new_size); strlcpy (sim_brk_act_buf[sim_do_depth], action, new_size);
strlcat (sim_brk_act_buf[sim_do_depth], "; ", new_size); strlcat (sim_brk_act_buf[sim_do_depth], "; ", new_size);
strlcat (sim_brk_act_buf[sim_do_depth], old_action, new_size); strlcat (sim_brk_act_buf[sim_do_depth], old_action, new_size);
sim_debug (SIM_DBG_BRK_ACTION, sim_dflt_dev, "sim_brk_setact(%d) - Pushed: '%s' ahead of: '%s'\n", sim_do_depth, action, old_action); sim_debug (SIM_DBG_BRK_ACTION, &sim_scp_dev, "sim_brk_setact(%d) - Pushed: '%s' ahead of: '%s'\n", sim_do_depth, action, old_action);
free (old_action); free (old_action);
} }
else { else {
sim_brk_act_buf[sim_do_depth] = (char *)realloc (sim_brk_act_buf[sim_do_depth], strlen (action) + 1); sim_brk_act_buf[sim_do_depth] = (char *)realloc (sim_brk_act_buf[sim_do_depth], strlen (action) + 1);
strcpy (sim_brk_act_buf[sim_do_depth], action); strcpy (sim_brk_act_buf[sim_do_depth], action);
sim_debug (SIM_DBG_BRK_ACTION, sim_dflt_dev, "sim_brk_setact(%d) - Set to: '%s'\n", sim_do_depth, action); sim_debug (SIM_DBG_BRK_ACTION, &sim_scp_dev, "sim_brk_setact(%d) - Set to: '%s'\n", sim_do_depth, action);
} }
sim_brk_act[sim_do_depth] = sim_brk_act_buf[sim_do_depth]; sim_brk_act[sim_do_depth] = sim_brk_act_buf[sim_do_depth];
} }
@ -13828,7 +13840,7 @@ void delete_Stack (Stack *sp)
if (sp == NULL) if (sp == NULL)
return; return;
sim_debug (SIM_DBG_EXP_STACK, sim_dflt_dev, "[Stack %d has been deallocated]\n", sp->id); sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d has been deallocated]\n", sp->id);
/* Free the data that the stack was pointing at */ /* Free the data that the stack was pointing at */
free (sp->elements); free (sp->elements);
@ -13853,7 +13865,7 @@ static Stack *new_Stack (void)
Stack *this_Stack = (Stack *)calloc(1, sizeof(*this_Stack)); Stack *this_Stack = (Stack *)calloc(1, sizeof(*this_Stack));
this_Stack->id = ++stack_counter; this_Stack->id = ++stack_counter;
sim_debug (SIM_DBG_EXP_STACK, sim_dflt_dev, "[Stack %d has been allocated]\n", this_Stack->id); sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d has been allocated]\n", this_Stack->id);
return this_Stack; /* Returns created stack */ return this_Stack; /* Returns created stack */
} }
@ -13874,10 +13886,10 @@ strcpy (data, this_Stack->elements[this_Stack->pointer-1].data);
--this_Stack->pointer; --this_Stack->pointer;
if (*op) if (*op)
sim_debug (SIM_DBG_EXP_STACK, sim_dflt_dev, "[Stack %d - Popping '%s'(precedence %d)]\n", sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Popping '%s'(precedence %d)]\n",
this_Stack->id, (*op)->string, (*op)->precedence); this_Stack->id, (*op)->string, (*op)->precedence);
else else
sim_debug (SIM_DBG_EXP_STACK, sim_dflt_dev, "[Stack %d - Popping %s]\n", sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Popping %s]\n",
this_Stack->id, data); this_Stack->id, data);
return TRUE; /* Success */ return TRUE; /* Success */
@ -13902,10 +13914,10 @@ strlcpy (this_Stack->elements[this_Stack->pointer].data, data, sizeof (this_Stac
++this_Stack->pointer; ++this_Stack->pointer;
if (op) if (op)
sim_debug (SIM_DBG_EXP_STACK, sim_dflt_dev, "[Stack %d - Pushing '%s'(precedence %d)]\n", sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Pushing '%s'(precedence %d)]\n",
this_Stack->id, op->string, op->precedence); this_Stack->id, op->string, op->precedence);
else else
sim_debug (SIM_DBG_EXP_STACK, sim_dflt_dev, "[Stack %d - Pushing %s]\n", sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Pushing %s]\n",
this_Stack->id, data); this_Stack->id, data);
return TRUE; /* Success */ return TRUE; /* Success */
@ -13923,10 +13935,10 @@ strcpy (data, this_Stack->elements[this_Stack->pointer-1].data);
*op = this_Stack->elements[this_Stack->pointer-1].op; *op = this_Stack->elements[this_Stack->pointer-1].op;
if (*op) if (*op)
sim_debug (SIM_DBG_EXP_STACK, sim_dflt_dev, "[Stack %d - Topping '%s'(precedence %d)]\n", sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Topping '%s'(precedence %d)]\n",
this_Stack->id, (*op)->string, (*op)->precedence); this_Stack->id, (*op)->string, (*op)->precedence);
else else
sim_debug (SIM_DBG_EXP_STACK, sim_dflt_dev, "[Stack %d - Topping %s]\n", sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Topping %s]\n",
this_Stack->id, data); this_Stack->id, data);
return TRUE; /* Success */ return TRUE; /* Success */
@ -14236,7 +14248,7 @@ while (*cptr) {
gbuf[0] = '0'; gbuf[0] = '0';
cptr = last_cptr + 1; cptr = last_cptr + 1;
} }
sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Glyph: %s]\n", op ? op->string : gbuf); sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Glyph: %s]\n", op ? op->string : gbuf);
if (!op) { if (!op) {
push_Stack (stack1, gbuf, op); push_Stack (stack1, gbuf, op);
continue; continue;
@ -14319,13 +14331,13 @@ if (sim_isalpha (*data) || (*data == '_')) {
if (rptr) { if (rptr) {
*svalue = (t_svalue)get_rval (rptr, 0); *svalue = (t_svalue)get_rval (rptr, 0);
sprint_val (string, *svalue, 10, string_size - 1, PV_LEFTSIGN); sprint_val (string, *svalue, 10, string_size - 1, PV_LEFTSIGN);
sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Value: %s=%s]\n", data, string); sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Value: %s=%s]\n", data, string);
return TRUE; return TRUE;
} }
gptr = _sim_get_env_special (data, string, string_size - 1); gptr = _sim_get_env_special (data, string, string_size - 1);
if (gptr) { if (gptr) {
*svalue = strtotsv(string, &gptr, 0); *svalue = strtotsv(string, &gptr, 0);
sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Value: %s=%s]\n", data, string); sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Value: %s=%s]\n", data, string);
return ((*gptr == '\0') && (*string)); return ((*gptr == '\0') && (*string));
} }
else { else {
@ -14340,12 +14352,12 @@ if ((data[0] == '"') && (data_size > 1) && (data[data_size - 1] == '"'))
strlcpy (string, data, string_size); strlcpy (string, data, string_size);
if (string[0] == '\0') { if (string[0] == '\0') {
*svalue = strtotsv(data, &gptr, 0); *svalue = strtotsv(data, &gptr, 0);
sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Value: %s=%s]\n", data, string); sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Value: %s=%s]\n", data, string);
return ((*gptr == '\0') && (*data)); return ((*gptr == '\0') && (*data));
} }
sim_sub_args (string, string_size, sim_exp_argv); sim_sub_args (string, string_size, sim_exp_argv);
*svalue = strtotsv(string, &gptr, 0); *svalue = strtotsv(string, &gptr, 0);
sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Value: %s=%s]\n", data, string); sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Value: %s=%s]\n", data, string);
return ((*gptr == '\0') && (*string)); return ((*gptr == '\0') && (*string));
} }
@ -14365,10 +14377,10 @@ char temp_string[CBUFSIZE + 2];
while (!isempty_Stack(stack1)) { while (!isempty_Stack(stack1)) {
pop_Stack (stack1, temp_data, &temp_op); pop_Stack (stack1, temp_data, &temp_op);
if (temp_op) if (temp_op)
sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Expression element: %s (%d)\n", sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Expression element: %s (%d)\n",
temp_op->string, temp_op->precedence); temp_op->string, temp_op->precedence);
else else
sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Expression element: %s\n", sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Expression element: %s\n",
temp_data); temp_data);
push_Stack (stack2, temp_data, temp_op); push_Stack (stack2, temp_data, temp_op);
} }
@ -14430,7 +14442,7 @@ const char *sim_eval_expression (const char *cptr, t_svalue *value, t_bool paren
const char *iptr = cptr; const char *iptr = cptr;
Stack *postfix = new_Stack (); /* for the postfix expression */ Stack *postfix = new_Stack (); /* for the postfix expression */
sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Evaluate Expression: %s\n", cptr); sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Evaluate Expression: %s\n", cptr);
*value = 0; *value = 0;
cptr = sim_into_postfix (postfix, cptr, stat, parens_required); cptr = sim_into_postfix (postfix, cptr, stat, parens_required);
if (*stat != SCPE_OK) { if (*stat != SCPE_OK) {

8
sim_defs.h
View file

@ -855,14 +855,6 @@ struct DEBTAB {
#define DEBUG_PRI(d,m) (sim_deb && (d.dctrl & (m))) #define DEBUG_PRI(d,m) (sim_deb && (d.dctrl & (m)))
#define DEBUG_PRJ(d,m) (sim_deb && ((d)->dctrl & (m))) #define DEBUG_PRJ(d,m) (sim_deb && ((d)->dctrl & (m)))
#define SIM_DBG_EVENT 0x01000000 /* event dispatch activities */
#define SIM_DBG_ACTIVATE 0x02000000 /* queue insertion activities */
#define SIM_DBG_AIO_QUEUE 0x04000000 /* asynch event queue activities */
#define SIM_DBG_EXP_STACK 0x08000000 /* expression stack activities */
#define SIM_DBG_EXP_EVAL 0x10000000 /* expression evaluation activities */
#define SIM_DBG_BRK_ACTION 0x20000000 /* action activities */
#define SIM_DBG_DO 0x40000000 /* do activities */
/* Open File Reference */ /* Open File Reference */
struct FILEREF { struct FILEREF {
char name[CBUFSIZE]; /* file name */ char name[CBUFSIZE]; /* file name */