Merge nyus:/storage/git/firearm

[firearm.git] / Decode.v

diff --git a/Decode.v b/Decode.v
index b54104601f4dd8560b1c51bc37dbc683bf9a6e37..9bfb03ddf9e63c6b3c21c6a4b7bbf735faf67136 100644 (file)
--- a/Decode.v
+++ b/Decode.v
@@ -139,16 +139,20 @@ module Decode(
                begin
                        read_0 = insn[19:16];
                        read_1 = insn[3:0];
                begin
                        read_0 = insn[19:16];
                        read_1 = insn[3:0];

-                       
+                       read_2 = insn[15:12];
+

                        op0_out = regs0;
                        op1_out = regs1;
                        op0_out = regs0;
                        op1_out = regs1;

+                       op2_out = regs2;

                end
                `DECODE_ALU_HDATA_IMM:  /* Halfword transfer - immediate offset */
                begin
                        read_0 = insn[19:16];
                end
                `DECODE_ALU_HDATA_IMM:  /* Halfword transfer - immediate offset */
                begin
                        read_0 = insn[19:16];

+                       read_1 = insn[15:12];

                        
                        op0_out = regs0;
                        op1_out = {24'b0, insn[11:8], insn[3:0]};
                        
                        op0_out = regs0;
                        op1_out = {24'b0, insn[11:8], insn[3:0]};

+                       op2_out = regs1;

                end
                `DECODE_ALU:            /* ALU */
                begin
                end
                `DECODE_ALU:            /* ALU */
                begin