Fix shift operations to mask shift amount per JVM spec

Author: dlunch

jvm_rust/src/interpreter.rs

@@ -662,13 +662,13 @@ impl Interpreter {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
                 let value1: i32 = stack_frame.operand_stack.pop().unwrap().into();
 
-                stack_frame.operand_stack.push(JavaValue::Int(value1 << value2));
+                stack_frame.operand_stack.push(JavaValue::Int(value1 << (value2 & 0x1f)));
             }
             Opcode::Ishr => {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
                 let value1: i32 = stack_frame.operand_stack.pop().unwrap().into();
 
-                stack_frame.operand_stack.push(JavaValue::Int(value1 >> value2));
+                stack_frame.operand_stack.push(JavaValue::Int(value1 >> (value2 & 0x1f)));
             }
             Opcode::Isub => {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
@@ -680,7 +680,7 @@ impl Interpreter {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
                 let value1: i32 = stack_frame.operand_stack.pop().unwrap().into();
 
-                stack_frame.operand_stack.push(JavaValue::Int(((value1 as u32) >> (value2 as u32)) as _));
+                stack_frame.operand_stack.push(JavaValue::Int(((value1 as u32) >> ((value2 as u32) & 0x1f)) as _));
             }
             Opcode::Ixor => {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
@@ -768,13 +768,13 @@ impl Interpreter {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
                 let value1: i64 = stack_frame.operand_stack.pop().unwrap().into();
 
-                stack_frame.operand_stack.push(JavaValue::Long(value1 << value2));
+                stack_frame.operand_stack.push(JavaValue::Long(value1 << (value2 & 0x3f)));
             }
             Opcode::Lshr => {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
                 let value1: i64 = stack_frame.operand_stack.pop().unwrap().into();
 
-                stack_frame.operand_stack.push(JavaValue::Long(value1 >> value2));
+                stack_frame.operand_stack.push(JavaValue::Long(value1 >> (value2 & 0x3f)));
             }
             Opcode::Lsub => {
                 let value2: i64 = stack_frame.operand_stack.pop().unwrap().into();
@@ -786,7 +786,7 @@ impl Interpreter {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
                 let value1: i64 = stack_frame.operand_stack.pop().unwrap().into();
 
-                stack_frame.operand_stack.push(JavaValue::Long(((value1 as u64) >> (value2 as u64)) as _));
+                stack_frame.operand_stack.push(JavaValue::Long(((value1 as u64) >> ((value2 as u64) & 0x3f)) as _));
             }
             Opcode::Lxor => {
                 let value2: i64 = stack_frame.operand_stack.pop().unwrap().into();