From owner-p4-projects@FreeBSD.ORG  Tue May 24 21:17:13 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 3B06D16A41F; Tue, 24 May 2005 21:17:13 +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 EC8D616A42D
	for <perforce@freebsd.org>; Tue, 24 May 2005 21:17:12 +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 C654B43D1F
	for <perforce@freebsd.org>; Tue, 24 May 2005 21:17:12 +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 j4OLHCjm094820
	for <perforce@freebsd.org>; Tue, 24 May 2005 21:17:12 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4OLHCZl094817
	for perforce@freebsd.org; Tue, 24 May 2005 21:17:12 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 24 May 2005 21:17:12 GMT
Message-Id: <200505242117.j4OLHCZl094817@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 77413 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 21:17:13 -0000

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

Change 77413 by peter@peter_melody on 2005/05/24 21:16:11

	flesh out set_regs32().  This might be complete.

Affected files ...

.. //depot/projects/hammer/sys/amd64/ia32/ia32_reg.c#3 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/ia32/ia32_reg.c#3 (text+ko) ====

@@ -44,6 +44,9 @@
 #include <machine/pcb.h>
 #include <machine/cpufunc.h>
 
+#define	CS_SECURE(cs)		(ISPL(cs) == SEL_UPL)
+#define EFL_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
+
 int
 fill_regs32(struct thread *td, struct reg32 *regs)
 {
@@ -74,8 +77,34 @@
 int
 set_regs32(struct thread *td, struct reg32 *regs)
 {
+	struct pcb *pcb;
+	struct trapframe *tp;
 
-	return (ENOSYS);
+	tp = td->td_frame;
+	if (!EFL_SECURE(regs->r_eflags, tp->tf_rflags) || !CS_SECURE(regs->r_cs))
+		return (EINVAL);
+	pcb = td->td_pcb;
+	load_fs(regs->r_fs);
+	pcb->pcb_fs = regs->r_fs;
+	load_es(regs->r_es);
+	pcb->pcb_es = regs->r_es;
+	load_ds(regs->r_ds);
+	pcb->pcb_ds = regs->r_ds;
+	tp->tf_rdi = regs->r_edi;
+	tp->tf_rsi = regs->r_esi;
+	tp->tf_rbp = regs->r_ebp;
+	tp->tf_rbx = regs->r_ebx;
+	tp->tf_rdx = regs->r_edx;
+	tp->tf_rcx = regs->r_ecx;
+	tp->tf_rax = regs->r_eax;
+	tp->tf_rip = regs->r_eip;
+	tp->tf_cs = regs->r_cs;
+	tp->tf_rflags = regs->r_eflags;
+	tp->tf_rsp = regs->r_esp;
+	tp->tf_ss = regs->r_ss;
+	load_gs(regs->r_gs);
+	pcb->pcb_gs = regs->r_gs;
+	return (0);
 }
 
 int