From owner-p4-projects@FreeBSD.ORG  Tue May 24 22:44:02 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A43CF16A41F; Tue, 24 May 2005 22:44:01 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6273E16A41C
	for <perforce@freebsd.org>; Tue, 24 May 2005 22:44:01 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 201B543D49
	for <perforce@freebsd.org>; Tue, 24 May 2005 22:44:01 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4OMi1nI099285
	for <perforce@freebsd.org>; Tue, 24 May 2005 22:44:01 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4OMi0kM099281
	for perforce@freebsd.org; Tue, 24 May 2005 22:44:00 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 24 May 2005 22:44:00 GMT
Message-Id: <200505242244.j4OMi0kM099281@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 77421 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 May 2005 22:44:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=77421

Change 77421 by peter@peter_melody on 2005/05/24 22:43:09

	Commit something that actually works

Affected files ...

.. //depot/projects/hammer/sys/kern/sys_process.c#24 edit

Differences ...

==== //depot/projects/hammer/sys/kern/sys_process.c#24 (text+ko) ====

@@ -469,6 +469,9 @@
 	int proctree_locked = 0;
 	lwpid_t tid = 0, *buf;
 	pid_t saved_pid = pid;
+#ifdef COMPAT_IA32
+	int wrap32 = 0;
+#endif
 
 	curp = td->td_proc;
 
@@ -544,6 +547,11 @@
 		tid = td2->td_tid;
 	}
 
+#ifdef COMPAT_IA32
+	if (td->td_proc->p_sysent == &ia32_freebsd_sysvec &&
+	    td2->td_proc->p_sysent == &ia32_freebsd_sysvec)
+		wrap32 = 1;
+#endif
 	/*
 	 * Permissions check
 	 */
@@ -849,42 +857,72 @@
 
 	case PT_SETREGS:
 		_PHOLD(p);
-		error = proc_write_regs(td2, addr);
+#ifdef COMPAT_IA32
+		if (wrap32)
+			error = proc_write_regs32(td2, addr);
+		else
+#endif
+			error = proc_write_regs(td2, addr);
 		_PRELE(p);
 		PROC_UNLOCK(p);
 		return (error);
 
 	case PT_GETREGS:
 		_PHOLD(p);
-		error = proc_read_regs(td2, addr);
+#ifdef COMPAT_IA32
+		if (wrap32)
+			error = proc_read_regs32(td2, addr);
+		else
+#endif
+			error = proc_read_regs(td2, addr);
 		_PRELE(p);
 		PROC_UNLOCK(p);
 		return (error);
 
 	case PT_SETFPREGS:
 		_PHOLD(p);
-		error = proc_write_fpregs(td2, addr);
+#ifdef COMPAT_IA32
+		if (wrap32)
+			error = proc_write_fpregs32(td2, addr);
+		else
+#endif
+			error = proc_write_fpregs(td2, addr);
 		_PRELE(p);
 		PROC_UNLOCK(p);
 		return (error);
 
 	case PT_GETFPREGS:
 		_PHOLD(p);
-		error = proc_read_fpregs(td2, addr);
+#ifdef COMPAT_IA32
+		if (wrap32)
+			error = proc_read_fpregs32(td2, addr);
+		else
+#endif
+			error = proc_read_fpregs(td2, addr);
 		_PRELE(p);
 		PROC_UNLOCK(p);
 		return (error);
 
 	case PT_SETDBREGS:
 		_PHOLD(p);
-		error = proc_write_dbregs(td2, addr);
+#ifdef COMPAT_IA32
+		if (wrap32)
+			error = proc_write_dbregs32(td2, addr);
+		else
+#endif
+			error = proc_write_dbregs(td2, addr);
 		_PRELE(p);
 		PROC_UNLOCK(p);
 		return (error);
 
 	case PT_GETDBREGS:
 		_PHOLD(p);
-		error = proc_read_dbregs(td2, addr);
+#ifdef COMPAT_IA32
+		if (wrap32)
+			error = proc_read_dbregs32(td2, addr);
+		else
+#endif
+			error = proc_read_dbregs(td2, addr);
 		_PRELE(p);
 		PROC_UNLOCK(p);
 		return (error);