guile/guile-vm/src Makefile.am vm.c vm.h vm_eng...

[Keisuke Nishida]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Keisuke Nishida <address@hidden>        00/09/29 11:08:00

Modified files:
        guile-vm/src   : Makefile.am vm.c vm.h vm_engine.c vm_number.c 
                         vm_scheme.c vm_system.c 
Added files:
        guile-vm/src   : vm_expand.h 
Removed files:
        guile-vm/src   : vm-snarf.h 

Log message:
        Create *.i from *.c and include them.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-vm/src/vm_expand.h.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-vm/src/Makefile.am.diff?r1=1.2&r2=1.3
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-vm/src/vm.c.diff?r1=1.7&r2=1.8
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-vm/src/vm.h.diff?r1=1.3&r2=1.4
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-vm/src/vm_engine.c.diff?r1=1.5&r2=1.6
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-vm/src/vm_number.c.diff?r1=1.3&r2=1.4
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-vm/src/vm_scheme.c.diff?r1=1.3&r2=1.4
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-vm/src/vm_system.c.diff?r1=1.10&r2=1.11
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-vm/src/vm-snarf.h.diff?r1=1.2&r2=NONE

Patches:
Index: guile/guile-vm/src/Makefile.am
diff -u guile/guile-vm/src/Makefile.am:1.2 guile/guile-vm/src/Makefile.am:1.3
--- guile/guile-vm/src/Makefile.am:1.2  Wed Sep 27 16:29:45 2000
+++ guile/guile-vm/src/Makefile.am      Fri Sep 29 11:08:00 2000
@@ -8,12 +8,10 @@
 lib_LTLIBRARIES = libguilevm.la
 libguilevm_la_SOURCES = vm.c
 libguilevm_la_LDFLAGS = -version-info 0:0:0 -export-dynamic
-noinst_HEADERS = vm.h vm_engine.h vm-snarf.h
+noinst_HEADERS = vm.h vm_engine.h vm_expand.h
 EXTRA_DIST = vm_engine.c vm_system.c vm_scheme.c vm_number.c \
             test.scm guile-compile.in
-BUILT_SOURCES = vm_system.inst vm_scheme.inst vm_number.inst \
-               vm_system.label vm_scheme.label vm_number.label \
-               vm_system.opcode vm_scheme.opcode vm_number.opcode vm.x
+BUILT_SOURCES = vm_system.i vm_scheme.i vm_number.i vm.x
 
 CFLAGS = -g -O2 -Wall
 INCLUDES = $(GUILE_CFLAGS)
@@ -22,24 +20,15 @@
 MAINTAINERCLEANFILES = Makefile.in config.h.in stamp-h.in
 
 SNARF = guile-snarf
-SUFFIXES = .x .inst .label .opcode
+SUFFIXES = .x .i
 .c.x:
        $(SNARF) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ \
        || { rm $@; false; }
 
-.c.inst:
-       $(SNARF) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ \
-       || { rm $@; false; }
-
-.c.label:
-       $(SNARF) -DSCM_SNARF_LABEL $(DEFS) $(INCLUDES) $(CPPFLAGS) \
-       $(CFLAGS) $< > $@ || { rm $@; false; }
-
-.c.opcode:
-       $(SNARF) -DSCM_SNARF_OPCODE $(DEFS) $(INCLUDES) $(CPPFLAGS) \
-       $(CFLAGS) $< > $@ || { rm $@; false; }
+.c.i:
+       grep '^SCM_DEFINE' $< > $@
 
-$(BUILT_SOURCES): config.h vm-snarf.h
+$(BUILT_SOURCES): config.h vm_expand.h
 
 guile-compile: guile-compile.in
        sed -e 'address@hidden@!$(bindir)!' -e 'address@hidden@!$(PACKAGE)!' \
Index: guile/guile-vm/src/vm.c
diff -u guile/guile-vm/src/vm.c:1.7 guile/guile-vm/src/vm.c:1.8
--- guile/guile-vm/src/vm.c:1.7 Wed Sep 27 16:29:45 2000
+++ guile/guile-vm/src/vm.c     Fri Sep 29 11:08:00 2000
@@ -117,9 +117,12 @@
 static long scm_instruction_tag;
 
 static struct scm_instruction scm_instruction_table[] = {
-#include "vm_system.inst"
-#include "vm_scheme.inst"
-#include "vm_number.inst"
+#define VM_INSTRUCTION_TO_TABLE
+#include "vm_expand.h"
+#include "vm_system.i"
+#include "vm_scheme.i"
+#include "vm_number.i"
+#undef VM_INSTRUCTION_TO_TABLE
   {op_last}
 };
 
Index: guile/guile-vm/src/vm.h
diff -u guile/guile-vm/src/vm.h:1.3 guile/guile-vm/src/vm.h:1.4
--- guile/guile-vm/src/vm.h:1.3 Wed Sep 27 16:29:45 2000
+++ guile/guile-vm/src/vm.h     Fri Sep 29 11:08:00 2000
@@ -43,6 +43,7 @@
 #define VM_H
 
 #include <libguile.h>
+#include "config.h"
 
 
 /*
@@ -51,9 +52,12 @@
 
 /* Opcode */
 enum scm_opcode {
-#include "vm_system.opcode"
-#include "vm_scheme.opcode"
-#include "vm_number.opcode"
+#define VM_INSTRUCTION_TO_OPCODE
+#include "vm_expand.h"
+#include "vm_system.i"
+#include "vm_scheme.i"
+#include "vm_number.i"
+#undef VM_INSTRUCTION_TO_OPCODE
   op_last
 };
 
Index: guile/guile-vm/src/vm_engine.c
diff -u guile/guile-vm/src/vm_engine.c:1.5 guile/guile-vm/src/vm_engine.c:1.6
--- guile/guile-vm/src/vm_engine.c:1.5  Wed Sep 27 16:29:45 2000
+++ guile/guile-vm/src/vm_engine.c      Fri Sep 29 11:08:00 2000
@@ -78,9 +78,12 @@
 
   /* Jump talbe */
   static void *jump_table[] = {
-#include "vm_system.label"
-#include "vm_scheme.label"
-#include "vm_number.label"
+#define VM_INSTRUCTION_TO_LABEL
+#include "vm_expand.h"
+#include "vm_system.i"
+#include "vm_scheme.i"
+#include "vm_number.i"
+#undef VM_INSTRUCTION_TO_LABEL
   };
 
   /* Initialize the VM */
@@ -101,6 +104,7 @@
   vm_start: switch (*pc++) {
 #endif
 
+#include "vm_expand.h"
 #include "vm_system.c"
 #include "vm_scheme.c"
 #include "vm_number.c"
Index: guile/guile-vm/src/vm_number.c
diff -u guile/guile-vm/src/vm_number.c:1.3 guile/guile-vm/src/vm_number.c:1.4
--- guile/guile-vm/src/vm_number.c:1.3  Wed Sep 20 14:08:12 2000
+++ guile/guile-vm/src/vm_number.c      Fri Sep 29 11:08:00 2000
@@ -41,8 +41,6 @@
 
 /* This file is included in vm_engine.c */
 
-#include "vm-snarf.h"
-
 #define FUNC2(CFUNC,SFUNC)                             \
 {                                                      \
   VM_SETUP_ARGS2 ();                                   \
Index: guile/guile-vm/src/vm_scheme.c
diff -u guile/guile-vm/src/vm_scheme.c:1.3 guile/guile-vm/src/vm_scheme.c:1.4
--- guile/guile-vm/src/vm_scheme.c:1.3  Wed Sep 20 02:29:18 2000
+++ guile/guile-vm/src/vm_scheme.c      Fri Sep 29 11:08:00 2000
@@ -41,8 +41,6 @@
 
 /* This file is included in vm_engine.c */
 
-#include "vm-snarf.h"
-
 SCM_DEFINE_VM_FUNCTION (null_p, "null?", "null?", 1, 0)
 {
   VM_SETUP_ARGS1 ();
Index: guile/guile-vm/src/vm_system.c
diff -u guile/guile-vm/src/vm_system.c:1.10 guile/guile-vm/src/vm_system.c:1.11
--- guile/guile-vm/src/vm_system.c:1.10 Fri Sep 22 04:08:17 2000
+++ guile/guile-vm/src/vm_system.c      Fri Sep 29 11:08:00 2000
@@ -41,8 +41,6 @@
 
 /* This file is included in vm_engine.c */
 
-#include "vm-snarf.h"
-
 /*
  * Variable access
  */