From: Stas Boukarev <stassats@gmail.com>
Date: Tue, 5 Nov 2013 13:48:03 +0000 (+0400)
Subject: Fix lose() invocation inside sparc-arch.c
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=1cba0af01f5107ab384d0d8b94b1f6330b3d0ef4;p=sbcl.git

Fix lose() invocation inside sparc-arch.c
---

diff --git a/src/runtime/sparc-arch.c b/src/runtime/sparc-arch.c
index 2eee865..67aa7cf 100644
--- a/src/runtime/sparc-arch.c
+++ b/src/runtime/sparc-arch.c
@@ -268,6 +268,9 @@ arch_handle_allocation_trap(os_context_t *context)
     boolean were_in_lisp;
     char* memory;
 
+    if (foreign_function_call_active)
+      lose("Allocation trap inside foreign code.");
+
     pc = (unsigned int*) *os_context_pc_addr(context);
     or_inst = pc[-1];
 
@@ -276,8 +279,8 @@ arch_handle_allocation_trap(os_context_t *context)
      * instruction!
      */
     if (!(((or_inst >> 30) == 2) && (((or_inst >> 19) & 0x1f) == 2)))
-        lose(stderr, "Whoa!!! Got an allocation trap not preceeded by an OR inst: 0x%08x!\n",
-                or_inst);
+        lose("Allocation trap not preceded by an OR instruction: 0x%08x",
+             or_inst);
 
     /*
      * An OR instruction.  RS1 is the register we want to allocate to.
@@ -293,8 +296,6 @@ arch_handle_allocation_trap(os_context_t *context)
         size = *os_context_register_addr(context, size);
     }
 
-    if (foreign_function_call_active)
-        lose(stderr, "Whoa! allocation trap and we weren't in lisp!\n");
     fake_foreign_function_call(context);
 
     /*