3 files changed, 13 insertions, 5 deletions
diff --git a/erts/emulator/hipe/hipe_arm.c b/erts/emulator/hipe/hipe_arm.c
index d52f429a9b..e20a8a7969 100644
--- a/erts/emulator/hipe/hipe_arm.c
+++ b/erts/emulator/hipe/hipe_arm.c
@@ -71,7 +71,7 @@ static struct segment {
 } curseg;
 
 #define in_area(ptr,start,nbytes)	\
-	((unsigned long)((char*)(ptr) - (char*)(start)) < (nbytes))
+	((UWord)((char*)(ptr) - (char*)(start)) < (nbytes))
 
 static void *new_code_mapping(void)
 {
diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c
index 4d75883fc5..6a3ce5608f 100644
--- a/erts/emulator/hipe/hipe_mode_switch.c
+++ b/erts/emulator/hipe/hipe_mode_switch.c
@@ -337,14 +337,22 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[])
 	   * stack: to this end hipe_${ARCH}_glue.S stores the BIF's
 	   * arity in p->hipe.narity.
 	   *
-	   * If the BIF emptied the stack (typically hibernate), p->hipe.nsp is
-	   * NULL and there is no need to get rid of stacked parameters.
+	   * If the BIF emptied the stack (typically hibernate), p->hipe.nstack
+	   * is NULL and there is no need to get rid of stacked parameters.
 	   */
 	  unsigned int i, is_recursive = 0;
 
-          if (p->hipe.nsp != NULL) {
+          if (p->hipe.nstack != NULL) {
+	      ASSERT(p->hipe.nsp != NULL);
 	      is_recursive = hipe_trap_from_native_is_recursive(p);
           }
+	  else {
+	      /* Some architectures (risc) need this re-reset of nsp as the
+	       * BIF wrapper do not detect stack change and causes an obsolete
+	       * stack pointer to be saved in p->hipe.nsp before return to us.
+	       */
+	      p->hipe.nsp = NULL;
+	  }
 
 	  /* Schedule next process if current process was hibernated or is waiting
 	     for messages */
diff --git a/erts/emulator/hipe/hipe_ppc.c b/erts/emulator/hipe/hipe_ppc.c
index bc25061a16..2d8fd61e1e 100644
--- a/erts/emulator/hipe/hipe_ppc.c
+++ b/erts/emulator/hipe/hipe_ppc.c
@@ -80,7 +80,7 @@ static struct segment {
 } curseg;
 
 #define in_area(ptr,start,nbytes)	\
-	((unsigned long)((char*)(ptr) - (char*)(start)) < (nbytes))
+	((UWord)((char*)(ptr) - (char*)(start)) < (nbytes))
 
 /* Darwin breakage */
 #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)