From owner-svn-src-head@FreeBSD.ORG  Mon May  3 18:04:17 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E74171065676;
	Mon,  3 May 2010 18:04:17 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id D70DB8FC14;
	Mon,  3 May 2010 18:04:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o43I4HDK052913;
	Mon, 3 May 2010 18:04:17 GMT (envelope-from kan@svn.freebsd.org)
Received: (from kan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o43I4HYV052911;
	Mon, 3 May 2010 18:04:17 GMT (envelope-from kan@svn.freebsd.org)
Message-Id: <201005031804.o43I4HYV052911@svn.freebsd.org>
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Mon, 3 May 2010 18:04:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207578 - head/cddl/contrib/opensolaris/tools/ctf/cvt
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 May 2010 18:04:18 -0000

Author: kan
Date: Mon May  3 18:04:17 2010
New Revision: 207578
URL: http://svn.freebsd.org/changeset/base/207578

Log:
  Do not encode more than CTF_MAX_VLEN(1023) enum members.
  
  CTF can not represent enums with more than CTF_MAX_VLEN members, but
  ctfconvert will happily ignore that limitation and create CTF section no
  other tool can interpret.
  
  This change is different from similar change from upstream, which just
  returns an error if big enum is encountered.  Doing that means that
  every FreeBSD kernel with compiled in hwpmc will have no useable CTF
  information due to pmc_event enum having 1236+ members.

Modified:
  head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c

Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c	Mon May  3 17:55:32 2010	(r207577)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c	Mon May  3 18:04:17 2010	(r207578)
@@ -355,14 +355,21 @@ write_type(void *arg1, void *arg2)
 		for (i = 0, ep = tp->t_emem; ep != NULL; ep = ep->el_next)
 			i++; /* count up enum members */
 
+		if (i > CTF_MAX_VLEN) {
+			warning("enum %s has too many values: %d > %d\n",
+			    tdesc_name(tp), i, CTF_MAX_VLEN);
+			i = CTF_MAX_VLEN;
+		}
+
 		ctt.ctt_info = CTF_TYPE_INFO(CTF_K_ENUM, isroot, i);
 		write_sized_type_rec(b, &ctt, tp->t_size);
 
-		for (ep = tp->t_emem; ep != NULL; ep = ep->el_next) {
+		for (ep = tp->t_emem; ep != NULL && i > 0; ep = ep->el_next) {
 			offset = strtab_insert(&b->ctb_strtab, ep->el_name);
 			cte.cte_name = CTF_TYPE_NAME(CTF_STRTAB_0, offset);
 			cte.cte_value = ep->el_number;
 			ctf_buf_write(b, &cte, sizeof (cte));
+			i--;
 		}
 		break;