ldi add finished

[calu.git] / cpu / src / decoder_b.vhd

diff --git a/cpu/src/decoder_b.vhd b/cpu/src/decoder_b.vhd
index b0ae0dd787eba34a5effccd7011d6ec2684fafa0..d1b49c1da4a6e5d4ad6a28ae0aee51b4d2be2b01 100644 (file)
--- a/cpu/src/decoder_b.vhd
+++ b/cpu/src/decoder_b.vhd
@@ -218,12 +218,15 @@ begin
                instr_s.signext := instruction(2);
                instr_s.high_low := instruction(1);
 
+               instr_s.op_group := LDST_OP;
+               instr_s.op_detail(NO_PSW_OPT) := '1';
+
                if (instr_s.opcode = "11010") then
                        if (instr_s.signext = '1' and instr_s.immediate(11) = '1') then
                                instr_s.immediate(31 downto 16) := (others => '1');
                        end if;
-                       instr_s.immediate(14 downto 0) := instruction(14 downto 0);
-                       instr_s.immediate(WORD_WIDTH-1 downto 15) := (others => '0');
+                       instr_s.immediate(11 downto 0) := instruction(14 downto 3);
+                       instr_s.immediate(WORD_WIDTH-1 downto 12) := (others => '0');
                        instr_s.op_detail(IMM_OPT) := '1';
                end if;
        end if;
@@ -311,6 +314,9 @@ begin
 
                        instr_s.op_detail(IMM_OPT) := '1';
                end if;
+               instr_s.op_detail(NO_DST_OPT) := '1';
+               instr_s.op_group := ADDSUB_OP;
+               instr_s.op_detail(SUB_OPT) := '1';
 
        end if;