Cheers,
--
-- Thomas E. Spanjaard
[EMAIL PROTECTED]
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/Makefile
boot/ficl/Makefile
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/Makefile 2005-07-07
11:49:56.000000000 +0000
+++ boot/ficl/Makefile 2005-09-26 18:45:27.000000000 +0000
@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.35 2003/06/30 19:08:49 ru Exp $
-# $DragonFly: src/sys/boot/ficl/Makefile,v 1.8 2005/07/07 11:49:56 corecode
Exp $
+# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.42 2005/07/15 12:22:14 ache Exp $
+# $DragonFly$
#
.if ${MACHINE_ARCH} == "amd64"
-.MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true
+.MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true
.endif
.PATH: ${.CURDIR}/${MACHINE_ARCH}
@@ -18,6 +18,8 @@
CFLAGS+= -ffreestanding
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -mpreferred-stack-boundary=2
+CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 # Do not use fp registers
+CFLAGS+= -mno-sse3 # in integer code
.endif
.if HAVE_PNP
CFLAGS+= -DHAVE_PNP
@@ -44,7 +46,8 @@
CFLAGS+= -m32 -I.
.endif
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}/../common
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH} \
+ -I${.CURDIR}/../common
softcore.c: ${SOFTWORDS} softcore.awk
(cd ${.CURDIR}/softwords; cat ${SOFTWORDS} \
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/dict.c boot/ficl/dict.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/dict.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/dict.c 2005-09-26 18:45:27.000000000 +0000
@@ -51,9 +51,9 @@
** SUCH DAMAGE.
*/
-/*
- * $FreeBSD: src/sys/boot/ficl/dict.c,v 1.13 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/dict.c,v 1.3 2003/11/10 06:08:33 dillon Exp $
+/*
+ * $FreeBSD: src/sys/boot/ficl/dict.c,v 1.13 2002/04/09 17:45:11 dcs Exp $
+ * $DragonFly$
*/
#ifdef TESTMAIN
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/ficl.c boot/ficl/ficl.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/ficl.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/ficl.c 2005-09-26 18:45:27.000000000 +0000
@@ -55,9 +55,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/ficl.c,v 1.18 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/ficl.c,v 1.3 2003/11/10 06:08:33 dillon Exp $
+ * $DragonFly$
*/
#ifdef TESTMAIN
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/ficl.h boot/ficl/ficl.h
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/ficl.h 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/ficl.h 2005-09-26 18:45:27.000000000 +0000
@@ -41,9 +41,9 @@
** SUCH DAMAGE.
*/
-/*
- * $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.20 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/ficl.h,v 1.3 2003/11/10 06:08:33 dillon Exp $
+/*
+ * $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.21 2004/11/30 11:35:30 scottl Exp $
+ * $DragonFly$
*/
#if !defined (__FICL_H__)
@@ -1117,7 +1117,6 @@
extern void ficlInb(FICL_VM *pVM);
#endif
-#if !defined(TESTMAIN)
extern void ficlSetenv(FICL_VM *pVM);
extern void ficlSetenvq(FICL_VM *pVM);
extern void ficlGetenv(FICL_VM *pVM);
@@ -1125,9 +1124,10 @@
extern void ficlCopyin(FICL_VM *pVM);
extern void ficlCopyout(FICL_VM *pVM);
extern void ficlFindfile(FICL_VM *pVM);
+extern void ficlCcall(FICL_VM *pVM);
+#if !defined(TESTMAIN)
extern void ficlPnpdevices(FICL_VM *pVM);
extern void ficlPnphandlers(FICL_VM *pVM);
-extern void ficlCcall(FICL_VM *pVM);
#endif
/*
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/fileaccess.c
boot/ficl/fileaccess.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/fileaccess.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/fileaccess.c 2005-09-26 18:45:27.000000000 +0000
@@ -1,6 +1,6 @@
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/fileaccess.c,v 1.1 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/fileaccess.c,v 1.1 2003/11/10 06:08:33 dillon
Exp $
+ * $DragonFly$
*/
#include <errno.h>
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/float.c boot/ficl/float.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/float.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/float.c 2005-09-26 18:45:27.000000000 +0000
@@ -41,9 +41,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/float.c,v 1.1 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/float.c,v 1.1 2003/11/10 06:08:33 dillon Exp $
+ * $DragonFly$
*/
#include <stdlib.h>
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/i386/sysdep.c
boot/ficl/i386/sysdep.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/i386/sysdep.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/i386/sysdep.c 2005-09-26 18:45:27.000000000 +0000
@@ -7,9 +7,9 @@
**
*******************************************************************/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/i386/sysdep.c,v 1.7 1999/09/29 04:43:07 dcs Exp
$
- * $DragonFly: src/sys/boot/ficl/i386/sysdep.c,v 1.3 2003/11/10 06:08:33
dillon Exp $
+ * $DragonFly$
*/
#ifdef TESTMAIN
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/i386/sysdep.h
boot/ficl/i386/sysdep.h
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/i386/sysdep.h 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/i386/sysdep.h 2005-09-26 18:45:27.000000000 +0000
@@ -46,9 +46,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/i386/sysdep.h,v 1.8 2002/05/16 21:21:52 trhodes
Exp $
- * $DragonFly: src/sys/boot/ficl/i386/sysdep.h,v 1.3 2003/11/10 06:08:33
dillon Exp $
+ * $DragonFly$
*/
#if !defined (__SYSDEP_H__)
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/ia64/sysdep.c
boot/ficl/ia64/sysdep.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/ia64/sysdep.c 2003-11-10
06:08:34.000000000 +0000
+++ boot/ficl/ia64/sysdep.c 2005-09-26 18:45:27.000000000 +0000
@@ -7,9 +7,9 @@
**
*******************************************************************/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/ia64/sysdep.c,v 1.1 2001/09/04 08:50:23 dfr Exp
$
- * $DragonFly: src/sys/boot/ficl/ia64/sysdep.c,v 1.1 2003/11/10 06:08:34
dillon Exp $
+ * $DragonFly$
*/
#ifdef TESTMAIN
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/ia64/sysdep.h
boot/ficl/ia64/sysdep.h
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/ia64/sysdep.h 2003-11-10
06:08:34.000000000 +0000
+++ boot/ficl/ia64/sysdep.h 2005-09-26 18:45:27.000000000 +0000
@@ -48,9 +48,9 @@
** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
*/
-/*
- * $FreeBSD: src/sys/boot/ficl/ia64/sysdep.h,v 1.3 2002/05/16 21:21:57 trhodes
Exp $
- * $DragonFly: src/sys/boot/ficl/ia64/sysdep.h,v 1.1 2003/11/10 06:08:34
dillon Exp $
+/*
+ * $FreeBSD: src/sys/boot/ficl/ia64/sysdep.h,v 1.3 2002/05/16 21:21:57 trhodes
Exp $
+ * $DragonFly$
*/
#if !defined (__SYSDEP_H__)
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/loader.c
boot/ficl/loader.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/loader.c 2005-02-20
16:31:53.000000000 +0000
+++ boot/ficl/loader.c 2005-09-26 18:45:27.000000000 +0000
@@ -23,8 +23,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.9 2003/06/08 03:11:16 nyan Exp $
- * $DragonFly: src/sys/boot/ficl/loader.c,v 1.5 2005/02/20 16:31:53 swildner
Exp $
+ * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.11 2004/11/30 11:35:30 scottl
Exp $
+ * $DragonFly$
*/
/*******************************************************************
@@ -57,11 +57,13 @@
* .# ( value -- )
*/
-#ifndef TESTMAIN
void
ficlSetenv(FICL_VM *pVM)
{
- char *namep, *valuep, *name, *value;
+#ifndef TESTMAIN
+ char *name, *value;
+#endif
+ char *namep, *valuep;
int names, values;
#if FICL_ROBUST > 1
@@ -72,6 +74,7 @@
values = stackPopINT(pVM->pStack);
valuep = (char*) stackPopPtr(pVM->pStack);
+#ifndef TESTMAIN
name = (char*) ficlMalloc(names+1);
if (!name)
vmThrowErr(pVM, "Error: out of memory");
@@ -86,6 +89,7 @@
setenv(name, value, 1);
ficlFree(name);
ficlFree(value);
+#endif
return;
}
@@ -93,7 +97,10 @@
void
ficlSetenvq(FICL_VM *pVM)
{
- char *namep, *valuep, *name, *value;
+#ifndef TESTMAIN
+ char *name, *value;
+#endif
+ char *namep, *valuep;
int names, values, overwrite;
#if FICL_ROBUST > 1
@@ -105,6 +112,7 @@
values = stackPopINT(pVM->pStack);
valuep = (char*) stackPopPtr(pVM->pStack);
+#ifndef TESTMAIN
name = (char*) ficlMalloc(names+1);
if (!name)
vmThrowErr(pVM, "Error: out of memory");
@@ -119,6 +127,7 @@
setenv(name, value, overwrite);
ficlFree(name);
ficlFree(value);
+#endif
return;
}
@@ -126,7 +135,10 @@
void
ficlGetenv(FICL_VM *pVM)
{
- char *namep, *name, *value;
+#ifndef TESTMAIN
+ char *name;
+#endif
+ char *namep, *value;
int names;
#if FICL_ROBUST > 1
@@ -135,6 +147,7 @@
names = stackPopINT(pVM->pStack);
namep = (char*) stackPopPtr(pVM->pStack);
+#ifndef TESTMAIN
name = (char*) ficlMalloc(names+1);
if (!name)
vmThrowErr(pVM, "Error: out of memory");
@@ -148,6 +161,7 @@
stackPushPtr(pVM->pStack, value);
stackPushINT(pVM->pStack, strlen(value));
} else
+#endif
stackPushINT(pVM->pStack, -1);
return;
@@ -156,7 +170,10 @@
void
ficlUnsetenv(FICL_VM *pVM)
{
- char *namep, *name;
+#ifndef TESTMAIN
+ char *name;
+#endif
+ char *namep;
int names;
#if FICL_ROBUST > 1
@@ -165,6 +182,7 @@
names = stackPopINT(pVM->pStack);
namep = (char*) stackPopPtr(pVM->pStack);
+#ifndef TESTMAIN
name = (char*) ficlMalloc(names+1);
if (!name)
vmThrowErr(pVM, "Error: out of memory");
@@ -173,6 +191,7 @@
unsetenv(name);
ficlFree(name);
+#endif
return;
}
@@ -192,7 +211,9 @@
dest = stackPopINT(pVM->pStack);
src = stackPopPtr(pVM->pStack);
+#ifndef TESTMAIN
archsw.arch_copyin(src, dest, len);
+#endif
return;
}
@@ -212,7 +233,9 @@
dest = stackPopPtr(pVM->pStack);
src = stackPopINT(pVM->pStack);
+#ifndef TESTMAIN
archsw.arch_copyout(src, dest, len);
+#endif
return;
}
@@ -220,7 +243,10 @@
void
ficlFindfile(FICL_VM *pVM)
{
- char *name, *type, *namep, *typep;
+#ifndef TESTMAIN
+ char *name;
+#endif
+ char *type, *namep, *typep;
struct preloaded_file* fp;
int names, types;
@@ -232,6 +258,7 @@
typep = (char*) stackPopPtr(pVM->pStack);
names = stackPopINT(pVM->pStack);
namep = (char*) stackPopPtr(pVM->pStack);
+#ifndef TESTMAIN
name = (char*) ficlMalloc(names+1);
if (!name)
vmThrowErr(pVM, "Error: out of memory");
@@ -244,11 +271,15 @@
type[types] = '\0';
fp = file_findfile(name, type);
+#else
+ fp = NULL;
+#endif
stackPushPtr(pVM->pStack, fp);
return;
}
+#ifndef TESTMAIN
#ifdef HAVE_PNP
void
@@ -638,11 +669,6 @@
dictAppendWord(dp, "dictthreshold", ficlDictThreshold, FW_DEFAULT);
dictAppendWord(dp, "dictincrease", ficlDictIncrease, FW_DEFAULT);
-#ifndef TESTMAIN
-#ifdef __i386__
- dictAppendWord(dp, "outb", ficlOutb, FW_DEFAULT);
- dictAppendWord(dp, "inb", ficlInb, FW_DEFAULT);
-#endif
dictAppendWord(dp, "setenv", ficlSetenv, FW_DEFAULT);
dictAppendWord(dp, "setenv?", ficlSetenvq, FW_DEFAULT);
dictAppendWord(dp, "getenv", ficlGetenv, FW_DEFAULT);
@@ -650,11 +676,16 @@
dictAppendWord(dp, "copyin", ficlCopyin, FW_DEFAULT);
dictAppendWord(dp, "copyout", ficlCopyout, FW_DEFAULT);
dictAppendWord(dp, "findfile", ficlFindfile, FW_DEFAULT);
+ dictAppendWord(dp, "ccall", ficlCcall, FW_DEFAULT);
+#ifndef TESTMAIN
+#ifdef __i386__
+ dictAppendWord(dp, "outb", ficlOutb, FW_DEFAULT);
+ dictAppendWord(dp, "inb", ficlInb, FW_DEFAULT);
+#endif
#ifdef HAVE_PNP
dictAppendWord(dp, "pnpdevices",ficlPnpdevices, FW_DEFAULT);
dictAppendWord(dp, "pnphandlers",ficlPnphandlers, FW_DEFAULT);
#endif
- dictAppendWord(dp, "ccall", ficlCcall, FW_DEFAULT);
#endif
#if defined(__i386__)
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/math64.c
boot/ficl/math64.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/math64.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/math64.c 2005-09-26 18:45:27.000000000 +0000
@@ -42,9 +42,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/math64.c,v 1.4 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/math64.c,v 1.3 2003/11/10 06:08:33 dillon Exp
$
+ * $DragonFly$
*/
#include "ficl.h"
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/math64.h
boot/ficl/math64.h
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/math64.h 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/math64.h 2005-09-26 18:45:27.000000000 +0000
@@ -40,9 +40,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/math64.h,v 1.4 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/math64.h,v 1.3 2003/11/10 06:08:33 dillon Exp
$
+ * $DragonFly$
*/
#if !defined (__MATH64_H__)
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/notes.txt
boot/ficl/notes.txt
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/notes.txt 1970-01-01
00:00:00.000000000 +0000
+++ boot/ficl/notes.txt 2005-09-26 18:45:27.000000000 +0000
@@ -0,0 +1,7 @@
+This is FICL 3.02 source imported from FreeBSD on 26 Sep 2005. It has been
+adjusted for use on DragonFlyBSD.
+
+The biggest change wrt the older FICL seems to be some shuffling of bits in
+loader.c, and the explicit disabling of the use of floating-point registers
+by gcc. This should fix some issues people were having with the BTX loader.
+
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/prefix.c
boot/ficl/prefix.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/prefix.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/prefix.c 2005-09-26 18:45:27.000000000 +0000
@@ -41,9 +41,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/prefix.c,v 1.3 2002/08/31 01:04:53 scottl Exp $
- * $DragonFly: src/sys/boot/ficl/prefix.c,v 1.1 2003/11/10 06:08:33 dillon Exp
$
+ * $DragonFly$
*/
#include <string.h>
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/search.c
boot/ficl/search.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/search.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/search.c 2005-09-26 18:45:27.000000000 +0000
@@ -41,9 +41,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/search.c,v 1.2 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/search.c,v 1.1 2003/11/10 06:08:33 dillon Exp
$
+ * $DragonFly$
*/
#include <string.h>
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/classes.fr
boot/ficl/softwords/classes.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/classes.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/classes.fr 2005-09-26 18:45:27.000000000 +0000
@@ -5,7 +5,7 @@
\ Needs oop.fr
\
\ $FreeBSD: src/sys/boot/ficl/softwords/classes.fr,v 1.4 2001/04/29 02:36:35
dcs Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/classes.fr,v 1.3 2003/11/10 06:08:34
dillon Exp $
+\ $DragonFly$
also oop definitions
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/ficlclass.fr
boot/ficl/softwords/ficlclass.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/ficlclass.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/ficlclass.fr 2005-09-26 18:45:27.000000000 +0000
@@ -8,7 +8,7 @@
\ Models a FICL_WORD
\
\ $FreeBSD: src/sys/boot/ficl/softwords/ficlclass.fr,v 1.1 2002/04/09 17:45:27
dcs Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/ficlclass.fr,v 1.1 2003/11/10
06:08:34 dillon Exp $
+\ $DragonFly$
object subclass c-word
c-word ref: .link
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/ficllocal.fr
boot/ficl/softwords/ficllocal.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/ficllocal.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/ficllocal.fr 2005-09-26 18:45:27.000000000 +0000
@@ -8,7 +8,7 @@
\ 1 = found --
\
\ $FreeBSD: src/sys/boot/ficl/softwords/ficllocal.fr,v 1.1 1999/09/29 04:43:15
dcs Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/ficllocal.fr,v 1.3 2003/11/10
06:08:34 dillon Exp $
+\ $DragonFly$
hide
0 constant zero
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/fileaccess.fr
boot/ficl/softwords/fileaccess.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/fileaccess.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/fileaccess.fr 2005-09-26 18:45:27.000000000 +0000
@@ -5,7 +5,7 @@
\ **
\
\ $FreeBSD: src/sys/boot/ficl/softwords/fileaccess.fr,v 1.1 2002/04/09
17:45:27 dcs Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/fileaccess.fr,v 1.1 2003/11/10
06:08:34 dillon Exp $
+\ $DragonFly$
: r/o 1 ;
: r/w 3 ;
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/forml.fr
boot/ficl/softwords/forml.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/forml.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/forml.fr 2005-09-26 18:45:27.000000000 +0000
@@ -2,7 +2,7 @@
\ sadler
\
\ $FreeBSD: src/sys/boot/ficl/softwords/forml.fr,v 1.1 2002/04/09 17:45:27 dcs
Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/forml.fr,v 1.1 2003/11/10 06:08:34
dillon Exp $
+\ $DragonFly$
.( loading FORML examples ) cr
object --> sub c-example
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/freebsd.fr
boot/ficl/softwords/freebsd.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/freebsd.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/freebsd.fr 2005-09-26 18:45:27.000000000 +0000
@@ -23,7 +23,7 @@
\ ** SUCH DAMAGE.
\ **
\ ** $FreeBSD: src/sys/boot/ficl/softwords/freebsd.fr,v 1.4 1999/08/28
00:39:55 peter Exp $
-\ ** $DragonFly: src/sys/boot/ficl/softwords/freebsd.fr,v 1.3 2003/11/10
06:08:34 dillon Exp $
+\ ** $DragonFly$
\ Words for use in scripts:
\ % ignore errors here
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/ifbrack.fr
boot/ficl/softwords/ifbrack.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/ifbrack.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/ifbrack.fr 2005-09-26 18:45:27.000000000 +0000
@@ -3,7 +3,7 @@
\ ** Requires ficl 2.0 or greater...
\
\ $FreeBSD: src/sys/boot/ficl/softwords/ifbrack.fr,v 1.3 2002/04/09 17:45:27
dcs Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/ifbrack.fr,v 1.3 2003/11/10 06:08:34
dillon Exp $
+\ $DragonFly$
hide
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/jhlocal.fr
boot/ficl/softwords/jhlocal.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/jhlocal.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/jhlocal.fr 2005-09-26 18:45:27.000000000 +0000
@@ -15,7 +15,7 @@
\ revised 2 June 2000 - { | a -- } now works correctly
\
\ $FreeBSD: src/sys/boot/ficl/softwords/jhlocal.fr,v 1.4 2001/04/29 02:36:36
dcs Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/jhlocal.fr,v 1.3 2003/11/10 06:08:34
dillon Exp $
+\ $DragonFly$
hide
0 constant zero
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/marker.fr
boot/ficl/softwords/marker.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/marker.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/marker.fr 2005-09-26 18:45:27.000000000 +0000
@@ -4,7 +4,7 @@
\ Requires ficl 2.02 FORGET-WID !!
\
\ $FreeBSD: src/sys/boot/ficl/softwords/marker.fr,v 1.2 2002/04/09 17:45:27
dcs Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/marker.fr,v 1.2 2003/11/10 06:08:34
dillon Exp $
+\ $DragonFly$
: marker ( "name" -- )
create
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/oo.fr
boot/ficl/softwords/oo.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/oo.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/oo.fr 2005-09-26 18:45:27.000000000 +0000
@@ -4,7 +4,7 @@
\ ** john sadler aug 1998
\
\ $FreeBSD: src/sys/boot/ficl/softwords/oo.fr,v 1.4 2002/04/09 17:45:28 dcs
Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/oo.fr,v 1.3 2003/11/10 06:08:34
dillon Exp $
+\ $DragonFly$
17 ficl-vocabulary oop
also oop definitions
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/prefix.fr
boot/ficl/softwords/prefix.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/prefix.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/prefix.fr 2005-09-26 18:45:27.000000000 +0000
@@ -6,7 +6,7 @@
\ wordlist. start-prefixes and end-prefixes handle the bookkeeping
\
\ $FreeBSD: src/sys/boot/ficl/softwords/prefix.fr,v 1.2 2002/04/09 17:45:28
dcs Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/prefix.fr,v 1.1 2003/11/10 06:08:34
dillon Exp $
+\ $DragonFly$
variable save-current
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/softcore.awk
boot/ficl/softwords/softcore.awk
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/softcore.awk
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/softcore.awk 2005-09-26 18:45:27.000000000 +0000
@@ -11,7 +11,7 @@
# POSIX [[:space:]] character class.
#
# $FreeBSD: src/sys/boot/ficl/softwords/softcore.awk,v 1.8 2001/11/03 01:33:12
obrien Exp $
-# $DragonFly: src/sys/boot/ficl/softwords/softcore.awk,v 1.3 2003/11/10
06:08:34 dillon Exp $
+# $DragonFly$
BEGIN \
{
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/softcore.fr
boot/ficl/softwords/softcore.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/softcore.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/softcore.fr 2005-09-26 18:45:27.000000000 +0000
@@ -4,7 +4,7 @@
\ ** September, 1998
\
\ $FreeBSD: src/sys/boot/ficl/softwords/softcore.fr,v 1.12 2002/04/09 17:45:28
dcs Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/softcore.fr,v 1.3 2003/11/10
06:08:34 dillon Exp $
+\ $DragonFly$
\ ** Ficl USER variables
\ ** See words.c for primitive def'n of USER
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/string.fr
boot/ficl/softwords/string.fr
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/softwords/string.fr
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/softwords/string.fr 2005-09-26 18:45:27.000000000 +0000
@@ -12,7 +12,7 @@
\ str --> type cr
\
\ $FreeBSD: src/sys/boot/ficl/softwords/string.fr,v 1.2 2001/04/29 02:36:36
dcs Exp $
-\ $DragonFly: src/sys/boot/ficl/softwords/string.fr,v 1.3 2003/11/10 06:08:34
dillon Exp $
+\ $DragonFly$
also oop definitions
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/sparc64/sysdep.c
boot/ficl/sparc64/sysdep.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/sparc64/sysdep.c
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/sparc64/sysdep.c 2005-09-26 18:45:27.000000000 +0000
@@ -7,9 +7,9 @@
**
*******************************************************************/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/sparc64/sysdep.c,v 1.1 2002/05/19 23:20:56 jake
Exp $
- * $DragonFly: src/sys/boot/ficl/sparc64/sysdep.c,v 1.1 2003/11/10 06:08:34
dillon Exp $
+ * $DragonFly$
*/
#ifdef TESTMAIN
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/sparc64/sysdep.h
boot/ficl/sparc64/sysdep.h
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/sparc64/sysdep.h
2003-11-10 06:08:34.000000000 +0000
+++ boot/ficl/sparc64/sysdep.h 2005-09-26 18:45:27.000000000 +0000
@@ -50,7 +50,7 @@
/*
* $FreeBSD: src/sys/boot/ficl/sparc64/sysdep.h,v 1.1 2002/05/19 23:20:56 jake
Exp $
- * $DragonFly: src/sys/boot/ficl/sparc64/sysdep.h,v 1.1 2003/11/10 06:08:34
dillon Exp $
+ * $DragonFly$
*/
#if !defined (__SYSDEP_H__)
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/stack.c boot/ficl/stack.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/stack.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/stack.c 2005-09-26 18:45:27.000000000 +0000
@@ -40,9 +40,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/stack.c,v 1.5 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/stack.c,v 1.3 2003/11/10 06:08:33 dillon Exp $
+ * $DragonFly$
*/
#ifdef TESTMAIN
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/testmain.c
boot/ficl/testmain.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/testmain.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/testmain.c 2005-09-26 18:45:27.000000000 +0000
@@ -37,9 +37,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/testmain.c,v 1.8 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/testmain.c,v 1.3 2003/11/10 06:08:33 dillon
Exp $
+ * $DragonFly$
*/
#include <stdlib.h>
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/tools.c boot/ficl/tools.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/tools.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/tools.c 2005-09-26 18:45:27.000000000 +0000
@@ -54,10 +54,11 @@
** Specify breakpoint default action
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/tools.c,v 1.2 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/tools.c,v 1.1 2003/11/10 06:08:33 dillon Exp $
+ * $DragonFly$
*/
+
#ifdef TESTMAIN
#include <stdlib.h>
#include <stdio.h> /* sprintf */
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/unix.c boot/ficl/unix.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/unix.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/unix.c 2005-09-26 18:45:27.000000000 +0000
@@ -1,6 +1,6 @@
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/unix.c,v 1.1 2001/04/29 02:36:34 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/unix.c,v 1.1 2003/11/10 06:08:33 dillon Exp $
+ * $DragonFly$
*/
#include <string.h>
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/vm.c boot/ficl/vm.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/vm.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/vm.c 2005-09-26 18:45:27.000000000 +0000
@@ -47,9 +47,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/vm.c,v 1.9 2002/04/09 17:45:11 dcs Exp $
- * $DragonFly: src/sys/boot/ficl/vm.c,v 1.4 2003/11/10 06:08:33 dillon Exp $
+ * $DragonFly$
*/
#ifdef TESTMAIN
diff -ruN /home/tgen/files/dragonfly/src/sys/boot/ficl/words.c boot/ficl/words.c
--- /home/tgen/files/dragonfly/src/sys/boot/ficl/words.c 2003-11-10
06:08:33.000000000 +0000
+++ boot/ficl/words.c 2005-09-26 18:45:27.000000000 +0000
@@ -41,9 +41,9 @@
** SUCH DAMAGE.
*/
-/*
+/*
* $FreeBSD: src/sys/boot/ficl/words.c,v 1.39 2002/12/30 21:18:06 schweikh Exp
$
- * $DragonFly: src/sys/boot/ficl/words.c,v 1.3 2003/11/10 06:08:33 dillon Exp $
+ * $DragonFly$
*/
#ifdef TESTMAIN
signature.asc
Description: OpenPGP digital signature
