0.8.20.26:

[sbcl.git] / src / runtime / mips-arch.c

diff --git a/src/runtime/mips-arch.c b/src/runtime/mips-arch.c
index a65a381..9e7651d 100644 (file)
--- a/src/runtime/mips-arch.c
+++ b/src/runtime/mips-arch.c
@@ -1,7 +1,5 @@
 /*
 
 /*
 

- $Header$
-

  This code was written as part of the CMU Common Lisp project at
  Carnegie Mellon University, and has been placed in the public domain.
 
  This code was written as part of the CMU Common Lisp project at
  Carnegie Mellon University, and has been placed in the public domain.
 

@@ -9,9 +7,9 @@
 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

+#include "sbcl.h"

 #include "runtime.h"
 #include "arch.h"
 #include "runtime.h"
 #include "arch.h"

-#include "sbcl.h"

 #include "globals.h"
 #include "validate.h"
 #include "os.h"
 #include "globals.h"
 #include "validate.h"
 #include "os.h"

@@ -106,10 +104,18 @@ emulate_branch(os_context_t *context, unsigned long inst)
 void arch_skip_instruction(os_context_t *context)
 {
     /* Skip the offending instruction */
 void arch_skip_instruction(os_context_t *context)
 {
     /* Skip the offending instruction */

-    if (os_context_bd_cause(context))
+    if (os_context_bd_cause(context)) {
+       /* Currently, we never get here, because Linux' support for
+           bd_cause seems not terribly solid (c.f os_context_bd_cause
+           in mips-linux-os.c).  If a port to Irix comes along, this
+           code will be executed, because presumably Irix' support is
+           better (it can hardly be worse).  We lose() to remind the
+           porter to review this code.  -- CSR, 2002-09-06 */
+       lose("bd_cause branch taken; review code for new OS?\n");

         *os_context_pc_addr(context) = 
            emulate_branch(context, 
                           *(unsigned long *) *os_context_pc_addr(context));
         *os_context_pc_addr(context) = 
            emulate_branch(context, 
                           *(unsigned long *) *os_context_pc_addr(context));

+    }

     else
         *os_context_pc_addr(context) += 4;
 
     else
         *os_context_pc_addr(context) += 4;