[Commit] nickle ChangeLog, 1.5, 1.6 Makefile.am, 1.39, 1.40 autogen.sh, 1.6, 1.7 compile.c, 1.142, 1.143 version.m4, 1.3, 1.4

Keith Packard commit at keithp.com
Sat Oct 25 12:00:35 PDT 2003


Committed by: keithp

Update of /local/src/CVS/nickle
In directory home.keithp.com:/tmp/cvs-serv7975

Modified Files:
	ChangeLog Makefile.am autogen.sh compile.c version.m4 
Log Message:
2003-10-25  Keith Packard  <keithp at keithp.com>

	* Makefile.am:
	* autogen.sh:
	Use automatic dependencies, fix up yacc stuff a bit.
	Replace autogen.sh with short version

2003-10-24  Keith Packard  <keithp at keithp.com>

(this change was lost by a mistaken commit to the wrong repository...)

	* compile.c: (CompileLvalue):
	* version.m4:
	Couple of valgrind problems:
	Initialize branch.offset field in all instructions so that
	CompileIsReachable can blindly fetch them before the real
	offset is set.
	Set the static link offset to zero for names contained in
	declarations; it was otherwise uninitialized.


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	25 Oct 2003 18:37:08 -0000	1.5
+++ ChangeLog	25 Oct 2003 19:00:33 -0000	1.6
@@ -1,14 +1,9 @@
 2003-10-25  Keith Packard  <keithp at keithp.com>
 
-	* builtin/Makefile.am:
-	* builtin/builtin.c: (BuiltinType):
-	* builtin/builtin.h:
-	* expr.c: (NewExprComma):
-	* nickle.h:
-	* version.m4:
-	Eliminate bogus explicit dependencies from Makefile.am
-	Eliminate need for gram.h in builtins
-	Move #include version.h from builtin.h to builtin.c
+	* Makefile.am:
+	* autogen.sh:
+	Use automatic dependencies, fix up yacc stuff a bit.
+	Replace autogen.sh with short version
 
 2003-10-24  Keith Packard  <keithp at keithp.com>
 
@@ -21,6 +16,18 @@
 	Set the static link offset to zero for names contained in
 	declarations; it was otherwise uninitialized.
 
+2003-10-25  Keith Packard  <keithp at keithp.com>
+
+	* builtin/Makefile.am:
+	* builtin/builtin.c: (BuiltinType):
+	* builtin/builtin.h:
+	* expr.c: (NewExprComma):
+	* nickle.h:
+	* version.m4:
+	Eliminate bogus explicit dependencies from Makefile.am
+	Eliminate need for gram.h in builtins
+	Move #include version.h from builtin.h to builtin.c
+
 1.99.0:	First semi-public test release
 2.00:	Stable enough for Debian package
 2.20:   Things are pretty good now

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile.am	14 Oct 2003 01:43:55 -0000	1.39
+++ Makefile.am	25 Oct 2003 19:00:33 -0000	1.40
@@ -19,7 +19,6 @@
 DEBIAN = debian/changelog  debian/control debian/copyright \
 	debian/docs debian/files debian/rules
 
-AUTOMAKE_OPTIONS = no-dependencies
 EXTRA_DIST = README.name autoconfigure.sh $(NICKLEFILES) \
 	gram.h $(EXAMPLES) $(TEST) $(DEBIAN)
 
@@ -58,14 +57,19 @@
 	-Wmissing-prototypes -Wmissing-declarations \
 	-Wnested-externs -fno-strict-aliasing
 
-$(nickle_OBJECTS): avl.h gram.h memp.h opcode.h stack.h \
-	config.h mem.h nickle.h ref.h value.h
-
 all: version.m4
 
-gram.c gram.h: gram.y
+USES_GRAM_H = \
+	compile.o \
+	error.o \
+	expr.o \
+	file.o \
+	lex.o \
+	main.o \
+	pretty.o \
+	type.o
 
-lex.c: lex.l
+$(USES_GRAM_H): gram.h
 
 version.m4: update-version.sh \
   $(nickle_SOURCES) $(NICKLEFILES) $(NICKLEBUILTINSOURCES)

Index: autogen.sh
===================================================================
RCS file: /local/src/CVS/nickle/autogen.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- autogen.sh	11 Jul 2003 16:27:34 -0000	1.6
+++ autogen.sh	25 Oct 2003 19:00:33 -0000	1.7
@@ -4,58 +4,5 @@
 #
 # runs autotools to create ./configure and friends
 #
-
-PROJECT=nickle
-
-srcdir=`dirname "$0"`
-test -z $srcdir && srcdir=.
-
-origdir=`pwd`
-cd "$srcdir"
-
-if test -z "$AUTOGEN_SUBDIR_MODE" && test -z "$*"
-then
-  echo "I am going to run ./configure with no arguments - if you wish "
-  echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-# Use the versioned executables if available.
-aclocal=aclocal-1.7
-automake=automake-1.7
-$aclocal  --version </dev/null >/dev/null 2>&1 || aclocal=aclocal
-$automake --version </dev/null >/dev/null 2>&1 || automake=automake
-
-# require libtool >= 1.5
-#libtool_version=`libtool --version | head -1 | awk '{print $4}'`
-#libtool_major=`echo $libtool_version | awk -F . '{print $1}'`
-#libtool_minor=`echo $libtool_version | awk -F . '{print $2}'`
-#if [ $libtool_major -lt 1 ] || [ $libtool_major -eq 1 -a $libtool_minor -lt 5 ]
-#then
-#    echo "libtool 1.5 or later is required. You have $libtool_version."
-#    exit 1
-#fi
-
-rm -f config.guess config.sub depcomp install-sh missing mkinstalldirs
-rm -f config.cache acconfig.h
-rm -rf autom4te.cache
-
-set_option=':'
-test -n "${BASH_VERSION+set}" && set_option='set'
-
-$set_option -x
-
-$aclocal $ACLOCAL_FLAGS                  || exit 1
-libtoolize --force --copy                || exit 1
-autoheader                               || exit 1
-$automake --foreign --add-missing --copy || exit 1
-autoconf                                 || exit 1
-cd "$origdir"                            || exit 1
-
-if test -z "$AUTOGEN_SUBDIR_MODE"
-then
-  "$srcdir/configure" "$@" || exit 1
-  $set_option +x
-fi
-
-exit 0
-
+autoreconf -v --install || exit 1
+./configure --enable-maintainer-mode "$@"

Index: compile.c
===================================================================
RCS file: /local/src/CVS/nickle/compile.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- compile.c	25 Jul 2003 23:47:54 -0000	1.142
+++ compile.c	25 Oct 2003 19:00:33 -0000	1.143
@@ -175,6 +175,12 @@
 	obj->used_stat--;
 }
 
+/*
+ * Set branch offsets to zero so that CompileIsReachable can
+ * use them before the real values get filled in.  This is correct
+ * because the reachability targets are always in nested blocks which
+ * can never be the target for this instruction
+ */
 #define NewInst(_o,_op,_i,_stat) \
 {\
     InstPtr __inst__; \
@@ -183,6 +189,7 @@
     __inst__ = ObjCode (_o, _i); \
     __inst__->base.opCode = (_op); \
     __inst__->base.flags = 0; \
+    __inst__->branch.offset = 0; \
 }
 
 #define BuildInst(_o,_op,_inst,_stat) \
@@ -191,6 +198,7 @@
     (_inst) = ObjCode(_o, ObjLast(_o)); \
     (_inst)->base.opCode = (_op); \
     (_inst)->base.flags = 0; \
+    (_inst)->branch.offset = 0; \
 }
 
 #define SetFlag(_o,_f) ((_o)->used ? (ObjCode((_o), \
@@ -464,6 +472,8 @@
 	    for (decl = expr->decl.decl; decl; decl = decl->next)
 		s = decl->symbol;
 	}
+	/* the symbol was compiled in this frame */
+	depth = 0;
         goto isName;
     case NAME:
 	s = CompileCheckSymbol (obj, stat, expr, code,

Index: version.m4
===================================================================
RCS file: /local/src/CVS/nickle/version.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- version.m4	15 Oct 2003 19:28:14 -0000	1.3
+++ version.m4	25 Oct 2003 19:00:33 -0000	1.4
@@ -1,7 +1,7 @@
 dnl This file is maintained automatically by update-version.sh
 dnl The file format is finicky, so do not hand-edit lightly.
-dnl Last updated Wed Oct 15 12:27:06 PDT 2003
+dnl Last updated Sat Oct 25 11:54:45 PDT 2003
 dnl CURHEADER $Header$
-dnl OLDHEADER <Header: /local/src/CVS/nickle/version.m4,v 1.2 2003/10/14 01:43:55 bart Exp >
-dnl CURVERSION 2.22
-define([VERSION_NUMBER],[2.22])
+dnl OLDHEADER <Header: /local/src/CVS/nickle/version.m4,v 1.3 2003/10/15 19:28:14 bart Exp >
+dnl CURVERSION 2.23
+define([VERSION_NUMBER],[2.23])




More information about the Commit mailing list