From owner-p4-projects@FreeBSD.ORG  Sat Jun 12 22:20:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A68616A4D1; Sat, 12 Jun 2004 22:20:33 +0000 (GMT)
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 E9B2616A4CE
	for <perforce@freebsd.org>; Sat, 12 Jun 2004 22:20:32 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E3B4D43D2F
	for <perforce@freebsd.org>; Sat, 12 Jun 2004 22:20:32 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5CMK6HW020700
	for <perforce@freebsd.org>; Sat, 12 Jun 2004 22:20:06 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5CMK6r2020697
	for perforce@freebsd.org; Sat, 12 Jun 2004 22:20:06 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 12 Jun 2004 22:20:06 GMT
Message-Id: <200406122220.i5CMK6r2020697@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 54755 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 12 Jun 2004 22:20:33 -0000

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

Change 54755 by marcel@marcel_nfs on 2004/06/12 22:19:59

	Don't directly dereference the trapframe pointer. It's a
	kernel VA.

Affected files ...

.. //depot/projects/gdb/usr.bin/kgdb/md_i386.c#4 edit

Differences ...

==== //depot/projects/gdb/usr.bin/kgdb/md_i386.c#4 (text+ko) ====

@@ -40,11 +40,20 @@
 
 #include "kgdb.h"
 
+static int
+getreg(int *addr)
+{
+	int val;
+
+	kvm_read(kvm, (uintptr_t)addr, &val, sizeof(val));
+	return (val);
+}
+
 void *
 gdb_cpu_getreg(int regnum, size_t *regsz)
 {
-	static register_t synth;
 	struct trapframe *tf = curkthr->td_frame;
+	int cs;
 
 	*regsz = gdb_cpu_regsz(regnum);
 	switch (regnum) {
@@ -61,11 +70,11 @@
 	case 12: return (&tf->tf_ds);
 	case 13: return (&tf->tf_es);
 	case 4:
-		synth = (!ISPL(tf->tf_cs)) ? tf->tf_ebp : tf->tf_esp;
-		return (&synth);
+		cs = getreg(&tf->tf_cs);
+		return (!ISPL(cs)) ? &tf->tf_ebp : &tf->tf_esp;
 	case 11:
-		synth = (!ISPL(tf->tf_cs)) ? tf->tf_ds : tf->tf_ss;
-		return (&synth);
+		cs = getreg(&tf->tf_cs);
+		return (!ISPL(cs)) ? &tf->tf_ds : &tf->tf_ss;
 	}
 	return (NULL);
 }