x86: Don't enter the monitor for invalid opcode
authorBarret Rhoden <brho@cs.berkeley.edu>
Mon, 31 Jul 2017 19:47:25 +0000 (15:47 -0400)
committerBarret Rhoden <brho@cs.berkeley.edu>
Mon, 31 Jul 2017 19:50:44 +0000 (15:50 -0400)
That looks like old debugging code.  To get out of it, you'd have to
manually exit the monitor.

Signed-off-by: Barret Rhoden <brho@cs.berkeley.edu>
kern/arch/x86/trap.c

index 1bbe3c1..b1153f9 100644 (file)
@@ -580,13 +580,8 @@ static void trap_dispatch(struct hw_trapframe *hw_tf)
                            *(uint8_t*)(ip + 1) == 0x01,
                            *(uint8_t*)(ip + 2) == 0xf9) {
                                x86_fake_rdtscp(hw_tf);
-                               pcpui->__lock_checking_enabled++;       /* for print debugging */
                                handled = TRUE;
-                               break;
                        }
-                       enable_irq();
-                       monitor(hw_tf);
-                       disable_irq();
                        pcpui->__lock_checking_enabled++;               /* for print debugging */
                        break;
                }