From owner-svn-src-projects@FreeBSD.ORG  Wed Oct  3 04:22:40 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 36BA11065672;
	Wed,  3 Oct 2012 04:22:40 +0000 (UTC)
	(envelope-from grehan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 20E568FC17;
	Wed,  3 Oct 2012 04:22:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q934MdSh060524;
	Wed, 3 Oct 2012 04:22:39 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q934Mdt0060521;
	Wed, 3 Oct 2012 04:22:39 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201210030422.q934Mdt0060521@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Wed, 3 Oct 2012 04:22:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241153 - in projects/bhyve/sys/boot: common
	userboot/userboot
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2012 04:22:40 -0000

Author: grehan
Date: Wed Oct  3 04:22:39 2012
New Revision: 241153
URL: http://svn.freebsd.org/changeset/base/241153

Log:
  Allow the number of FICL dictionary cells to be overridden.
  Loading a 7.3 ISO with userboot/amd64 takes up 10035 cells,
  overflowing the long-standing default of 10000.
  
  Bump userboot's value up to 15000 cells.

Modified:
  projects/bhyve/sys/boot/common/interp_forth.c
  projects/bhyve/sys/boot/userboot/userboot/Makefile

Modified: projects/bhyve/sys/boot/common/interp_forth.c
==============================================================================
--- projects/bhyve/sys/boot/common/interp_forth.c	Wed Oct  3 03:44:23 2012	(r241152)
+++ projects/bhyve/sys/boot/common/interp_forth.c	Wed Oct  3 04:22:39 2012	(r241153)
@@ -51,6 +51,13 @@ extern char bootprog_rev[];
 #define BF_PARSE 100
 
 /*
+ * Default dictionary size, ~4000 cells
+ */
+#ifndef BF_DICTSIZE
+#define BF_DICTSIZE	10000
+#endif
+
+/*
  * BootForth   Interface to Ficl Forth interpreter.
  */
 
@@ -234,7 +241,7 @@ bf_init(void)
     char create_buf[41];	/* 31 characters-long builtins */
     int fd;
    
-    bf_sys = ficlInitSystem(10000);	/* Default dictionary ~4000 cells */
+    bf_sys = ficlInitSystem(BF_DICTSIZE);
     bf_vm = ficlNewVM(bf_sys);
 
     /* Put all private definitions in a "builtins" vocabulary */

Modified: projects/bhyve/sys/boot/userboot/userboot/Makefile
==============================================================================
--- projects/bhyve/sys/boot/userboot/userboot/Makefile	Wed Oct  3 03:44:23 2012	(r241152)
+++ projects/bhyve/sys/boot/userboot/userboot/Makefile	Wed Oct  3 04:22:39 2012	(r241153)
@@ -46,6 +46,7 @@ CLEANFILES=	vers.c
 .if ${MK_FORTH} != "no"
 BOOT_FORTH=	yes
 CFLAGS+=        -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386
+CFLAGS+=	-DBF_DICTSIZE=15000
 LIBFICL=	${.OBJDIR}/../ficl/libficl.a
 LIBSTAND=	${.OBJDIR}/../libstand/libstand.a
 .endif