From owner-freebsd-dtrace@FreeBSD.ORG Wed May 7 04:00:53 2014 Return-Path: Delivered-To: freebsd-dtrace@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 ESMTPS id 5E28ED20; Wed, 7 May 2014 04:00:53 +0000 (UTC) Received: from mail-ve0-x22c.google.com (mail-ve0-x22c.google.com [IPv6:2607:f8b0:400c:c01::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0E805C38; Wed, 7 May 2014 04:00:52 +0000 (UTC) Received: by mail-ve0-f172.google.com with SMTP id oz11so523157veb.31 for ; Tue, 06 May 2014 21:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=oGs4a0ryCwNhwh4GotSWxq0Ucf9ez1j9Z6FeCwZra+8=; b=0Ed+oorwDAIGh7ZimQGm9E+N6B8WiO2qOSlOOtRKInArfz9Jzrab1WEP+Vt97vkqfr ocaY0ky2NtbpQa2MoXiS4UQg/BQvhFvIMEI0csaOMHPZCOhsJ/wZzbqQC5L8qx2OagKs S7+ia/ZZP05cZb/7g77wbEPA21qGeF8ug3/hhRGseAiSAlEDcsKph9UsRwZeef7OkonO jScyy44FhJdwvCAdjyjffNtCkU8Wmh9BlTNcFEcgTmSVQ7NDxTATgMj1MUtUxcNFe7Sp Y++WQ3tgm1yP47Nj9EXohH8jE82+QUlv3QNUNYgYRf9mMoT0m4gCJ1UrN7JrAvwUOwJ3 4WRA== MIME-Version: 1.0 X-Received: by 10.52.120.39 with SMTP id kz7mr3412794vdb.41.1399435252152; Tue, 06 May 2014 21:00:52 -0700 (PDT) Sender: markjdb@gmail.com Received: by 10.220.162.68 with HTTP; Tue, 6 May 2014 21:00:52 -0700 (PDT) In-Reply-To: <5369A19B.9080505@freebsd.org> References: <5369A19B.9080505@freebsd.org> Date: Wed, 7 May 2014 00:00:52 -0400 X-Google-Sender-Auth: sdT4kNJ5JP00AECC0vD3Bv6cpaQ Message-ID: Subject: Re: Importing the latest dis_tables.c From: Mark Johnston To: Peter Grehan Content-Type: text/plain; charset=UTF-8 Cc: "freebsd-dtrace@freebsd.org" X-BeenThere: freebsd-dtrace@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "A discussion list for developers working on DTrace in FreeBSD." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2014 04:00:53 -0000 On Tue, May 6, 2014 at 10:59 PM, Peter Grehan wrote: > Hi, > > I'd like to pull in the latest version of dis_tables.c from illumos-gate to > pick up the recent work done there. This is mainly for using dtrace on the > bhyve kernel module since it can decode VT-x/SVM instructions, but is > probably generally useful. > > > http://src.illumos.org/source/history/illumos-gate/usr/src/common/dis/i386/dis_tables.c > > What's the process for this ? Should I pull this into vendor/illumos-sys, > or just drop it directly into FreeBSD (which is what the previous commits > seemed to do) ? Any tips ? FWIW, vendor-sys/illumos is merged to sys/cddl/opensolaris, but in FreeBSD, dis_tables.c lives at sys/cddl/dev/dtrace/x86/dis_tables.c for some reason. That is, it's not under the merge target, so merging from vendor-sys/illumos might not be possible without first moving dis_tables.{c,h} to sys/cddl/opensolaris/common/dis. I think that's at least part of the reason dis_tables.c has been updated directly in the past, so I don't think it would be problematic to keep doing it that way until dis_tables.{c,h} are moved (assuming that that's sufficient to start merging them from vendor-sys). I'm not 100% sure of this though. -Mark