summaryrefslogtreecommitdiff
path: root/libguile/vm-expand.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-03-16 23:39:29 +0100
committerAndy Wingo <wingo@oblong.net>2009-03-17 16:47:55 +0100
commitaeeff258c6502f9995aa97f3806a1069c4ddc7d1 (patch)
tree7d630ed1b04e69d0d12463a745aad13987ccddc5 /libguile/vm-expand.h
parent8992a9e318eb7b86920133eba8aa64d5b6bf7bfd (diff)
downloadguile-aeeff258c6502f9995aa97f3806a1069c4ddc7d1.tar.gz
non-srcdir build fixes
* guile-tools.in: Fix the checks to account for non-srcdir builds. * libguile/frames.c: * libguile/objcodes.c: * libguile/programs.c: * libguile/instructions.c: * libguile/vm.c: Fix snarf-includes to cope with non-srcdir builds. * libguile/instructions.h: * libguile/instructions.c: Fix the stubs inclusion to be non-srcdir compatible. * libguile/vm-expand.h (VM_DEFINE_INSTRUCTION): Fix some things so as not to require the instructions.h defintitions, since we have the codes already. Not important tho :) * pre-inst-guile-env.in: Minor tweak that should have no effect. * test-suite/standalone/Makefile.am (all-local): Remove a chmod +x step, the configure.ac rule should do that if necessary.
Diffstat (limited to 'libguile/vm-expand.h')
-rw-r--r--libguile/vm-expand.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/vm-expand.h b/libguile/vm-expand.h
index ef69352c3..7ad2b9da8 100644
--- a/libguile/vm-expand.h
+++ b/libguile/vm-expand.h
@@ -65,7 +65,7 @@
*/
#ifdef VM_INSTRUCTION_TO_TABLE
#define VM_DEFINE_INSTRUCTION(code_,tag_,name_,len_,npop_,npush_) \
- table[VM_OPCODE (tag_)].opcode = VM_OPCODE (tag_); \
+ table[VM_OPCODE (tag_)].opcode = code_; \
table[VM_OPCODE (tag_)].name = name_; \
table[VM_OPCODE (tag_)].len = len_; \
table[VM_OPCODE (tag_)].npop = npop_; \
@@ -76,7 +76,7 @@
/*
* These will go to jump_table in vm_engine.c
*/
-#define VM_DEFINE_INSTRUCTION(code,tag,name,len,npop,npush) jump_table[VM_OPCODE (tag)] = VM_ADDR (tag);
+#define VM_DEFINE_INSTRUCTION(code,tag,name,len,npop,npush) jump_table[code] = VM_ADDR (tag);
#else
#ifdef VM_INSTRUCTION_TO_OPCODE