 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.37 2011/12/14 19:40:02 reinoud Exp $ */
+/* $NetBSD: machdep.c,v 1.38 2011/12/20 15:43:51 reinoud Exp $ */
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud@netbsd.org>
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -22,27 +22,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_memsize.h"
 #include "opt_sdl.h"
 #include "opt_urkelvisor.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37 2011/12/14 19:40:02 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2011/12/20 15:43:51 reinoud Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/exec.h>
 #include <sys/buf.h>
 #include <sys/boot_flag.h>
 #include <sys/ucontext.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_page.h>
 @@ -269,82 +269,88 @@ md_syscall_set_returnargs(lwp_t *l, ucon
 	/* set return parameters */
 	reg[11]	= rval[0];		/* EAX */
 	if (error == 0)
 		reg[ 9] = rval[1];	/* EDX */
 	//dump_regs(reg);
+}
 int
 md_syscall_check_opcode(ucontext_t *ucp)
+{
 	uint32_t opcode;
 #if 0
 	register_t *reg;
 	reg = (register_t *) &ucp->uc_mcontext;
 	dump_regs(reg);
 #endif
 	md_syscall_get_opcode(ucp, &opcode);
-	/* undefined instruction */
+	switch (opcode) {
-	if (opcode == 0xff0f)
+	case 0xff0f:	/* UD1      */
 	case 0xff0b:	/* UD2      */
 	case 0x80cd:	/* int $80  */
 	case 0x340f:	/* sysenter */
 		return 1;
-	if (opcode == 0xff0b)
+	default:
-		return 1;
+		return 0;
+	}
 	/* TODO int $80 and sysenter */
 	return 0;
+}
 void
 md_syscall_get_opcode(ucontext_t *ucp, uint32_t *opcode)
+{
 	register_t *reg = (register_t *) &ucp->uc_mcontext;
 //	uint8_t  *p8  = (uint8_t *) (reg[14]);
 	uint16_t *p16 = (uint16_t*) (reg[14]);
-	*opcode = 0;
+	switch (*p16) {
 	case 0xff0f:	/* UD1      */
-	if (*p16 == 0xff0f)
+	case 0xff0b:	/* UD2      */
-		*opcode = *p16;
+	case 0x80cd:	/* int $80  */
-	if (*p16 == 0xff0b)
+	case 0x340f:	/* sysenter */
 		*opcode = *p16;
 		break;
-	/* TODO int $80 and sysenter */
+	default:
 		*opcode = 0;
+	}
+}
 void
 md_syscall_inc_pc(ucontext_t *ucp, uint32_t opcode)
+{
 	uint *reg = (int *) &ucp->uc_mcontext;
 	/* advance program counter */
-	if (opcode == 0xff0f)
+	switch (opcode) {
-		reg[14] += 2;	/* EIP */
+	case 0xff0f:	/* UD1      */
-	if (opcode == 0xff0b)
+	case 0xff0b:	/* UD2      */
 	case 0x80cd:	/* int $80  */
 	case 0x340f:	/* sysenter */
 		reg[14] += 2;	/* EIP */
 		break;
-	/* TODO int $80 and sysenter */
+	default:
 		panic("%s, unknown illegal instruction: opcode = %x\n",
 			__func__, (uint32_t) opcode);
+	}
+}
 void
 md_syscall_dec_pc(ucontext_t *ucp, uint32_t opcode)
+{
 	uint *reg = (int *) &ucp->uc_mcontext;
-	/* advance program counter */
+	switch (opcode) {
-	if (opcode == 0xff0f)
+	case 0xff0f:	/* UD1      */
-		reg[14] -= 2;	/* EIP */
+	case 0xff0b:	/* UD2      */
-	if (opcode == 0xff0b)
+	case 0x80cd:	/* int $80  */
 	case 0x340f:	/* sysenter */
 		reg[14] -= 2;	/* EIP */
 		break;
-	/* TODO int $80 and sysenter */
+	default:
 		panic("%s, unknown illegal instruction: opcode = %x\n",
 			__func__, (uint32_t) opcode);
+	}
+}
 #else
 #	error machdep functions not yet ported to this architecture
 #endif