From 086af2a9f8fffefd8fb8330cc45bdf1e698809df Mon Sep 17 00:00:00 2001
From: Mikael Pettersson <mikpelinux@gmail.com>
Date: Fri, 27 Mar 2015 13:13:00 +0100
Subject: 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
---
 erts/emulator/hipe/hipe_arm_bifs.m4 | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

(limited to 'erts/emulator/hipe/hipe_arm_bifs.m4')

diff --git a/erts/emulator/hipe/hipe_arm_bifs.m4 b/erts/emulator/hipe/hipe_arm_bifs.m4
index 884240be9c..6abc7545e0 100644
--- a/erts/emulator/hipe/hipe_arm_bifs.m4
+++ b/erts/emulator/hipe/hipe_arm_bifs.m4
@@ -42,9 +42,10 @@ define(TEST_GOT_MBUF,`ldr r1, [P, #P_MBUF]	/* `TEST_GOT_MBUF' */
  * standard_bif_interface_1(nbif_name, cbif_name)
  * standard_bif_interface_2(nbif_name, cbif_name)
  * standard_bif_interface_3(nbif_name, cbif_name)
+ * standard_bif_interface_4(nbif_name, cbif_name)
  * standard_bif_interface_0(nbif_name, cbif_name)
  *
- * Generate native interface for a BIF with 1-3 parameters and
+ * Generate native interface for a BIF with 0-4 parameters and
  * standard failure mode.
  */
 define(standard_bif_interface_1,
@@ -134,6 +135,39 @@ $1:
 	.type	$1, %function
 #endif')
 
+define(standard_bif_interface_4,
+`
+#ifndef HAVE_$1
+#`define' HAVE_$1
+	.global	$1
+$1:
+	/* Set up C argument registers. */
+	mov	r0, P
+	NBIF_ARG(r1,4,0)
+	NBIF_ARG(r2,4,1)
+	NBIF_ARG(r3,4,2)
+	NBIF_ARG(r4,4,3)
+
+	/* Save caller-save registers and call the C function. */
+	SAVE_CONTEXT_BIF
+	str	r1, [r0, #P_ARG0]	/* Store BIF__ARGS in def_arg_reg[] */
+	str	r2, [r0, #P_ARG1]
+	str	r3, [r0, #P_ARG2]
+	str	r4, [r0, #P_ARG3]
+	add	r1, r0, #P_ARG0
+	CALL_BIF($2)
+	TEST_GOT_MBUF(4)
+
+	/* Restore registers. Check for exception. */
+	cmp	r0, #THE_NON_VALUE
+	RESTORE_CONTEXT_BIF
+	beq	nbif_4_simple_exception
+	NBIF_RET(4)
+	.ltorg
+	.size	$1, .-$1
+	.type	$1, %function
+#endif')
+
 define(standard_bif_interface_0,
 `
 #ifndef HAVE_$1
-- 
cgit v1.2.3