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

Clang compiler cleanup for new sim_debug_bits

Browse source
This commit is contained in:
Mark Pizzolato 2012-12-06 08:15:14 -08:00
parent 2c1d2b9a88
commit 72ca9de180
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scp.c
View file

@ -5897,7 +5897,7 @@ if (sim_deb && (dptr->dctrl & dbits)) {
fprintf(sim_deb, "%s=%s%s ", bitdefs[i].name, delta, bitdefs[i].valuenames[value]); fprintf(sim_deb, "%s=%s%s ", bitdefs[i].name, delta, bitdefs[i].valuenames[value]);
else else
if (bitdefs[i].format) { if (bitdefs[i].format) {
fprintf(sim_deb, "%s=%s", bitdefs[i].name, delta, value); fprintf(sim_deb, "%s=%s", bitdefs[i].name, delta);
fprintf(sim_deb, bitdefs[i].format, value); fprintf(sim_deb, bitdefs[i].format, value);
} }
else else

24
sim_defs.h
View file

@ -534,12 +534,12 @@ struct sim_fileref {
#define BRDATA(nm,loc,rdx,wd,dep) #nm, (loc), (rdx), (wd), 0, (dep) #define BRDATA(nm,loc,rdx,wd,dep) #nm, (loc), (rdx), (wd), 0, (dep)
#define URDATA(nm,loc,rdx,wd,off,dep,fl) \ #define URDATA(nm,loc,rdx,wd,off,dep,fl) \
#nm, &(loc), (rdx), (wd), (off), (dep), ((fl) | REG_UNIT) #nm, &(loc), (rdx), (wd), (off), (dep), ((fl) | REG_UNIT)
#define BIT(nm) {#nm, -1, 1} #define BIT(nm) {#nm, -1, 1} /* Single Bit definition */
#define BITNC {"", -1, 1} #define BITNC {"", -1, 1} /* Don't care Bit definition */
#define BITF(nm,sz) {#nm, -1, sz} #define BITF(nm,sz) {#nm, -1, sz} /* Bit Field definition */
#define BITNCF(sz) {"", -1, sz} #define BITNCF(sz) {"", -1, sz} /* Don't care Bit Field definition */
#define BITFFMT(nm,sz,fmt) {#nm, -1, sz, NULL, #fmt} #define BITFFMT(nm,sz,fmt) {#nm, -1, sz, NULL, #fmt}/* Bit Field definition with Output format */
#define BITFNAM(nm,sz,names) {#nm, -1, sz, names} #define BITFNAM(nm,sz,names) {#nm, -1, sz, names} /* Bit Field definition with value->name map */
#else #else
#define ORDATA(nm,loc,wd) "nm", &(loc), 8, (wd), 0, 1 #define ORDATA(nm,loc,wd) "nm", &(loc), 8, (wd), 0, 1
#define DRDATA(nm,loc,wd) "nm", &(loc), 10, (wd), 0, 1 #define DRDATA(nm,loc,wd) "nm", &(loc), 10, (wd), 0, 1
@ -549,12 +549,12 @@ struct sim_fileref {
#define BRDATA(nm,loc,rdx,wd,dep) "nm", (loc), (rdx), (wd), 0, (dep) #define BRDATA(nm,loc,rdx,wd,dep) "nm", (loc), (rdx), (wd), 0, (dep)
#define URDATA(nm,loc,rdx,wd,off,dep,fl) \ #define URDATA(nm,loc,rdx,wd,off,dep,fl) \
"nm", &(loc), (rdx), (wd), (off), (dep), ((fl) | REG_UNIT) "nm", &(loc), (rdx), (wd), (off), (dep), ((fl) | REG_UNIT)
#define BIT(nm) {"nm", -1, 1} #define BIT(nm) {"nm", -1, 1} /* Single Bit definition */
#define BITNC {"", -1, 1} #define BITNC {"", -1, 1} /* Don't care Bit definition */
#define BITF(nm,sz) {"nm", -1, sz} #define BITF(nm,sz) {"nm", -1, sz} /* Bit Field definition */
#define BITNCF(sz) {"", -1, sz} #define BITNCF(sz) {"", -1, sz} /* Don't care Bit Field definition */
#define BITFFMT(nm,sz,fmt) {"nm", -1, sz, NULL, "fmt"} #define BITFFMT(nm,sz,fmt) {"nm", -1, sz, NULL, "fmt"}/* Bit Field definition with Output format */
#define BITFNAM(nm,sz,names) {"nm", -1, sz, names} #define BITFNAM(nm,sz,names) {"nm", -1, sz, names} /* Bit Field definition with value->name map */
#endif #endif
#define ENDBITS {NULL} /* end of bitfield list */ #define ENDBITS {NULL} /* end of bitfield list */