Simplify specifying implementation of instructions

Eliminate the need to write pre-processor macros for each instruction.

Instead allow the implementation of instruction to be written in
C directly in the .tab files. Rewrite all existing macros in this
way and remove the %macro directive.

1 files changed, 15 insertions, 125 deletions

diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index ed856b760b..8c9034518b 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -96,16 +96,13 @@ line Loc | func_info M F A => func_info M F A | line Loc
 
 line I
 
-
-%macro: allocate Allocate -pack
-%macro: allocate_zero AllocateZero -pack
-%macro: allocate_heap AllocateHeap -pack
-%macro: allocate_heap_zero AllocateHeapZero -pack
-%macro: test_heap TestHeap -pack
-
 allocate t t
 allocate_heap t I t
-deallocate I
+
+%cold
+deallocate Q
+%hot
+
 init y
 allocate_zero t t
 allocate_heap_zero t I t
@@ -122,8 +119,6 @@ init2 y y
 init3 y y y
 init Y1 | init Y2 | init Y3 => init3 Y1 Y2 Y3
 init Y1 | init Y2 => init2 Y1 Y2
-%macro: init2 Init2 -pack
-%macro: init3 Init3 -pack
 
 # Selecting values
 
@@ -174,7 +169,6 @@ i_jump_on_val_zero xy f I
 
 i_jump_on_val xy f I I
 
-%macro: get_list GetList -pack
 get_list xy xy xy
 
 # The following get_list instructions using x(0) are frequently used.
@@ -202,23 +196,17 @@ set_tuple_element s d P
 
 # Get tuple element
 
-%macro: i_get_tuple_element GetTupleElement -pack
 i_get_tuple_element xy P x
 
 %cold
 i_get_tuple_element xy P y
 %hot
 
-%macro: i_get_tuple_element2 GetTupleElement2 -pack
 i_get_tuple_element2 x P x
-
-%macro: i_get_tuple_element2y GetTupleElement2Y -pack
 i_get_tuple_element2y x P y y
 
-%macro: i_get_tuple_element3 GetTupleElement3 -pack
 i_get_tuple_element3 x P x
 
-%macro: is_number IsNumber -fail_action
 %cold
 is_number f x
 is_number f y
@@ -252,7 +240,6 @@ system_limit j
 
 move C=cxy x==0 | jump Lbl => move_jump Lbl C
 
-%macro: move_jump MoveJump -nonext
 move_jump f ncxy
 
 # Movement to and from the stack is common
@@ -276,10 +263,6 @@ move_window X1=x X2=x X3=x X4=x Y1=y Y4=y | move X5=x Y5=y | succ(Y4,Y5) => \
 move_window X1=x X2=x X3=x Y1=y Y3=y => move_window3 X1 X2 X3 Y1
 move_window X1=x X2=x X3=x X4=x Y1=y Y4=y => move_window4 X1 X2 X3 X4 Y1
 
-%macro: move_window3 MoveWindow3 -pack
-%macro: move_window4 MoveWindow4 -pack
-%macro: move_window5 MoveWindow5 -pack
-
 move_window3 x x x y
 move_window4 x x x x y
 move_window5 x x x x x y
@@ -304,10 +287,8 @@ swap_temp R1 R2 Tmp | line Loc | call_ext_only Live Addr | \
 swap_temp R1 R2 Tmp | line Loc | call_ext_last Live Addr D | \
   is_killed(Tmp, Live) => swap R1 R2 | line Loc | call_ext_last Live Addr D
 
-%macro: swap_temp SwapTemp -pack
 swap_temp x xy x
 
-%macro: swap Swap -pack
 swap x xy
 
 move Src=x D1=x | move Src=x D2=x => move_dup Src D1 D2
@@ -351,17 +332,13 @@ move C=aiq X=x==2 => move_x2 C
 move_x1 c
 move_x2 c
 
-%macro: move_shift MoveShift -pack
 move_shift x x x
 move_shift y x x
 move_shift x y x
 move_shift x x y
 
-%macro: move_dup MoveDup -pack
 move_dup xy x xy
 
-%macro: move2_par Move2Par -pack
-
 move2_par x y x y
 move2_par y x y x
 move2_par x x x x
@@ -373,7 +350,6 @@ move2_par y x x y
 move2_par x x y x
 move2_par y x x x
 
-%macro: move3 Move3 -pack
 move3 x y x y x y
 move3 y x y x y x
 move3 x x x x x x
@@ -383,7 +359,6 @@ move3 x x x x x x
 move S=n D=y => init D
 move S=c D=y => move S x | move x D
 
-%macro:move Move -pack
 move x x
 move x y
 move y x
@@ -440,22 +415,18 @@ is_eq_exact Lbl R=xy C=q => i_is_eq_exact_literal Lbl R C
 is_ne_exact Lbl R=xy C=ian => i_is_ne_exact_immed Lbl R C
 is_ne_exact Lbl R=xy C=q => i_is_ne_exact_literal Lbl R C
 
-%macro: i_is_eq_exact_immed EqualImmed -fail_action
-
 i_is_eq_exact_immed f rxy c
+
 i_is_eq_exact_literal f xy c
 
-%macro: i_is_ne_exact_immed NotEqualImmed -fail_action
 i_is_ne_exact_immed f xy c
 
 i_is_ne_exact_literal f xy c
 
 is_eq_exact Lbl Y=y X=x => is_eq_exact Lbl X Y
-%macro: is_eq_exact EqualExact -fail_action -pack
 is_eq_exact f x xy
 is_eq_exact f s s
 
-%macro: is_lt IsLessThan -fail_action
 is_lt f x x
 is_lt f x c
 is_lt f c x
@@ -463,7 +434,6 @@ is_lt f c x
 is_lt f s s
 %hot
 
-%macro: is_ge IsGreaterEqual -fail_action
 is_ge f x x
 is_ge f x c
 is_ge f c x
@@ -471,13 +441,10 @@ is_ge f c x
 is_ge f s s
 %hot
 
-%macro: is_ne_exact NotEqualExact -fail_action
 is_ne_exact f s s
 
-%macro: is_eq Equal -fail_action
 is_eq f s s
 
-%macro: is_ne NotEqual -fail_action
 is_ne f s s
 
 #
@@ -495,7 +462,6 @@ i_put_tuple Dst Arity Puts=* | put S => \
 
 i_put_tuple/2
 
-%macro:i_put_tuple PutTuple -pack -goto:do_put_tuple
 i_put_tuple xy I
 
 #
@@ -505,8 +471,6 @@ i_put_tuple xy I
 #
 put_list Const=c n Dst => move Const x | put_list x n Dst
 
-%macro:put_list PutList -pack
-
 put_list x n x
 put_list y n x
 put_list x x x
@@ -564,22 +528,18 @@ return_trace
 
 move S x==0 | return => move_return S
 
-%macro: move_return MoveReturn -nonext
 move_return xcn
 
 move S x==0 | deallocate D | return => move_deallocate_return S D
 
-%macro: move_deallocate_return MoveDeallocateReturn -pack -nonext
 move_deallocate_return xycn Q
 
 deallocate D | return => deallocate_return D
 
-%macro: deallocate_return DeallocateReturn -nonext
 deallocate_return Q
 
 test_heap Need u==1 | put_list Y=y x==0 x==0 => test_heap_1_put_list Need Y
 
-%macro: test_heap_1_put_list TestHeapPutList -pack
 test_heap_1_put_list I y
 
 #
@@ -590,8 +550,6 @@ is_tagged_tuple Fail Literal=q Arity Atom => \
     move Literal x | is_tagged_tuple Fail x Arity Atom
 is_tagged_tuple Fail=f c Arity Atom  => jump Fail
 
-%macro:is_tagged_tuple IsTaggedTuple -fail_action
-
 is_tagged_tuple f rxy A a
 
 # Test tuple & arity (head)
@@ -600,17 +558,13 @@ is_tuple Fail Literal=q => move Literal x | is_tuple Fail x
 is_tuple Fail=f c => jump Fail
 is_tuple Fail=f S=xy | test_arity Fail=f S=xy Arity => is_tuple_of_arity Fail S Arity
 
-%macro:is_tuple_of_arity IsTupleOfArity -fail_action
-
 is_tuple_of_arity f rxy A
 
-%macro: is_tuple IsTuple -fail_action
 is_tuple f rxy
 
 test_arity Fail Literal=q Arity => move Literal x | test_arity Fail x Arity
 test_arity Fail=f c Arity => jump Fail
 
-%macro: test_arity IsArity -fail_action
 test_arity f xy A
 
 get_tuple_element Reg=x P1 D1=x | get_tuple_element Reg=x P2 D2=x | \
@@ -632,16 +586,13 @@ is_integer Fail Literal=q => move Literal x | is_integer Fail x
 
 is_integer Fail=f S=x | allocate Need Regs => is_integer_allocate Fail S Need Regs
 
-%macro: is_integer_allocate IsIntegerAllocate -fail_action
 is_integer_allocate f x I I
 
-%macro: is_integer IsInteger -fail_action
 is_integer f xy
 
 is_list Fail=f n =>
 is_list Fail Literal=q => move Literal x | is_list Fail x
 is_list Fail=f c => jump Fail
-%macro: is_list IsList -fail_action
 is_list f x
 %cold
 is_list f y
@@ -649,24 +600,16 @@ is_list f y
 
 is_nonempty_list Fail=f S=x | allocate Need Rs => is_nonempty_list_allocate Fail S Need Rs
 
-%macro:is_nonempty_list_allocate IsNonemptyListAllocate -fail_action -pack
-is_nonempty_list_allocate f rx I t
-
-is_nonempty_list F=f x==0 | test_heap I1 I2 => is_non_empty_list_test_heap F I1 I2
-
-%macro: is_non_empty_list_test_heap IsNonemptyListTestHeap -fail_action -pack
-is_non_empty_list_test_heap f I t
+is_nonempty_list F=f x==0 | test_heap I1 I2 => is_nonempty_list_test_heap F I1 I2
 
 is_nonempty_list Fail=f S=x | get_list S D1=x D2=x => \
   is_nonempty_list_get_list Fail S D1 D2
 
-%macro: is_nonempty_list_get_list IsNonemptyListGetList -fail_action -pack
+is_nonempty_list_allocate f rx I t
+is_nonempty_list_test_heap f I t
 is_nonempty_list_get_list f rx x x
-
-%macro: is_nonempty_list IsNonemptyList -fail_action
 is_nonempty_list f xy
 
-%macro: is_atom IsAtom -fail_action
 is_atom f x
 %cold
 is_atom f y
@@ -674,7 +617,6 @@ is_atom f y
 is_atom Fail=f a =>
 is_atom Fail=f niq => jump Fail
 
-%macro: is_float IsFloat -fail_action
 is_float f x
 %cold
 is_float f y
@@ -685,12 +627,10 @@ is_float Fail Literal=q => move Literal x | is_float Fail x
 is_nil Fail=f n =>
 is_nil Fail=f qia => jump Fail
 
-%macro: is_nil IsNil -fail_action
 is_nil f xy
 
 is_binary Fail Literal=q => move Literal x | is_binary Fail x
 is_binary Fail=f c => jump Fail
-%macro: is_binary IsBinary -fail_action
 is_binary f x
 %cold
 is_binary f y
@@ -701,28 +641,24 @@ is_bitstr Fail Term => is_bitstring Fail Term
 
 is_bitstring Fail Literal=q => move Literal x | is_bitstring Fail x
 is_bitstring Fail=f c => jump Fail
-%macro: is_bitstring IsBitstring -fail_action
 is_bitstring f x
 %cold
 is_bitstring f y
 %hot
 
 is_reference Fail=f cq => jump Fail
-%macro: is_reference IsRef -fail_action
 is_reference f x
 %cold
 is_reference f y
 %hot
 
 is_pid Fail=f cq => jump Fail
-%macro: is_pid IsPid -fail_action
 is_pid f x
 %cold
 is_pid f y
 %hot
 
 is_port Fail=f cq => jump Fail
-%macro: is_port IsPort -fail_action
 is_port f x
 %cold
 is_port f y
@@ -733,7 +669,6 @@ is_boolean Fail=f a==am_false =>
 is_boolean Fail=f ac => jump Fail
 
 %cold
-%macro: is_boolean IsBoolean -fail_action
 is_boolean f xy
 %hot
 
@@ -741,13 +676,11 @@ is_function2 Fail=f acq Arity => jump Fail
 is_function2 Fail=f Fun a => jump Fail
 
 is_function2 f s s
-%macro: is_function2 IsFunction2 -fail_action
 
 # Allocating & initializing.
 allocate Need Regs | init Y => allocate_init Need Regs Y
 init Y1 | init Y2 => init2 Y1 Y2
 
-%macro: allocate_init AllocateInit -pack
 allocate_init t I y
 
 #################################################################
@@ -1027,10 +960,8 @@ bif2 Fail Bif S1 S2 Dst => i_bif2 Fail Bif S1 S2 Dst
 i_get_hash c I d
 i_get s d
 
-%macro: self Self
 self xy
 
-%macro: node Node
 node x
 %cold
 node y
@@ -1050,35 +981,20 @@ i_bif2_body b s s d
 # Internal calls.
 #
 
-move S=c x==0 | call Ar P=f => i_move_call S P
-move S=s x==0 | call Ar P=f => move_call S P
-
-i_move_call c f
+move S=cxy x==0 | call Ar P=f => move_call S P
 
-%macro:move_call MoveCall -arg_f -size -nonext
 move_call/2
+move_call cxy f
 
-move_call xy f
-
-move S=c x==0 | call_last Ar P=f D => i_move_call_last P D S
 move S x==0 | call_last Ar P=f D => move_call_last S P D
 
-i_move_call_last f P c
-
-%macro:move_call_last MoveCallLast -arg_f -nonext -pack
-
 move_call_last/3
-move_call_last xy f Q
-
-move S=c x==0 | call_only Ar P=f => i_move_call_only P S
-move S=x x==0 | call_only Ar P=f => move_call_only S P
+move_call_last cxy f Q
 
-i_move_call_only f c
+move S=cx x==0 | call_only Ar P=f => move_call_only S P
 
-%macro:move_call_only MoveCallOnly -arg_f -nonext
 move_call_only/2
-
-move_call_only x f
+move_call_only cx f
 
 call Ar Func        => i_call Func
 call_last Ar Func D => i_call_last Func D
@@ -1106,12 +1022,10 @@ i_call_fun_last I P
 
 make_fun2 OldIndex=u => gen_make_fun2(OldIndex)
 
-%macro: i_make_fun MakeFun -pack
 %cold
 i_make_fun I t
 %hot
 
-%macro: is_function IsFunction -fail_action
 is_function f xy
 is_function Fail=f c => jump Fail
 
@@ -1152,10 +1066,6 @@ i_bs_get_integer_32 x f I x
 bs_get_binary2 Fail=f Ms=x Live=u Sz=sq Unit=u Flags=u Dst=d => \
 			gen_get_binary2(Fail, Ms, Live, Sz, Unit, Flags, Dst)
 
-%macro: i_bs_get_binary_imm2 BsGetBinaryImm_2 -fail_action
-%macro: i_bs_get_binary2 BsGetBinary_2 -fail_action
-%macro: i_bs_get_binary_all2 BsGetBinaryAll_2 -fail_action
-
 i_bs_get_binary_imm2 f x I I I x
 i_bs_get_binary2 f x I s I x
 i_bs_get_binary_all2 f x I I x
@@ -1167,7 +1077,6 @@ bs_get_float2 Fail=f Ms=x Live=u Sz=s Unit=u Flags=u Dst=d => \
 
 bs_get_float2 Fail=f Ms=x Live=u Sz=q Unit=u Flags=u Dst=d => jump Fail
 
-%macro: i_bs_get_float2 BsGetFloat2 -fail_action
 i_bs_get_float2 f x I s I x
 
 # Miscellanous
@@ -1175,14 +1084,9 @@ i_bs_get_float2 f x I s I x
 bs_skip_bits2 Fail=f Ms=x Sz=sq Unit=u Flags=u => \
 			gen_skip_bits2(Fail, Ms, Sz, Unit, Flags)
 
-%macro: i_bs_skip_bits_imm2 BsSkipBitsImm2 -fail_action
 i_bs_skip_bits_imm2 f x I
-
-%macro: i_bs_skip_bits2 BsSkipBits2 -fail_action
 i_bs_skip_bits2 f x xy I
-
-%macro: i_bs_skip_bits_all2 BsSkipBitsAll2 -fail_action
-i_bs_skip_bits_all2 f x I 
+i_bs_skip_bits_all2 f x I
 
 bs_test_tail2 Fail=f Ms=x Bits=u==0 => bs_test_zero_tail2 Fail Ms
 bs_test_tail2 Fail=f Ms=x Bits=u => bs_test_tail_imm2 Fail Ms Bits
@@ -1294,9 +1198,6 @@ i_bs_private_append j I s s x
 bs_put_integer Fail=j Sz=sq Unit=u Flags=u Src=s => \
 			gen_put_integer(Fail, Sz, Unit, Flags, Src)
 
-%macro: i_new_bs_put_integer NewBsPutInteger
-%macro: i_new_bs_put_integer_imm NewBsPutIntegerImm
-
 i_new_bs_put_integer j s I s
 i_new_bs_put_integer_imm j I I s
 
@@ -1331,9 +1232,6 @@ bs_put_float Fail Sz=q Unit Flags Val => badarg Fail
 bs_put_float Fail=j Sz=s Unit=u Flags=u Src=s => \
 			gen_put_float(Fail, Sz, Unit, Flags, Src)
 
-%macro: i_new_bs_put_float NewBsPutFloat
-%macro: i_new_bs_put_float_imm NewBsPutFloatImm
-
 i_new_bs_put_float j s I s
 i_new_bs_put_float_imm j I I s
 
@@ -1344,13 +1242,8 @@ i_new_bs_put_float_imm j I I s
 bs_put_binary Fail=j Sz=s Unit=u Flags=u Src=s => \
 			gen_put_binary(Fail, Sz, Unit, Flags, Src)
 
-%macro: i_new_bs_put_binary NewBsPutBinary
 i_new_bs_put_binary j s I s
-
-%macro: i_new_bs_put_binary_imm NewBsPutBinaryImm
 i_new_bs_put_binary_imm j I s
-
-%macro: i_new_bs_put_binary_all NewBsPutBinaryAll
 i_new_bs_put_binary_all j s I
 
 #
@@ -1436,7 +1329,6 @@ update_map_exact j s d I I
 is_map Fail Lit=q | literal_is_map(Lit) =>
 is_map Fail cq => jump Fail
 
-%macro: is_map IsMap -fail_action
 is_map f xy
 
 ## Transform has_map_fields #{ K1 := _, K2 := _ } to has_map_elements
@@ -1456,10 +1348,8 @@ i_get_map_elements f s I
 i_get_map_element Fail Src=xy Key=y Dst => \
     move Key x | i_get_map_element Fail Src x Dst
 
-%macro: i_get_map_element_hash GetMapElementHash -fail_action
 i_get_map_element_hash f xy c I xy
 
-%macro: i_get_map_element GetMapElement -fail_action
 i_get_map_element f xy x xy
 
 #