From c7ddf3fa9e818cfc34e041f3af8f62ebbdf5580a Mon Sep 17 00:00:00 2001
From: "(Tim) Efthimis Kritikos" <efkf@firemail.cc>
Date: Sat, 4 Nov 2023 08:31:05 +0000
Subject: [PATCH] More small fixes

---
 system/alu.v    |  8 ++++----
 system/system.v | 41 ++++++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/system/alu.v b/system/alu.v
index ee9adea..595c231 100644
--- a/system/alu.v
+++ b/system/alu.v
@@ -47,10 +47,10 @@ always @ ( * ) begin
 			`ALU_OP_ADD_SIGNED_B: {C_FLAG,OUT[7:0]}=A[7:0]+SIGNED_8B;
 			`ALU_OP_SUB: {C_FLAG,OUT[7:0]}=A[7:0]-B[7:0];
 			`ALU_OP_SUB_REVERSE: {C_FLAG,OUT[7:0]}=B[7:0]-A[7:0];
-			`ALU_OP_AND: begin C_FLAG=0;OUT=A&B; end
-			`ALU_OP_OR:  begin C_FLAG=0;OUT=A|B; end
-			`ALU_OP_XOR: begin C_FLAG=0;OUT=A^B; end
-			`ALU_OP_SHIFT_LEFT: begin C_FLAG=(A&16'h80)==16'h80;OUT=A<<B; end
+			`ALU_OP_AND: begin C_FLAG=0;OUT[7:0]=A[7:0]&B[7:0]; end
+			`ALU_OP_OR:  begin C_FLAG=0;OUT[7:0]=A[7:0]|B[7:0]; end
+			`ALU_OP_XOR: begin C_FLAG=0;OUT[7:0]=A[7:0]^B[7:0]; end
+			`ALU_OP_SHIFT_LEFT: begin C_FLAG=(A&16'h80)==16'h80;OUT[7:0]=A[7:0]<<B; end
 		endcase
 	end
 end
diff --git a/system/system.v b/system/system.v
index dd37275..23251fa 100644
--- a/system/system.v
+++ b/system/system.v
@@ -67,14 +67,14 @@ initial begin
 			$dumpvars(0,p,cycles);
 		end
 		`ifdef OTUPUT_JSON_STATISTICS
-		if(!$value$plusargs("VERSION=%s",version)) version="unkown";
-		if(!$value$plusargs("COMMIT=%s",commit)) commit="unkown";
-		if($value$plusargs("STATS=%s",stats_name))begin
-			json_file_descriptor=$fopen(stats_name,"w");
-			$fdisplay(json_file_descriptor,"{\n\"L1_size\":%0d,\n\"9086 verison\":\"%s\",\n\"latest commit\":\"%s\",\n\"Cycles\":[",$rtoi($pow(2,`L1_CACHE_SIZE)),version,commit);
-			first_json_cycle = 1;
-		end else
-			json_file_descriptor=0;
+			if(!$value$plusargs("VERSION=%s",version)) version="unkown";
+			if(!$value$plusargs("COMMIT=%s",commit)) commit="unkown";
+			if($value$plusargs("STATS=%s",stats_name))begin
+				json_file_descriptor=$fopen(stats_name,"w");
+				$fdisplay(json_file_descriptor,"{\n\"L1_size\":%0d,\n\"9086 verison\":\"%s\",\n\"latest commit\":\"%s\",\n\"Cycles\":[",$rtoi($pow(2,`L1_CACHE_SIZE)),version,commit);
+				first_json_cycle = 1;
+			end else
+				json_file_descriptor=0;
 		`endif
 		sane=0;
 		finish=0;
@@ -117,25 +117,24 @@ always @(new_instruction) begin
 end
 `endif
 
-reg [1:0] finish;
 
-`ifndef YOSYS
-string memdump_name;
-`endif
-always @(posedge HALT) begin
-	`ifndef YOSYS
+`ifndef SYNTHESIS
+
+	`ifdef OTUPUT_JSON_STATISTICS
+	reg [128:0] instruction_count_temp;
+	`endif
+
+	string memdump_name;
+
+	always @(posedge HALT) begin
 		if($value$plusargs("MEMDUMP=%s",memdump_name))begin
 			$writememh(memdump_name, sysmem.memory,0,32767);
 		end
-	`endif
-	finish<=2'd1;
-end
+		finish<=2'd1;
+	end
 
-`ifdef OTUPUT_JSON_STATISTICS
-reg [128:0] instruction_count_temp;
-`endif
+	reg [1:0] finish;
 
-`ifndef SYNTHESIS
 	reg sane;
 	reg [128:0] cycles;