YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve bitwise operations in VM. (#2117)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Marko Fabo mfabo@inf.u-szeged.hu
This commit is contained in:
Marko Fabo
2017-11-30 10:13:04 +01:00
committed by László Langó
parent bf78065bc6
commit 0fe8f6abac
2 changed files with 69 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/vm/opcodes-ecma-bitwise.c
-46
View File
@@ -42,55 +42,9 @@ do_number_bitwise_logic (number_bitwise_logic_op op, /**< number bitwise logic o
ecma_value_t left_value, /**< left value */ ecma_value_t left_value, /**< left value */
ecma_value_t right_value) /**< right value */ ecma_value_t right_value) /**< right value */
{ {
JERRY_STATIC_ASSERT (ECMA_DIRECT_TYPE_INTEGER_VALUE == 0,
ecma_direct_type_integer_value_must_be_zero_for_bitwise_logic);
JERRY_STATIC_ASSERT (ECMA_DIRECT_TYPE_MASK == ((1 << ECMA_DIRECT_SHIFT) - 1),
direct_type_mask_must_fill_all_bits_before_the_value_starts);
JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (left_value) JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (left_value)
&& !ECMA_IS_VALUE_ERROR (right_value)); && !ECMA_IS_VALUE_ERROR (right_value));
if (ecma_are_values_integer_numbers (left_value, right_value))
{
switch (op)
{
case NUMBER_BITWISE_LOGIC_AND:
{
return left_value & right_value;
}
case NUMBER_BITWISE_LOGIC_OR:
{
return left_value | right_value;
}
case NUMBER_BITWISE_LOGIC_XOR:
{
return (left_value ^ right_value) & (ecma_value_t) (~((1 << ECMA_DIRECT_SHIFT) - 1));
}
case NUMBER_BITWISE_SHIFT_LEFT:
{
ecma_integer_value_t left_integer = ecma_get_integer_from_value (left_value);
ecma_integer_value_t right_integer = ecma_get_integer_from_value (right_value);
return ecma_make_int32_value ((int32_t) (left_integer << (right_integer & 0x1f)));
}
case NUMBER_BITWISE_SHIFT_RIGHT:
{
ecma_integer_value_t left_integer = ecma_get_integer_from_value (left_value);
ecma_integer_value_t right_integer = ecma_get_integer_from_value (right_value);
return ecma_make_integer_value (left_integer >> (right_integer & 0x1f));
}
case NUMBER_BITWISE_SHIFT_URIGHT:
{
uint32_t left_uint32 = (uint32_t) ecma_get_integer_from_value (left_value);
ecma_integer_value_t right_integer = ecma_get_integer_from_value (right_value);
return ecma_make_uint32_value (left_uint32 >> (right_integer & 0x1f));
}
case NUMBER_BITWISE_NOT:
{
return (~right_value) & (ecma_value_t) (~((1 << ECMA_DIRECT_SHIFT) - 1));
}
}
}
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY); ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ECMA_OP_TO_NUMBER_TRY_CATCH (num_left, left_value, ret_value); ECMA_OP_TO_NUMBER_TRY_CATCH (num_left, left_value, ret_value);
jerry-core/vm/vm.c
+69
View File
@@ -1604,6 +1604,15 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
} }
case VM_OC_BIT_NOT: case VM_OC_BIT_NOT:
{ {
JERRY_STATIC_ASSERT (ECMA_DIRECT_TYPE_MASK == ((1 << ECMA_DIRECT_SHIFT) - 1),
direct_type_mask_must_fill_all_bits_before_the_value_starts);
if (ecma_is_value_integer_number (left_value))
{
*stack_top_p++ = (~left_value) & (ecma_value_t) (~ECMA_DIRECT_TYPE_MASK);
goto free_left_value;
}
result = do_number_bitwise_logic (NUMBER_BITWISE_NOT, result = do_number_bitwise_logic (NUMBER_BITWISE_NOT,
left_value, left_value,
left_value); left_value);
@@ -1917,6 +1926,15 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
} }
case VM_OC_BIT_OR: case VM_OC_BIT_OR:
{ {
JERRY_STATIC_ASSERT (ECMA_DIRECT_TYPE_MASK == ((1 << ECMA_DIRECT_SHIFT) - 1),
direct_type_mask_must_fill_all_bits_before_the_value_starts);
if (ecma_are_values_integer_numbers (left_value, right_value))
{
result = left_value | right_value;
break;
}
result = do_number_bitwise_logic (NUMBER_BITWISE_LOGIC_OR, result = do_number_bitwise_logic (NUMBER_BITWISE_LOGIC_OR,
left_value, left_value,
right_value); right_value);
@@ -1929,6 +1947,15 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
} }
case VM_OC_BIT_XOR: case VM_OC_BIT_XOR:
{ {
JERRY_STATIC_ASSERT (ECMA_DIRECT_TYPE_MASK == ((1 << ECMA_DIRECT_SHIFT) - 1),
direct_type_mask_must_fill_all_bits_before_the_value_starts);
if (ecma_are_values_integer_numbers (left_value, right_value))
{
result = (left_value ^ right_value) & (ecma_value_t) (~ECMA_DIRECT_TYPE_MASK);
break;
}
result = do_number_bitwise_logic (NUMBER_BITWISE_LOGIC_XOR, result = do_number_bitwise_logic (NUMBER_BITWISE_LOGIC_XOR,
left_value, left_value,
right_value); right_value);
@@ -1941,6 +1968,15 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
} }
case VM_OC_BIT_AND: case VM_OC_BIT_AND:
{ {
JERRY_STATIC_ASSERT (ECMA_DIRECT_TYPE_MASK == ((1 << ECMA_DIRECT_SHIFT) - 1),
direct_type_mask_must_fill_all_bits_before_the_value_starts);
if (ecma_are_values_integer_numbers (left_value, right_value))
{
result = left_value & right_value;
break;
}
result = do_number_bitwise_logic (NUMBER_BITWISE_LOGIC_AND, result = do_number_bitwise_logic (NUMBER_BITWISE_LOGIC_AND,
left_value, left_value,
right_value); right_value);
@@ -1953,6 +1989,17 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
} }
case VM_OC_LEFT_SHIFT: case VM_OC_LEFT_SHIFT:
{ {
JERRY_STATIC_ASSERT (ECMA_DIRECT_TYPE_MASK == ((1 << ECMA_DIRECT_SHIFT) - 1),
direct_type_mask_must_fill_all_bits_before_the_value_starts);
if (ecma_are_values_integer_numbers (left_value, right_value))
{
ecma_integer_value_t left_integer = ecma_get_integer_from_value (left_value);
ecma_integer_value_t right_integer = ecma_get_integer_from_value (right_value);
result = ecma_make_int32_value ((int32_t) (left_integer << (right_integer & 0x1f)));
break;
}
result = do_number_bitwise_logic (NUMBER_BITWISE_SHIFT_LEFT, result = do_number_bitwise_logic (NUMBER_BITWISE_SHIFT_LEFT,
left_value, left_value,
right_value); right_value);
@@ -1965,6 +2012,17 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
} }
case VM_OC_RIGHT_SHIFT: case VM_OC_RIGHT_SHIFT:
{ {
JERRY_STATIC_ASSERT (ECMA_DIRECT_TYPE_MASK == ((1 << ECMA_DIRECT_SHIFT) - 1),
direct_type_mask_must_fill_all_bits_before_the_value_starts);
if (ecma_are_values_integer_numbers (left_value, right_value))
{
ecma_integer_value_t left_integer = ecma_get_integer_from_value (left_value);
ecma_integer_value_t right_integer = ecma_get_integer_from_value (right_value);
result = ecma_make_integer_value (left_integer >> (right_integer & 0x1f));
break;
}
result = do_number_bitwise_logic (NUMBER_BITWISE_SHIFT_RIGHT, result = do_number_bitwise_logic (NUMBER_BITWISE_SHIFT_RIGHT,
left_value, left_value,
right_value); right_value);
@@ -1977,6 +2035,17 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
} }
case VM_OC_UNS_RIGHT_SHIFT: case VM_OC_UNS_RIGHT_SHIFT:
{ {
JERRY_STATIC_ASSERT (ECMA_DIRECT_TYPE_MASK == ((1 << ECMA_DIRECT_SHIFT) - 1),
direct_type_mask_must_fill_all_bits_before_the_value_starts);
if (ecma_are_values_integer_numbers (left_value, right_value))
{
uint32_t left_uint32 = (uint32_t) ecma_get_integer_from_value (left_value);
ecma_integer_value_t right_integer = ecma_get_integer_from_value (right_value);
result = ecma_make_uint32_value (left_uint32 >> (right_integer & 0x1f));
break;
}
result = do_number_bitwise_logic (NUMBER_BITWISE_SHIFT_URIGHT, result = do_number_bitwise_logic (NUMBER_BITWISE_SHIFT_URIGHT,
left_value, left_value,
right_value); right_value);