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

Conflicts:
	cpu/src/exec_op/shift_op_b.vhd

diff --cc cpu/src/exec_op/shift_op_b.vhd
index 2d5311d5ef40b15eeac940dd8861c5857304acb3,f0acce68e33e63f901ea58ddecedc94002ca9bd8..7f00dcfb6a4d2b74e5b440d9c85ca77b9d2cc1b6
mode 100755,100644..100644
--- 1/cpu/src/exec_op/shift_op_b.vhd
--- 2/cpu/src/exec_op/shift_op_b.vhd
+++ b/cpu/src/exec_op/shift_op_b.vhd
@@@ -11,11 -11,11 +11,16 @@@ architecture shift_op of exec_op i
  
  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, logic,ls, carry, alu_state)
 +calc: process(left_operand, right_operand, arith,rs, carry, alu_state)
                variable alu_result_v : alu_result_rec;
                variable tmp_shift : bit_vector(gp_register_t'length+1 downto 0);
                variable tmp_sb : std_logic;