From owner-svn-soc-all@freebsd.org  Mon Jul 27 21:34:33 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 9A93A9AC434
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 27 Jul 2015 21:34:33 +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 8BB34777
 for <svn-soc-all@FreeBSD.org>; Mon, 27 Jul 2015 21:34:33 +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 t6RLYXIT059920
 for <svn-soc-all@FreeBSD.org>; Mon, 27 Jul 2015 21:34:33 GMT
 (envelope-from clord@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6RLYWSA059908
 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 21:34:32 GMT
 (envelope-from clord@FreeBSD.org)
Date: Mon, 27 Jul 2015 21:34:32 GMT
Message-Id: <201507272134.t6RLYWSA059908@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: r288822 - soc2015/clord/head/sys/contrib/ficl/softcore
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jul 2015 21:34:33 -0000

Author: clord
Date: Mon Jul 27 21:34:32 2015
New Revision: 288822
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288822

Log:
  Update ficlCompileSoftCore to work with Ficl 4 types.
  

Modified:
  soc2015/clord/head/sys/contrib/ficl/softcore/softcore.awk

Modified: soc2015/clord/head/sys/contrib/ficl/softcore/softcore.awk
==============================================================================
--- soc2015/clord/head/sys/contrib/ficl/softcore/softcore.awk	Mon Jul 27 21:32:03 2015	(r288821)
+++ soc2015/clord/head/sys/contrib/ficl/softcore/softcore.awk	Mon Jul 27 21:34:32 2015	(r288822)
@@ -167,15 +167,15 @@
   if (commenting) end_comments();
   printf "#endif /* WANT_SOFTWORDS */\n";
   printf "    \"quit \";\n";
-  printf "\n\nvoid ficlCompileSoftCore(FICL_SYSTEM *pSys)\n";
+  printf "\n\nvoid ficlSystemCompileSoftCore(ficlSystem *pSys)\n";
   printf "{\n";
-  printf "    FICL_VM *pVM = pSys->vmList;\n";
-  printf "    CELL id = pVM->sourceID;\n";
+  printf "    ficlVm *pVM = pSys->vmList;\n";
+  printf "    CELL id = pVM->sourceId;\n";
   printf "    int ret = sizeof (softWords);\n";
   printf "	  assert(pVM);\n";
-  printf "    pVM->sourceID.i = -1;\n";
+  printf "    pVM->sourceId.i = -1;\n";
   printf "    ret = ficlExec(pVM, softWords);\n";
-  printf "    pVM->sourceID = id;\n";
+  printf "    pVM->sourceId = id;\n";
   printf "    if (ret == VM_ERREXIT)\n";
   printf "        assert(FALSE);\n";
   printf "    return;\n";