From 533064340377713002a483274fb149987ff31a9c Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Thu, 22 Dec 2022 09:41:16 -1000 Subject: [PATCH] SCP: Improve details of errors reported parsing breakpoint commands --- scp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scp.c b/scp.c index c2dda20b..794df9d5 100644 --- a/scp.c +++ b/scp.c @@ -7930,19 +7930,21 @@ if (*cptr == 0) { /* no argument? */ return ssh_break_one (st, flg, lo, 0, aptr); } while (*cptr) { + const char *ocptr = cptr; + cptr = get_glyph (cptr, gbuf, ','); tptr = get_range (dptr, gbuf, &lo, &hi, dptr->aradix, max, 0); if (tptr == NULL) - return sim_messagef (SCPE_ARG, "Invalid address specifier: %s\n", gbuf); + return sim_messagef (SCPE_ARG, "Invalid breakpoint address specifier: %s\n", ocptr); if (*tptr == '[') { cnt = (int32) strtotv (tptr + 1, &t1ptr, 10); if ((tptr == t1ptr) || (*t1ptr != ']') || (flg != SSH_ST)) - return sim_messagef (SCPE_ARG, "Invalid repeat count specifier: %s\n", tptr + 1); + return sim_messagef (SCPE_ARG, "Invalid breakpoint repeat count specifier: %s\n", tptr + 1); tptr = t1ptr + 1; } else cnt = 0; if (*tptr != 0) - return sim_messagef (SCPE_ARG, "Unexpected argument: %s\n", tptr); + return sim_messagef (SCPE_ARG, "Unexpected breakpoint argument: %s\n", tptr); if ((lo == 0) && (hi == max)) { if (flg == SSH_CL) sim_brk_clrall (sim_switches);