diff options
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/frames.c | 2 | ||||
-rw-r--r-- | libguile/instructions.c | 10 | ||||
-rw-r--r-- | libguile/instructions.h | 8 | ||||
-rw-r--r-- | libguile/objcodes.c | 2 | ||||
-rw-r--r-- | libguile/programs.c | 2 | ||||
-rw-r--r-- | libguile/stacks.c | 1 | ||||
-rw-r--r-- | libguile/vm-engine.c | 8 | ||||
-rw-r--r-- | libguile/vm-expand.h | 4 | ||||
-rw-r--r-- | libguile/vm.c | 2 |
9 files changed, 19 insertions, 20 deletions
diff --git a/libguile/frames.c b/libguile/frames.c index 8a307f1ea..647cb608d 100644 --- a/libguile/frames.c +++ b/libguile/frames.c @@ -305,7 +305,7 @@ scm_init_frames (void) scm_bootstrap_vm (); #ifndef SCM_MAGIC_SNARFER -#include "frames.x" +#include "libguile/frames.x" #endif } diff --git a/libguile/instructions.c b/libguile/instructions.c index a19b158dc..b33c8d203 100644 --- a/libguile/instructions.c +++ b/libguile/instructions.c @@ -79,10 +79,10 @@ fetch_instruction_table () table = malloc (bytes); memset (table, 0, bytes); #define VM_INSTRUCTION_TO_TABLE 1 -#include "vm-expand.h" -#include "vm-i-system.i" -#include "vm-i-scheme.i" -#include "vm-i-loader.i" +#include <libguile/vm-expand.h> +#include <libguile/vm-i-system.i> +#include <libguile/vm-i-scheme.i> +#include <libguile/vm-i-loader.i> #undef VM_INSTRUCTION_TO_TABLE for (i = 0; i < scm_op_last; i++) { @@ -223,7 +223,7 @@ scm_init_instructions (void) scm_bootstrap_vm (); #ifndef SCM_MAGIC_SNARFER -#include "instructions.x" +#include "libguile/instructions.x" #endif } diff --git a/libguile/instructions.h b/libguile/instructions.h index 5de45ad9c..4968671b5 100644 --- a/libguile/instructions.h +++ b/libguile/instructions.h @@ -49,10 +49,10 @@ enum scm_opcode { #define VM_INSTRUCTION_TO_OPCODE 1 -#include "vm-expand.h" -#include "vm-i-system.i" -#include "vm-i-scheme.i" -#include "vm-i-loader.i" +#include <libguile/vm-expand.h> +#include <libguile/vm-i-system.i> +#include <libguile/vm-i-scheme.i> +#include <libguile/vm-i-loader.i> #undef VM_INSTRUCTION_TO_OPCODE scm_op_last = SCM_VM_NUM_INSTRUCTIONS }; diff --git a/libguile/objcodes.c b/libguile/objcodes.c index 1c1f2d789..48ac80749 100644 --- a/libguile/objcodes.c +++ b/libguile/objcodes.c @@ -282,7 +282,7 @@ scm_init_objcodes (void) scm_bootstrap_vm (); #ifndef SCM_MAGIC_SNARFER -#include "objcodes.x" +#include "libguile/objcodes.x" #endif scm_c_define ("word-size", scm_from_size_t (sizeof(SCM))); diff --git a/libguile/programs.c b/libguile/programs.c index 50b1b624b..1d6318c6c 100644 --- a/libguile/programs.c +++ b/libguile/programs.c @@ -376,7 +376,7 @@ scm_init_programs (void) scm_bootstrap_vm (); #ifndef SCM_MAGIC_SNARFER -#include "programs.x" +#include "libguile/programs.x" #endif } diff --git a/libguile/stacks.c b/libguile/stacks.c index 5b2eea99d..69fb3406a 100644 --- a/libguile/stacks.c +++ b/libguile/stacks.c @@ -34,7 +34,6 @@ #include "libguile/strings.h" #include "libguile/vm.h" /* to capture vm stacks */ #include "libguile/frames.h" /* vm frames */ -#include "libguile/instructions.h" /* scm_op_halt */ #include "libguile/validate.h" #include "libguile/stacks.h" diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 175314ce1..58ed43db6 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -103,10 +103,10 @@ VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, int nargs) for (i = 0; i < SCM_VM_NUM_INSTRUCTIONS; i++) jump_table[i] = &&vm_error_bad_instruction; #define VM_INSTRUCTION_TO_LABEL 1 -#include "vm-expand.h" -#include "vm-i-system.i" -#include "vm-i-scheme.i" -#include "vm-i-loader.i" +#include <libguile/vm-expand.h> +#include <libguile/vm-i-system.i> +#include <libguile/vm-i-scheme.i> +#include <libguile/vm-i-loader.i> #undef VM_INSTRUCTION_TO_LABEL } #endif 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 diff --git a/libguile/vm.c b/libguile/vm.c index ca60fc7f2..0646becdb 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -671,7 +671,7 @@ scm_init_vm (void) scm_bootstrap_vm (); #ifndef SCM_MAGIC_SNARFER -#include "vm.x" +#include "libguile/vm.x" #endif } |