On Fri, 23 May 2003, Maciej W. Rozycki wrote:

On Fri, 23 May 2003, Geert Uytterhoeven wrote:

quoted

@@ -145,8 +146,6 @@
 	 * but the BD bit in the cause register is not set.
 	 */
 	case bcond_op:
-	case j_op:
-	case jal_op:
 	case beq_op:
 	case bne_op:
 	case blez_op:

@@ -155,7 +154,11 @@
 	case bnel_op:
 	case blezl_op:
 	case bgtzl_op:
-	case jalx_op:
+		if (branch) {
+		    /* branch in a branch delay slot */
+		    goto sigill;
+		}
+		branch = 1;
 		pc += 4;
 		goto retry;

 Hmm, what tree is it against?  I can't see code matching these hunks in
our tree at linux-mips.org.

Check out the 2.4.x branch. I did verify that all patches apply.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds