Merge branch 'master' of wien.tomnetworks.com:calu

[calu.git] / cpu / src / exec_op / shift_op_b.vhd

diff --git a/cpu/src/exec_op/shift_op_b.vhd b/cpu/src/exec_op/shift_op_b.vhd
old mode 100755 (executable)
new mode 100644 (file)
index 2d5311d..7f00dcf
--- a/cpu/src/exec_op/shift_op_b.vhd
+++ b/cpu/src/exec_op/shift_op_b.vhd
@@ -11,8 +11,13 @@ architecture shift_op of exec_op is
 
 begin
 
+<<<<<<< HEAD
        arith <=  op_detail(ARITH_OPT);
        rs      <=  op_detail(RIGHT_OPT);
+=======
+       logic <=  op_detail(ARITH_OPT);
+       ls      <=  op_detail(RIGHT_OPT);
+>>>>>>> 05fc0d5300956fef107bbb8507a6480ee11695ff
        carry <= op_detail(CARRY_OPT);
 
 calc: process(left_operand, right_operand, arith,rs, carry, alu_state)