erts/hipe: unbreak arity 4 BIFs

This fixes arity 4 BIF support in HiPE, following its introduction
on master (OTP 18) via the nox/ets-update_counter-4 merge.

- define standard_bif_interface_4, nbif_4_gc_after_bif, and
  nbif_4_simple_exception on ARM: unbreaks the build on ARM
- remove bogus stack re-alignment from standard_bif_interface_4
  on AMD64: for 4-arg BIFs the stack is already aligned, and the
  code would misalign the C stack which violates the ABI and may
  cause alignment faults in vectorized code
- the nbif_4_simple_exception OPD name on PPC64 was incorrectly
  using the nbif_3_simple_exception OPD name: this would have
  caused a multiple definition error in the assembler or linker

In addition there are a few cleanups:

- fix standard_bif_interface_N comment on x86
- fix standard_bif_interface_4 comment on SPARC
- separate nbif_N_simple_exception blocks by empty lines on PPC,
  like on ARM, to clearly show which things belong together
- fix standard_bif_interface_N comment on ARM
- fix standard_bif_interface_4 on AMD64 to match the indentation
  and spacing conventions of the rest of that file

1 files changed, 5 insertions, 1 deletions

diff --git a/erts/emulator/hipe/hipe_ppc_glue.S b/erts/emulator/hipe/hipe_ppc_glue.S
index b07f4bc9c8..109289116b 100644
--- a/erts/emulator/hipe/hipe_ppc_glue.S
+++ b/erts/emulator/hipe/hipe_ppc_glue.S
@@ -510,22 +510,26 @@ CSYM(nbif_4_gc_after_bif):
 CSYM(nbif_0_simple_exception):
 	li	r4, 0
 	b	.nbif_simple_exception
+
 	OPD(nbif_1_simple_exception)
 	GLOBAL(CSYM(nbif_1_simple_exception))
 CSYM(nbif_1_simple_exception):
 	li	r4, 1
 	b	.nbif_simple_exception
+
 	OPD(nbif_2_simple_exception)
 	GLOBAL(CSYM(nbif_2_simple_exception))
 CSYM(nbif_2_simple_exception):
 	li	r4, 2
 	b	.nbif_simple_exception
+
 	OPD(nbif_3_simple_exception)
 	GLOBAL(CSYM(nbif_3_simple_exception))
 CSYM(nbif_3_simple_exception):
 	li	r4, 3
 	b	.nbif_simple_exception
-	OPD(nbif_3_simple_exception)
+
+	OPD(nbif_4_simple_exception)
 	GLOBAL(CSYM(nbif_4_simple_exception))
 CSYM(nbif_4_simple_exception):
 	li	r4, 4