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, 29 insertions, 30 deletions

diff --git a/erts/emulator/hipe/hipe_amd64_bifs.m4 b/erts/emulator/hipe/hipe_amd64_bifs.m4
index 7d94aa05b3..74cb9112ce 100644
--- a/erts/emulator/hipe/hipe_amd64_bifs.m4
+++ b/erts/emulator/hipe/hipe_amd64_bifs.m4
@@ -159,37 +159,36 @@ define(standard_bif_interface_4,
 `
 #ifndef HAVE_$1
 #`define' HAVE_$1
-    TEXT
-    .align  4
-    GLOBAL(ASYM($1))
+	TEXT
+	.align  4
+	GLOBAL(ASYM($1))
 ASYM($1):
-    /* set up the parameters */
-    movq    P, %rdi
-    NBIF_ARG(%rsi,4,0)
-    NBIF_ARG(%rdx,4,1)
-    NBIF_ARG(%rcx,4,2)
-    NBIF_ARG(%r8,4,3)
-
-    /* make the call on the C stack */
-    SWITCH_ERLANG_TO_C
-    pushq   %r8
-    pushq   %rcx
-    pushq   %rdx
-    pushq   %rsi
-    movq    %rsp, %rsi  /* Eterm* BIF__ARGS */
-    sub $(8), %rsp  /* stack frame 16-byte alignment */
-    CALL_BIF($2)
-    add $(4*8 + 8), %rsp
-    TEST_GOT_MBUF
-    SWITCH_C_TO_ERLANG
-
-    /* throw exception if failure, otherwise return */
-    TEST_GOT_EXN
-    jz  nbif_4_simple_exception
-    NBIF_RET(4)
-    HANDLE_GOT_MBUF(4)
-    SET_SIZE(ASYM($1))
-    TYPE_FUNCTION(ASYM($1))
+	/* set up the parameters */
+	movq	P, %rdi
+	NBIF_ARG(%rsi,4,0)
+	NBIF_ARG(%rdx,4,1)
+	NBIF_ARG(%rcx,4,2)
+	NBIF_ARG(%r8,4,3)
+
+	/* make the call on the C stack */
+	SWITCH_ERLANG_TO_C
+	pushq	%r8
+	pushq	%rcx
+	pushq	%rdx
+	pushq	%rsi
+	movq	%rsp, %rsi	/* Eterm* BIF__ARGS */
+	CALL_BIF($2)
+	add	$(4*8), %rsp
+	TEST_GOT_MBUF
+	SWITCH_C_TO_ERLANG
+
+	/* throw exception if failure, otherwise return */
+	TEST_GOT_EXN
+	jz	nbif_4_simple_exception
+	NBIF_RET(4)
+	HANDLE_GOT_MBUF(4)
+	SET_SIZE(ASYM($1))
+	TYPE_FUNCTION(ASYM($1))
 #endif')
 
 define(standard_bif_interface_0,