Changeset 181 for trunk/3DEES/classifier.v

Timestamp:

Jan 15, 2014, 4:51:59 PM (11 years ago)

Author:

demin

Message:

working classifier

File:

• trunk/3DEES/classifier.v (modified) (12 diffs)

trunk/3DEES/classifier.v

@@ -12 +12 @@
         );
 
-        reg                                     int_case_reg, int_case_next;
         reg                                     out_flag_reg, out_flag_next;
         reg             [5:0]           out_data_reg, out_data_next;
+        reg             [5:0]           inp_flag_reg, inp_flag_next;
         reg             [width-1:0]     inp_data_reg [5:0], inp_data_next [5:0];
         reg             [15:0]          int_pipe_reg [19:0], int_pipe_next [19:0];      
         reg             [1:0]           int_data_reg [3:0], int_data_next [3:0];
+        reg             [4:0]           int_temp_reg [1:0], int_temp_next [1:0];
 
         wire    [width-1:0]     inp_data_wire [5:0];
@@ -60 +61 @@
                 if (reset)
                 begin
+                        inp_flag_reg <= {(6){1'b0}};
                         out_data_reg <= {(6){1'b0}};
                         out_flag_reg <= 1'b0;
@@ -74 +76 @@
                                 int_data_reg[i] <= {(2){1'b0}};
                         end
+                        for (i = 0; i < 2; i = i + 1)
+                        begin
+                                int_temp_reg[i] <= {(5){1'b0}};
+                        end
                 end
                 else
                 begin
+                        inp_flag_reg <= inp_flag_next;
                         out_data_reg <= out_data_next;
                         out_flag_reg <= out_flag_next;
@@ -90 +97 @@
                         begin
                                 int_data_reg[i] <= int_data_next[i];
+                        end
+                        for (i = 0; i < 2; i = i + 1)
+                        begin
+                                int_temp_reg[i] <= int_temp_next[i];
                         end
                 end
@@ -96 +107 @@
         always @*
         begin
+                inp_flag_next = inp_flag_reg;
                 out_data_next = out_data_reg;
                 out_flag_next = out_flag_reg;
@@ -110 +122 @@
                         int_data_next[i] = int_data_reg[i];
                 end
+                for (i = 0; i < 2; i = i + 1)
+                begin
+                        int_temp_next[i] = int_temp_reg[i];
+                end
 
                 if (frame)
                 begin
+                        inp_flag_next = inp_flag;
                         for (i = 0; i < 6; i = i + 1)
                         begin
-                                inp_data_next[i] = inp_flag[i] ? inp_data_wire[i] : {(width){1'b0}};
+                                inp_data_next[i] = inp_data_wire[i];
                         end
                 
@@ -125 +142 @@
                                         int_pipe_next[i] = {(16){1'b0}};
                                 end
+                                int_temp_next[0] = {(5){1'b0}};
+                                int_temp_next[1] = {(5){1'b0}};
                                 out_data_next = {(6){1'b0}};
                         end
@@ -134 +153 @@
                                 for (i = 2; i < 8; i = i + 1)
                                 begin
-                                        int_pipe_next[i] = {int_pipe_reg[i][14:0], inp_flag[i-2]};
+                                        int_pipe_next[i] = {int_pipe_reg[i][14:0], inp_flag_reg[i-2]};
                                 end
                                 for (i = 8; i < 20; i = i + 1)
@@ -151 +170 @@
                                         endcase
                                 end
-
-                                case ({int_pipe_wire[1], int_pipe_wire[0][3]^int_pipe_wire[0][2]})
+                                
+                                int_temp_next[0] = {int_pipe_wire[1], int_pipe_wire[0][3]^int_pipe_wire[0][2]};
+                                int_temp_next[1] = {1'b0, int_pipe_wire[0]};
+
+                                case (int_temp_reg[0][4:0])
                                         5'b00011: out_data_next[3:0] = {2'd0, int_data_next[0]};
                                         5'b00111: out_data_next[3:0] = {2'd1, int_data_next[1]};
@@ -160 +182 @@
                                 endcase
         
-                                case (int_pipe_wire[0])
+                                case (int_temp_reg[1][3:0])
                                         // S1_F, electron
-                                        4'b0001: out_data_next[5:4] = 2'd0;
+                                        4'b0100: out_data_next[5:4] = 2'd0;
                                                                                 
                                         // S1_F, proton
@@ -168 +190 @@
                                                                                  
                                         // S1_S, electron
-                                        4'b0010: out_data_next[5:4] = 2'd2;
+                                        4'b1000: out_data_next[5:4] = 2'd2;
                                                                                  
                                         // S1_S, proton
@@ -179 +201 @@
         end
 
-//      assign out_data = {2'd0, int_data_reg[1]};
-//      assign out_data = {2'd0, int_pipe_wire[7:4]};
+//      assign out_data = {1'd0, int_pipe_wire[1+2][2:0], int_data_reg[1]};
+//      assign out_data = {1'd0, int_comp_wire[0], int_temp_reg[1][3:0]};
+//      assign out_data = {1'd0, int_temp_reg[0][4:0]};
         assign out_data = out_data_reg;
         assign out_flag = out_flag_reg;