From aeeff258c6502f9995aa97f3806a1069c4ddc7d1 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 16 Mar 2009 23:39:29 +0100 Subject: 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. --- libguile/vm-expand.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libguile/vm-expand.h') 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 -- cgit v1.2.3