From owner-svn-soc-all@freebsd.org  Wed Dec 23 22:12:42 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A743BA50E25
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Wed, 23 Dec 2015 22:12:42 +0000 (UTC)
 (envelope-from clord@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9BDD51F77
 for <svn-soc-all@FreeBSD.org>; Wed, 23 Dec 2015 22:12:42 +0000 (UTC)
 (envelope-from clord@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNMCgeS054993
 for <svn-soc-all@FreeBSD.org>; Wed, 23 Dec 2015 22:12:42 GMT
 (envelope-from clord@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id tBNMCfV1054972
 for svn-soc-all@FreeBSD.org; Wed, 23 Dec 2015 22:12:41 GMT
 (envelope-from clord@FreeBSD.org)
Date: Wed, 23 Dec 2015 22:12:41 GMT
Message-Id: <201512232212.tBNMCfV1054972@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 clord@FreeBSD.org using -f
From: clord@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r295788 - soc2015/clord/head/sys/contrib/ficl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 22:12:42 -0000

Author: clord
Date: Wed Dec 23 22:12:41 2015
New Revision: 295788
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=295788

Log:
  Fix ficlInstructionPick bug. Pick instructions from 0, not 1. Credit to Toomas
  Soome from the Illumos project.
  
  Obtained from:	http://cr.illumos.org/~webrev/tsoome/ficl/usr/src/common/ficl/vm.c.patch

Modified:
  soc2015/clord/head/sys/contrib/ficl/vm.c

Modified: soc2015/clord/head/sys/contrib/ficl/vm.c
==============================================================================
--- soc2015/clord/head/sys/contrib/ficl/vm.c	Wed Dec 23 22:09:02 2015	(r295787)
+++ soc2015/clord/head/sys/contrib/ficl/vm.c	Wed Dec 23 22:12:41 2015	(r295788)
@@ -723,8 +723,8 @@
 				i = dataTop->i;
 				if (i < 0)
 					continue;
-				CHECK_STACK(i + 1, i + 2);
-				*dataTop = dataTop[-i];
+				CHECK_STACK(i + 2, i + 3);
+				*dataTop = dataTop[-i-1];
 				continue;
 			}