Mon Dec 12 19:57:12 2011 UTC ()

Fix error flag (carry) setting if its a pseudo error of EJUSTRETURN etc. Just
in case.


(reinoud)

diff -r1.33 -r1.34 src/sys/arch/usermode/usermode/machdep.c

--- src/sys/arch/usermode/usermode/machdep.c 2011/11/27 21:38:17	1.33
+++ src/sys/arch/usermode/usermode/machdep.c 2011/12/12 19:57:12	1.34

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.33 2011/11/27 21:38:17 reinoud Exp $ */
+/* $NetBSD: machdep.c,v 1.34 2011/12/12 19:57:12 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.33 2011/11/27 21:38:17 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.34 2011/12/12 19:57:12 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>
 @@ -240,34 +240,34 @@ md_syscall_getargs(lwp_t *l, ucontext_t
 	//dump_regs(reg);
 	ret = copyin(sp + 1, args, argsize);
 	return ret;
+}
 void
 md_syscall_set_returnargs(lwp_t *l, ucontext_t *ucp,
 	int error, register_t *rval)
+{
 	register_t *reg = (register_t *) &ucp->uc_mcontext;
 	reg[16] &= ~PSL_C;		/* EFL */
-	if (error) {
+	if (error > 0) {
 		rval[0] = error;
 		reg[16] |= PSL_C;	/* EFL */
+	}
 	/* set return parameters */
 	reg[11]	= rval[0];		/* EAX */
-	if (!error)
+	if (error == 0)
 		reg[ 9] = rval[1];	/* EDX */
 	//dump_regs(reg);
+}
 int
 md_syscall_check_opcode(void *ptr)
+{
 	uint16_t *p16;
 	/* undefined instruction */
 	p16 = (uint16_t *) ptr;
 	if (*p16 == 0xff0f)