Added cycles to waveform capture for icarus verilog

system/biu.v

@@ -276,11 +276,11 @@ always @(posedge clock) begin
 			/*************** DATA READ ***************/
 			`define finished_read  \
 				DATA_DIR <= 0; \
-				VALID_DATA <= 1;\
 				if ( read_request == 0 ) begin \
 					biu_state <= `BIU_NEXT_ACTION;\
 					VALID_DATA <= 0;\
-				end
+				end else \
+					VALID_DATA <= 1;
 			`BIU_GET_ALIGNED_DATA:begin
 				`ifdef DEBUG_DATA_READ_WRITES
 					if(Wbit==1)

system/decoder.v

@@ -105,14 +105,14 @@ end
 always @(posedge reset) begin
 	de_state <= `DE_STATE_ENTRY;
 	/* need early init */
-			ucode_seq_addr <= `UCODE_NO_INSTRUCTION;
-			SIMPLE_MICRO <= 0;
-			owe_set_init <= 0;
-			set_initial_values<=0;
-			wait_exec<=0;
-			first_ucode <= 0;
-			HALT_LATCHED <= 0;
-			ERROR_LATCHED <= `ERROR_BITS'h0;
+	ucode_seq_addr <= `UCODE_NO_INSTRUCTION;
+	SIMPLE_MICRO <= 0;
+	owe_set_init <= 0;
+	set_initial_values<=0;
+	wait_exec<=0;
+	first_ucode <= 0;
+	HALT_LATCHED <= 0;
+	ERROR_LATCHED <= `ERROR_BITS'h0;
 	VALID_INSTRUCTION_ACK <= 0;
 end
 

system/system.v

@@ -54,7 +54,7 @@ string waveform_name;
 initial begin
 	if($value$plusargs("WAVEFORM=%s",waveform_name))begin
 		$dumpfile(waveform_name);
-		$dumpvars(0,p);
+		$dumpvars(0,p,cycles);
 	end
 	`ifdef OTUPUT_JSON_STATISTICS
 	if($value$plusargs("STATS=%s",stats_name))begin
@@ -65,6 +65,7 @@ initial begin
 		json_file_descriptor=0;
 	`endif
 	sane=0;
+	finish=0;
 end
 
 //integer killswitch=0;
@@ -81,7 +82,7 @@ end
 `ifdef OTUPUT_JSON_STATISTICS
 reg first_json_cycle;
 always @(negedge clock)begin
-	if(finish < 2 && json_file_descriptor!=0)begin
+	if(finish < 2 && json_file_descriptor!=0 && sane)begin
 		$fdisplay(json_file_descriptor,"%s{\"C\":%0d,\"L1\":%0d,\"VDI\":%0d,\"JMP\":%0d}",first_json_cycle?"":",",cycles,L1_SIZE_STAT,VALID_INSTRUCTION_STAT,jump_req);
 		first_json_cycle <= 0;
 	end