From 54eda7a050484ec34e50ec3d8db6dca6911c48ab Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Fri, 4 Feb 2022 07:56:15 -0800 Subject: [PATCH] SCP: Extend BITFIELDS to allow alternate descriptions for same fields --- doc/simh.doc | Bin 310784 -> 312320 bytes scp.c | 5 ++++- sim_defs.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/simh.doc b/doc/simh.doc index 6fda17d06dd34255cfe5825d279b92aa36cc5bd6..cfc7dbb19037ca3124f68e7cbf7aa2d3f1f6298c 100644 GIT binary patch delta 30587 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 diff --git a/scp.c b/scp.c index 2b23cebe..a5384b0c 100644 --- a/scp.c +++ b/scp.c @@ -13607,7 +13607,7 @@ static const char *debtab_nomatch = "DEBTAB_NOMATCH"; const char *some_match = NULL; int32 offset = 0; -if (dptr->debflags == 0) +if (dptr->debflags == NULL) return debtab_none; dbits &= (dptr->dctrl | (uptr ? uptr->dctrl : 0));/* Look for just the bits that matched */ @@ -13676,6 +13676,8 @@ uint32 value, beforevalue, mask; for (fields=offset=0; bitdefs[fields].name; ++fields) { if (bitdefs[fields].offset == 0xffffffff) /* fixup uninitialized offsets */ bitdefs[fields].offset = offset; + else + offset = bitdefs[fields].offset; offset += bitdefs[fields].width; } for (i = fields-1; i >= 0; i--) { /* print xlation, transition */ @@ -13731,6 +13733,7 @@ if (sim_deb && dptr && (dptr->dctrl & dbits)) { sim_oline = saved_oline; /* restore original socket */ } } + void sim_debug_bits(uint32 dbits, DEVICE* dptr, BITFIELD* bitdefs, uint32 before, uint32 after, int terminate) { diff --git a/sim_defs.h b/sim_defs.h index eae5c432..4b5ceb15 100644 --- a/sim_defs.h +++ b/sim_defs.h @@ -986,6 +986,7 @@ struct MEMFILE { /* Hidden Blob of Data - Only used for SAVE/RESTORE */ #define SAVEDATA(nm,loc) \ _REGDATANF(#nm,&(loc),0,8,0,1,NULL,NULL,0,sizeof(loc),sizeof(loc),SAVEDATA),(REG_HRO) +#define STARTBIT {"", 0x00000000, 0, NULL, NULL} /* Start at beginning bit */ #define BIT(nm) {#nm, 0xffffffff, 1, NULL, NULL} /* Single Bit definition */ #define BITNC {"", 0xffffffff, 1, NULL, NULL} /* Don't care Bit definition */ #define BITF(nm,sz) {#nm, 0xffffffff, sz, NULL, NULL} /* Bit Field definition */ @@ -1073,6 +1074,7 @@ struct MEMFILE { /* Hidden Blob of Data - Only used for SAVE/RESTORE */ #define SAVEDATA(nm,loc) \ _REGDATANF("nm",&(loc),0,8,0,1,NULL,NULL,0,sizeof(loc),sizeof(loc)),SAVEDATA),(REG_HRO) +#define STARTBIT {"", 0x00000000, 0, NULL, NULL} /* Start at beginning bit */ #define BIT(nm) {"nm", 0xffffffff, 1, NULL, NULL} /* Single Bit definition */ #define BITNC {"", 0xffffffff, 1, NULL, NULL} /* Don't care Bit definition */ #define BITF(nm,sz) {"nm", 0xffffffff, sz, NULL, NULL} /* Bit Field definition */