From owner-p4-projects@FreeBSD.ORG  Thu Oct 10 14:29:33 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id ABE884B9; Thu, 10 Oct 2013 14:29:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 6DE874B7
 for <perforce@freebsd.org>; Thu, 10 Oct 2013 14:29:33 +0000 (UTC)
 (envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 583BB2077
 for <perforce@freebsd.org>; Thu, 10 Oct 2013 14:29:33 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AETX5a071843
 for <perforce@freebsd.org>; Thu, 10 Oct 2013 14:29:33 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r9AETXbA071840
 for perforce@freebsd.org; Thu, 10 Oct 2013 14:29:33 GMT
 (envelope-from jhb@freebsd.org)
Date: Thu, 10 Oct 2013 14:29:33 GMT
Message-Id: <201310101429.r9AETXbA071840@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1033109 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Thu, 10 Oct 2013 14:29:33 -0000

http://p4web.freebsd.org/@@1033109?ac=10

Change 1033109 by jhb@jhb_jhbbsd on 2013/10/10 14:29:25

	Untested bits for rdrand in ddb.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#13 edit
.. //depot/projects/smpng/sys/modules/x86dis/x86dis.c#9 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#13 (text+ko) ====

@@ -628,6 +628,17 @@
 	{ "",      TRUE, NONE, 0,	 0 }
 };
 
+static const struct inst db_Grp9b[] = {
+	{ "",      TRUE, NONE, 0,	 0 },
+	{ "",      TRUE, NONE, 0,	 0 },
+	{ "",      TRUE, NONE, 0,	 0 },
+	{ "",      TRUE, NONE, 0,	 0 },
+	{ "",      TRUE, NONE, 0,	 0 },
+	{ "",      TRUE, NONE, 0,	 0 },
+	{ "rdrand",TRUE, LONG, op1(Ril), 0 },
+	{ "",      TRUE, NONE, 0,	 0 }
+};
+
 static const struct inst db_inst_table[256] = {
 /*00*/	{ "add",   TRUE,  BYTE,  op2(R, E),  0 },
 /*01*/	{ "add",   TRUE,  LONG,  op2(R, E),  0 },
@@ -1300,7 +1311,13 @@
 	i_size = ip->i_size;
 	i_mode = ip->i_mode;
 
-	if (ip->i_extra == db_Grp1 || ip->i_extra == db_Grp2 ||
+	if (ip->i_extra == db_Grp9 && f_mod(rex, regmodrm) == 3) {
+	    ip = &db_Grp9b[f_reg(rex, regmodrm)];
+	    i_name = ip->i_name;
+	    i_size = ip->i_size;
+	    i_mode = ip->i_mode;
+	}
+	else if (ip->i_extra == db_Grp1 || ip->i_extra == db_Grp2 ||
 	    ip->i_extra == db_Grp6 || ip->i_extra == db_Grp7 ||
 	    ip->i_extra == db_Grp8 || ip->i_extra == db_Grp9 ||
 	    ip->i_extra == db_Grp15) {

==== //depot/projects/smpng/sys/modules/x86dis/x86dis.c#9 (text+ko) ====

@@ -61,6 +61,24 @@
 	return (low | ((uint64_t)high << 32));
 }
 
+static __inline uint32_t
+rdrand(void)
+{
+	uint32_t val;
+
+	__asm __volatile("rdrand %0" : "=r" (val));
+	return (val);
+}
+
+static __inline uint64_t
+rdrand64(void)
+{
+	uint64_t val;
+
+	__asm __volatile("rdrand %0" : "=r" (val));
+	return (val);
+}
+
 extern void
 isn_list(char *addr, uint32_t reg, uint64_t mask, uint64_t val);