Begin dumphist implementation into sflr menu

See also issue physical-computation#129

Author: jan-heck

sim/Makefile

@@ -161,6 +161,8 @@ decode-riscv.h: latencies-riscv.h Makefile
 	./mkdecode-riscv $(GAWK) > decode-riscv.h
 
 #	Either of the lex-* would suffice for generating the LaTeX / help command array.
+#	TODO Changed to riscv for now. This should be properly implemented as a union of lex-*, considering which
+#	     parts of riscv/superh(/...) are duplicates
 help.h: lex-hitachi-sh.c Makefile
 	./mkhelp $(GAWK) > help.h
 

sim/lex-riscv.c

@@ -68,6 +68,7 @@ TokenTab riscv_token_table [] =
 	{"FF",		T_MODEFF},				/*+	Set simulator in fast functional mode.:none									*/
 	{"MMAP",	T_MMAP},				/*+	Map memory of one simulated node into another.:<source (integer)> <destination (integer)>			*/
 	{"DUMPREGS",	T_DUMPREGS},				/*+	Show the contents of the general purpose registers.:none							*/
+	{"DUMPHIST",	T_DUMPHIST},				/*+	Show the contents of a histogram register.:none							*/
 	{"DUMPSYSREGS",	T_DUMPSYSREGS},				/*+	Show the contents of the system registers.:none									*/
 	{"DUMPMEM",	T_DUMPMEM},				/*+	Show contents of memory.:<start mem address (hexadecimal)> <end mem address (hexadecimal)>			*/
 	{"DUMPPIPE",	T_DUMPPIPE},				/*+	Show the contents of the pipeline stages.:none									*/

sim/machine-riscv.c

@@ -243,6 +243,7 @@ riscvnewstate(Engine *E, double xloc, double yloc, double zloc, char *trajfilena
 	S->riscv->uncertain = uncertainnewstate(E, "S->riscv->uncertain");
 
 	S->dumpregs = riscvdumpregs;
+	S->dumphist = Histogram_PrintDist;
 	S->dumpsysregs = riscvdumpsysregs;
 	S->dumppipe = riscvdumppipe;
 	S->flushpipe = riscvflushpipe;
@@ -261,7 +262,8 @@ riscvnewstate(Engine *E, double xloc, double yloc, double zloc, char *trajfilena
 
 
 // Print histogram
-void Histogram_PrintDist(Engine *E, State *S, Histogram *histogram){
+void
+Histogram_PrintDist(Engine *E, State *S, Histogram *histogram){
 	mprint(E, S, nodeinfo, "tes-");
 
 	for (int i = 0; i < kNBINS; i++){

sim/main.h

@@ -711,6 +711,7 @@ struct State
 	/*		Other misc machine specific actions		*/
 	void 		(*fatalaction)(Engine *, State *S);
 	void 		(*dumpregs)(Engine *, State *S);
+	void 		(*dumphist)(Engine *, State *S);
 	void 		(*dumpsysregs)(Engine *, State *S);
 	void 		(*resetcpu)(Engine *, State *S);
 	void 		(*dumppipe)(Engine *, State *S);

sim/mkhelp

@@ -14,9 +14,11 @@
 	fi
 
 
+	# TODO Changed from lex-riscv.c -> lex-riscv.c
+	#      see Makefile target help.h
 	echo 'Help Helpstrs[] =\'
 	echo '{\'
-	cat lex-hitachi-sh.c | grep '/\*+' | sort | $1 -F'*|_|}|{|+|,|:' '{print "\t{\n\t\t\t" $2 ",\n\t\t\t\"\tDescription:" $8 "\",\n\t\t\t\"\tArguments:\t" $9 "\",\n\t},"}'
+	cat lex-riscv.c | grep '/\*+' | sort | $1 -F'*|_|}|{|+|,|:' '{print "\t{\n\t\t\t" $2 ",\n\t\t\t\"\tDescription:" $8 "\",\n\t\t\t\"\tArguments:\t" $9 "\",\n\t},"}'
 	echo '};'
-	echo 'int	nHelpstrs ='`cat lex-hitachi-sh.c | grep '/\*+' | wc -l`';'
-	echo 'int	uniqHelpstrs ='`cat lex-hitachi-sh.c | grep '/\*+' | sort -t '"' -k 2 | $1 '{print $2}' | sort | uniq | wc -l`';'
+	echo 'int	nHelpstrs ='`cat lex-riscv.c | grep '/\*+' | wc -l`';'
+	echo 'int	uniqHelpstrs ='`cat lex-riscv.c | grep '/\*+' | sort -t '"' -k 2 | $1 '{print $2}' | sort | uniq | wc -l`';'

sim/regs-riscv.h

@@ -265,7 +265,6 @@ typedef union
  */
 
 
-// TODO move to file containing constant declarations
 // TODO consider whether this should be part of the typedef, i.e. be dynamically allocated
 //      that would be more flexible, but arguably less aligned with how a processor operating
 //      on fixed-precision variables would work
@@ -275,6 +274,7 @@ typedef union
 #define kNBINS 256
 typedef int32_t HistogramBinDatatype;
 
+// TODO Is this the best place to define this datatype?
 typedef struct
 {
 	// TODO I chose the more familiar term "bins" rather than Alexa's "weights".

sim/sf-riscv.y

@@ -104,6 +104,7 @@
 %token	T_DUMPDISTRIBUTION
 %token	T_DUMPPWR
 %token	T_DUMPREGS
+%token	T_DUMPHIST
 %token	T_DUMPSYSREGS
 %token	T_DUMPTIME
 %token	T_DUMPTLB
@@ -1207,6 +1208,14 @@ sf_cmd		: T_QUIT '\n'
 				yyengine->cp->dumpregs(yyengine, yyengine->cp);
 			}
 		}
+		| T_DUMPHIST '\n'
+		{
+			if (!yyengine->scanning)
+			{
+				yyengine->cp->dumphist(yyengine, yyengine->cp);
+			}
+		}
+
 		| T_DUMPSYSREGS '\n'
 		{
 			if (!yyengine->scanning)