Skip to content
Snippets Groups Projects
Commit 705e66f9 authored by Yann Roberge's avatar Yann Roberge
Browse files

Merge branch 'master' of https://git.step.polymtl.ca/Retro/lab-2

parents 21c302e2 0bcdec13
No related branches found
No related tags found
No related merge requests found
...@@ -53,14 +53,14 @@ begin ...@@ -53,14 +53,14 @@ begin
o_sum => adder_result); o_sum => adder_result);
-- Barrel Shifter -- Barrel Shifter
shifter: entity work.shifter shifter: entity work.shifter
port map ( port map (
i_shamt => i_shamt, i_shamt => i_shamt,
i_src1 => i_src1, i_src1 => i_src1,
i_arith => i_arith, i_arith => i_arith,
i_opcode => i_opcode, i_opcode => i_opcode,
o_sh => shifter_result); o_sh => shifter_result);
-- Unité logique -- Unité logique
and_result <= i_src1 and i_src2; and_result <= i_src1 and i_src2;
xor_result <= i_src1 xor i_src2; xor_result <= i_src1 xor i_src2;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment