Date: Thu, 12 Sep 2019 06:26:22 +0000 (UTC) From: Toomas Soome <tsoome@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r352241 - in stable/12/stand/ficl: . softwords Message-ID: <201909120626.x8C6QMx7072738@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tsoome Date: Thu Sep 12 06:26:22 2019 New Revision: 352241 URL: https://svnweb.freebsd.org/changeset/base/352241 Log: MFC r351865, r351837: ficl: add xemit word ficl: add uIsGreater word (needed for xemit) We need xemit to support userboot.so loading images from CURRENT. Modified: stable/12/stand/ficl/softwords/softcore.fr stable/12/stand/ficl/words.c Directory Properties: stable/12/ (props changed) Modified: stable/12/stand/ficl/softwords/softcore.fr ============================================================================== --- stable/12/stand/ficl/softwords/softcore.fr Thu Sep 12 06:20:20 2019 (r352240) +++ stable/12/stand/ficl/softwords/softcore.fr Thu Sep 12 06:26:22 2019 (r352241) @@ -199,6 +199,14 @@ set-current \ stop hiding words a-addr 0 b-addr b-u strcat ; +: xemit ( xchar -- ) + dup 0x80 u< if emit exit then \ special case ASCII + 0 swap 0x3F + begin 2dup u> while + 2/ >r dup 0x3F and 0x80 or swap 6 rshift r> + repeat 0x7F xor 2* or + begin dup 0x80 u< 0= while emit repeat drop + ; previous \ lose hidden words from search order Modified: stable/12/stand/ficl/words.c ============================================================================== --- stable/12/stand/ficl/words.c Thu Sep 12 06:20:20 2019 (r352240) +++ stable/12/stand/ficl/words.c Thu Sep 12 06:26:22 2019 (r352241) @@ -1930,6 +1930,18 @@ static void isGreater(FICL_VM *pVM) return; } +static void uIsGreater(FICL_VM *pVM) +{ + FICL_UNS u1, u2; +#if FICL_ROBUST > 1 + vmCheckStack(pVM, 2, 1); +#endif + u2 = stackPopUNS(pVM->pStack); + u1 = stackPopUNS(pVM->pStack); + PUSHINT(FICL_BOOL(u1 > u2)); + return; +} + static void bitwiseAnd(FICL_VM *pVM) { CELL x, y; @@ -4975,6 +4987,7 @@ void ficlCompileCore(FICL_SYSTEM *pSys) dictAppendWord(dp, "type", type, FW_DEFAULT); dictAppendWord(dp, "u.", uDot, FW_DEFAULT); dictAppendWord(dp, "u<", uIsLess, FW_DEFAULT); + dictAppendWord(dp, "u>", uIsGreater, FW_DEFAULT); dictAppendWord(dp, "um*", umStar, FW_DEFAULT); dictAppendWord(dp, "um/mod", umSlashMod, FW_DEFAULT); dictAppendWord(dp, "unloop", unloopCo, FW_COMPILE);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909120626.x8C6QMx7072738>