1
0
mirror of https://github.com/simh/simh.git synced 2026-05-14 17:43:30 +00:00

SCP: Fix SRDATA macros to properly size the structure element in its array

This commit is contained in:
Mark Pizzolato
2026-03-11 07:46:18 -10:00
parent 45b804e947
commit 042f0bd841

View File

@@ -1063,11 +1063,11 @@ struct MEMFILE {
_RegCheck(#nm,&(loc),rdx,wd,off,dep,desc,flds,0,sizeof(UNIT),sizeof((loc)),URDATADF),(fl)
/* Arrayed register whose data is a field in a structure */
#define SRDATA(nm,aloc,floc,rdx,wd,off,dep) \
_RegCheck(#nm,&((aloc)->floc),(rdx),(wd),(off),(dep),NULL,NULL,0,sizeof(*(&aloc)),sizeof((aloc)->floc),SRDATA)
_RegCheck(#nm,&((aloc)->floc),(rdx),(wd),(off),(dep),NULL,NULL,0,sizeof(aloc)/(dep),sizeof((aloc)->floc),SRDATA)
#define SRDATAD(nm,aloc,floc,rdx,wd,off,dep,desc) \
_RegCheck(#nm,&((aloc)->floc),(rdx),(wd),(off),(dep),desc,NULL,0,sizeof(*(&aloc)),sizeof((aloc)->floc),SRDATAD)
_RegCheck(#nm,&((aloc)->floc),(rdx),(wd),(off),(dep),desc,NULL,0,sizeof(aloc)/(dep),sizeof((aloc)->floc),SRDATAD)
#define SRDATADF(nm,aloc,floc,rdx,wd,off,dep,desc,flds) \
_RegCheck(#nm,&((aloc)->floc),(rdx),(wd),(off),(dep),desc,flds,0,sizeof(*(&aloc)),sizeof((aloc)->floc),SRDATADF)
_RegCheck(#nm,&((aloc)->floc),(rdx),(wd),(off),(dep),desc,flds,0,sizeof(aloc)/(dep),sizeof((aloc)->floc),SRDATADF)
/* Arrayed register whose data is part of an arbitrary structure */
#define STRDATA(nm,loc,rdx,wd,off,dep,siz,fl) \