changed the include structure of the build system.

diff --git a/phpext/prpa/prpa.c b/phpext/prpa/prpa.c
index c1c6ba8..a493b6f 100644 (file)
--- a/phpext/prpa/prpa.c
+++ b/phpext/prpa/prpa.c
@@ -25,13 +25,13 @@
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
-#include "php_prpa.h"
+#include "php_prpa/rpa.h"
 #include "TSRM/TSRM.h"
-#include "rpadbex.h"
-#include "rpastat.h"
-#include "rpastatpriv.h"
-#include "rpaerror.h"
-#include "rparecord.h"
+#include "rpa/rpadbex.h"
+#include "rpa/rpastat.h"
+#include "rpa/rpastatpriv.h"
+#include "rpa/rpaerror.h"
+#include "rpa/rparecord.h"
 
 typedef struct _php_rpa_dbex {
        rpadbex_t* dbex;
@@ -58,7 +58,7 @@ static void php_rpa_dbex_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 static void php_rpa_stat_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 
 
-/* If you declare any globals in php_prpa.h uncomment this:
+/* If you declare any globals in php_prpa/rpa.h uncomment this:
 ZEND_DECLARE_MODULE_GLOBALS(prpa)
 */
 

diff --git a/rgrep/build/linux/rgrep.mk b/rgrep/build/linux/rgrep.mk
index 6076d1f..7f93675 100644 (file)
--- a/rgrep/build/linux/rgrep.mk
+++ b/rgrep/build/linux/rgrep.mk
@@ -3,7 +3,7 @@ RLIB_SRCDIR = $(SRCDIR)/rlib
 RVM_SRCDIR = $(SRCDIR)/rvm
 RPA_SRCDIR = $(SRCDIR)/rpa
 RGREP_SRCDIR = $(SRCDIR)/rgrep
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RPA_SRCDIR) -I$(RGREP_SRCDIR) -I$(RGREP_SRCDIR)/unix
+INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(RGREP_SRCDIR) -I$(RGREP_SRCDIR)/unix
 
 
 LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 

diff --git a/rgrep/rpagrep.h b/rgrep/rpagrep.h
index e686681..ea05283 100644 (file)
--- a/rgrep/rpagrep.h
+++ b/rgrep/rpagrep.h
@@ -23,9 +23,9 @@
 #define _RPAGREP_H_
 
 #include <stdio.h>
-#include "rpaerror.h"
-#include "rpadbex.h"
-#include "rpastatpriv.h"
+#include "rpa/rpaerror.h"
+#include "rpa/rpadbex.h"
+#include "rpa/rpastatpriv.h"
 
 
 #ifdef __cplusplus

diff --git a/rgrep/unix/main.c b/rgrep/unix/main.c
index 9908f18..d90b5c8 100644 (file)
--- a/rgrep/unix/main.c
+++ b/rgrep/unix/main.c
@@ -29,9 +29,9 @@
 #include <stdlib.h>
 #include <wchar.h>
 #include <time.h>
-#include "rmem.h"
-#include "rarray.h"
-#include "rpadbex.h"
+#include "rlib/rmem.h"
+#include "rlib/rarray.h"
+#include "rpa/rpadbex.h"
 #include "rpagrep.h"
 #include "rpagrepdep.h"
 

diff --git a/rjs/build/linux/rjs.mk b/rjs/build/linux/rjs.mk
index 3ef88be..9eceb6b 100644 (file)
--- a/rjs/build/linux/rjs.mk
+++ b/rjs/build/linux/rjs.mk
@@ -6,7 +6,7 @@ RJS_LIB = $(OUTDIR)/librjs.a
 RJS_SO = $(OUTDIR)/librjs.so.1.0
 RJS_EXEC = $(OUTDIR)/rjsexec
 
-CFLAGS += -I$(RVM_SRCDIR)/config -I$(SRCDIR)/rlib -I$(RVM_SRCDIR) -I$(RPA_SRCDIR) -I$(RJS_SRCDIR) -I$(RJS_SRCDIR)/linux
+CFLAGS += -I$(SRCDIR) -I$(RVM_SRCDIR)/config -I$(SRCDIR)/rlib -I$(RJS_SRCDIR)/linux
 
 LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 

diff --git a/rjs/linux/rjsrules.c b/rjs/linux/rjsrules.c
index e2d5894..7677abb 100644 (file)
--- a/rjs/linux/rjsrules.c
+++ b/rjs/linux/rjsrules.c
@@ -1,4 +1,4 @@
-#include "rjsrules.h"
+#include "rjs/linux/rjsrules.h"
 
 
 extern char _binary_____________rjs_ecma262_rpa_start[];

diff --git a/rjs/rjs.c b/rjs/rjs.c
index f251811..ca77527 100644 (file)
--- a/rjs/rjs.c
+++ b/rjs/rjs.c
@@ -1,8 +1,8 @@
 #include <stdarg.h>
-#include "rmem.h"
-#include "rmap.h"
-#include "rjs.h"
-#include "rvmcodegen.h"
+#include "rlib/rmem.h"
+#include "rlib/rmap.h"
+#include "rjs/rjs.h"
+#include "rvm/rvmcodegen.h"
 
 
 static void rjs_engine_print(rvmcpu_t *cpu, rvm_asmins_t *ins);

diff --git a/rjs/rjs.h b/rjs/rjs.h
index f44bbf2..70bfbae 100644 (file)
--- a/rjs/rjs.h
+++ b/rjs/rjs.h
@@ -8,10 +8,10 @@ extern "C" {
 
 #include <stdarg.h>
 #include "rtypes.h"
-#include "rvmcpu.h"
-#include "rjsparser.h"
-#include "rjscompiler.h"
-#include "rjserror.h"
+#include "rvm/rvmcpu.h"
+#include "rjs/rjsparser.h"
+#include "rjs/rjscompiler.h"
+#include "rjs/rjserror.h"
 
 
 typedef struct rjs_engine_s {

diff --git a/rjs/rjscompiler.c b/rjs/rjscompiler.c
index 18e5d38..da29089 100644 (file)
--- a/rjs/rjscompiler.c
+++ b/rjs/rjscompiler.c
@@ -1,6 +1,6 @@
-#include "rmem.h"
-#include "rjscompiler.h"
-#include "rjsparser.h"
+#include "rlib/rmem.h"
+#include "rjs/rjscompiler.h"
+#include "rjs/rjsparser.h"
 
 
 rinteger rjs_compiler_playreversechildrecords(rjs_compiler_t *co, rarray_t *records, rlong rec);

diff --git a/rjs/rjscompiler.h b/rjs/rjscompiler.h
index 6db8ae2..6859028 100644 (file)
--- a/rjs/rjscompiler.h
+++ b/rjs/rjscompiler.h
@@ -7,13 +7,13 @@ extern "C" {
 #endif
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rvmcodegen.h"
-#include "rvmscope.h"
-#include "rvmcpu.h"
-#include "rjsuids.h"
-#include "rparecord.h"
-#include "rjserror.h"
+#include "rlib/rarray.h"
+#include "rvm/rvmcodegen.h"
+#include "rvm/rvmscope.h"
+#include "rvm/rvmcpu.h"
+#include "rjs/rjsuids.h"
+#include "rpa/rparecord.h"
+#include "rjs/rjserror.h"
 
 #define RJS_COMPILER_NHANDLERS 128
 #define RJS_COMPILER_CODEGENKEEP (1 << 0)

diff --git a/rjs/rjsexec.c b/rjs/rjsexec.c
index 66cda1a..224b5cd 100644 (file)
--- a/rjs/rjsexec.c
+++ b/rjs/rjsexec.c
@@ -7,10 +7,10 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-#include "rstring.h"
-#include "rmem.h"
-#include "rjs.h"
-#include "rparecord.h"
+#include "rlib/rstring.h"
+#include "rlib/rmem.h"
+#include "rjs/rjs.h"
+#include "rpa/rparecord.h"
 
 
 static int debuginfo = 0;

diff --git a/rjs/rjsparser.c b/rjs/rjsparser.c
index 377d992..560466b 100644 (file)
--- a/rjs/rjsparser.c
+++ b/rjs/rjsparser.c
@@ -1,7 +1,7 @@
-#include "rmem.h"
-#include "rjsrules.h"
-#include "rjsparser.h"
-#include "rjserror.h"
+#include "rlib/rmem.h"
+#include "rjs/linux/rjsrules.h"
+#include "rjs/rjsparser.h"
+#include "rjs/rjserror.h"
 
 
 void rjs_parser_dbex_error(rjs_parser_t *parser)

diff --git a/rjs/rjsparser.h b/rjs/rjsparser.h
index af3ccca..f7fb212 100644 (file)
--- a/rjs/rjsparser.h
+++ b/rjs/rjsparser.h
@@ -7,10 +7,10 @@ extern "C" {
 #endif
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rvmcpu.h"
-#include "rpa.h"
-#include "rjserror.h"
+#include "rlib/rarray.h"
+#include "rvm/rvmcpu.h"
+#include "rpa/rpa.h"
+#include "rjs/rjserror.h"
 
 
 typedef struct rjs_parser_s {

diff --git a/rlib/build/linux/rlib.mk b/rlib/build/linux/rlib.mk
index a75eff2..16dcd2a 100644 (file)
--- a/rlib/build/linux/rlib.mk
+++ b/rlib/build/linux/rlib.mk
@@ -8,6 +8,7 @@ RLIB_LIB = librlib.a
 TARGET_RLIB_LIB = $(OUTDIR)/$(RLIB_LIB)
 TARGET_RLIB_SO = $(OUTDIR)/$(RLIB_SO)
 
+CFLAGS += -I$(SRCDIR)
 
 RLIB_OBJECTS +=        $(OUTDIR)/rref.o
 RLIB_OBJECTS +=        $(OUTDIR)/rcharconv.o

diff --git a/rlib/rarray.c b/rlib/rarray.c
index d6b0b24..07fe62f 100644 (file)
--- a/rlib/rarray.c
+++ b/rlib/rarray.c
@@ -1,5 +1,5 @@
-#include "rarray.h"
-#include "rmem.h"
+#include "rlib/rarray.h"
+#include "rlib/rmem.h"
 
 
 #define MIN_ARRAY_LEN 2

diff --git a/rlib/rarray.h b/rlib/rarray.h
index 53df09f..2d5ad1d 100644 (file)
--- a/rlib/rarray.h
+++ b/rlib/rarray.h
@@ -2,7 +2,7 @@
 #define _RARRAY_H_
 
 #include "rtypes.h"
-#include "robject.h"
+#include "rlib/robject.h"
 
 
 #ifdef __cplusplus

diff --git a/rlib/ratomic.c b/rlib/ratomic.c
index 9f740b2..5a5df2a 100644 (file)
--- a/rlib/ratomic.c
+++ b/rlib/ratomic.c
@@ -1,5 +1,5 @@
 #include "rtypes.h"
-#include "ratomic.h"
+#include "rlib/ratomic.h"
 
 
 rboolean r_atomic_compare_and_exchange(volatile ratomic_t *ptr, ratomic_t oldval, ratomic_t newval)

diff --git a/rlib/rcarray.c b/rlib/rcarray.c
index d073cbc..5c9dc2a 100644 (file)
--- a/rlib/rcarray.c
+++ b/rlib/rcarray.c
@@ -1,5 +1,5 @@
-#include "rcarray.h"
-#include "rmem.h"
+#include "rlib/rcarray.h"
+#include "rlib/rmem.h"
 
 
 static rpointer r_carray_allocate_chunk(rsize_t elt_size)

diff --git a/rlib/rcarray.h b/rlib/rcarray.h
index 7dd0b6e..29594b0 100644 (file)
--- a/rlib/rcarray.h
+++ b/rlib/rcarray.h
@@ -2,8 +2,8 @@
 #define _RCARRAY_H_
 
 #include "rtypes.h"
-#include "robject.h"
-#include "rarray.h"
+#include "rlib/robject.h"
+#include "rlib/rarray.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rlib/rcharconv.c b/rlib/rcharconv.c
index b73c2d4..441aff5 100644 (file)
--- a/rlib/rcharconv.c
+++ b/rlib/rcharconv.c
@@ -18,7 +18,7 @@
  *  Martin Stoilov <martin@rpasearch.com>
  */
 
-#include "rcharconv.h"
+#include "rlib/rcharconv.h"
 
 
 #define LOWANSICHAR(c) (((c) >= 'A' && (c) <= 'Z') ? (c) + ('a' - 'A') : (c))

diff --git a/rlib/rgc.c b/rlib/rgc.c
index 22af00a..e756e2f 100644 (file)
--- a/rlib/rgc.c
+++ b/rlib/rgc.c
@@ -1,4 +1,4 @@
-#include "rgc.h"
+#include "rlib/rgc.h"
 
 
 robject_t *r_gc_init(robject_t *obj, ruint32 type, r_object_cleanupfun cleanup, r_object_copyfun copy)

diff --git a/rlib/rgc.h b/rlib/rgc.h
index 4e5afca..111f76f 100644 (file)
--- a/rlib/rgc.h
+++ b/rlib/rgc.h
@@ -1,8 +1,8 @@
 #ifndef _RASTGC_H_
 #define _RASTGC_H_
 
-#include "robject.h"
-#include "rlist.h"
+#include "rlib/robject.h"
+#include "rlib/rlist.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rlib/rharray.c b/rlib/rharray.c
index 316d3a7..01f7250 100644 (file)
--- a/rlib/rharray.c
+++ b/rlib/rharray.c
@@ -1,6 +1,6 @@
-#include "rharray.h"
-#include "rstring.h"
-#include "rmem.h"
+#include "rlib/rharray.h"
+#include "rlib/rstring.h"
+#include "rlib/rmem.h"
 
 /*
  * Hash array

diff --git a/rlib/rharray.h b/rlib/rharray.h
index 8ed3c02..985b5f1 100644 (file)
--- a/rlib/rharray.h
+++ b/rlib/rharray.h
@@ -2,11 +2,11 @@
 #define _RHARRAY_H_
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rcarray.h"
-#include "rhash.h"
-#include "rstring.h"
-#include "robject.h"
+#include "rlib/rarray.h"
+#include "rlib/rcarray.h"
+#include "rlib/rhash.h"
+#include "rlib/rstring.h"
+#include "rlib/robject.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rlib/rhash.c b/rlib/rhash.c
index 0c3f389..dab3cef 100644 (file)
--- a/rlib/rhash.c
+++ b/rlib/rhash.c
@@ -1,6 +1,6 @@
-#include "rmem.h"
-#include "rstring.h"
-#include "rhash.h"
+#include "rlib/rmem.h"
+#include "rlib/rstring.h"
+#include "rlib/rhash.h"
 
 
 typedef union rhash_value_s {

diff --git a/rlib/rhash.h b/rlib/rhash.h
index 64fa1f5..82d68aa 100644 (file)
--- a/rlib/rhash.h
+++ b/rlib/rhash.h
@@ -2,8 +2,8 @@
 #define _RHASH_H_
 
 #include "rtypes.h"
-#include "robject.h"
-#include "rlist.h"
+#include "rlib/robject.h"
+#include "rlib/rlist.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rlib/rlist.c b/rlib/rlist.c
index 846b94e..db86c13 100644 (file)
--- a/rlib/rlist.c
+++ b/rlib/rlist.c
@@ -1,4 +1,4 @@
-#include "rlist.h"
+#include "rlib/rlist.h"
 
 
 void r_list_init(rlist_t *ptr)

diff --git a/rlib/rmap.c b/rlib/rmap.c
index 872e0c3..5d0c886 100644 (file)
--- a/rlib/rmap.c
+++ b/rlib/rmap.c
@@ -1,7 +1,7 @@
 #include "rtypes.h"
-#include "rmap.h"
-#include "rstring.h"
-#include "rmem.h"
+#include "rlib/rmap.h"
+#include "rlib/rstring.h"
+#include "rlib/rmem.h"
 
 
 typedef struct r_mapnode_s {

diff --git a/rlib/rmap.h b/rlib/rmap.h
index 19ac44f..507c074 100644 (file)
--- a/rlib/rmap.h
+++ b/rlib/rmap.h
@@ -1,12 +1,12 @@
 #ifndef _RMAP_H_
 #define _RMAP_H_
 
-#include "rcarray.h"
-#include "rhash.h"
-#include "rlist.h"
-#include "rstring.h"
-#include "rgc.h"
-#include "robject.h"
+#include "rlib/rcarray.h"
+#include "rlib/rhash.h"
+#include "rlib/rlist.h"
+#include "rlib/rstring.h"
+#include "rlib/rgc.h"
+#include "rlib/robject.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rlib/rmem.c b/rlib/rmem.c
index bc467ba..cec6662 100644 (file)
--- a/rlib/rmem.c
+++ b/rlib/rmem.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "rspinlock.h"
-#include "rmem.h"
+#include "rlib/rspinlock.h"
+#include "rlib/rmem.h"
 
 static rspinlock_t g_lock = R_SPINLOCK_INIT;
 static rsize_t g_allocmem = 0;

diff --git a/rlib/robject.c b/rlib/robject.c
index 567550b..f6732c4 100644 (file)
--- a/rlib/robject.c
+++ b/rlib/robject.c
@@ -1,5 +1,5 @@
-#include "rmem.h"
-#include "robject.h"
+#include "rlib/rmem.h"
+#include "rlib/robject.h"
 
 
 robject_t *r_object_create(rsize_t size)

diff --git a/rlib/robject.h b/rlib/robject.h
index 62d8c21..9f1a3fa 100644 (file)
--- a/rlib/robject.h
+++ b/rlib/robject.h
@@ -2,7 +2,7 @@
 #define _ROBJECT_H_
 
 #include "rtypes.h"
-#include "rlist.h"
+#include "rlib/rlist.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rlib/rref.c b/rlib/rref.c
index c0119a1..033445b 100644 (file)
--- a/rlib/rref.c
+++ b/rlib/rref.c
@@ -1,4 +1,4 @@
-#include "rref.h"
+#include "rlib/rref.h"
 
 
 robject_t *r_ref_init(robject_t *obj, ruint32 objtype, r_object_cleanupfun cleanup, r_object_copyfun copy, ruint32 count, rref_type_t type)

diff --git a/rlib/rref.h b/rlib/rref.h
index 0456844..21d5be7 100644 (file)
--- a/rlib/rref.h
+++ b/rlib/rref.h
@@ -3,8 +3,8 @@
 
 
 #include "rtypes.h"
-#include "robject.h"
-#include "rspinlock.h"
+#include "rlib/robject.h"
+#include "rlib/rspinlock.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rlib/rspinlock.c b/rlib/rspinlock.c
index e4f690b..1099f1a 100644 (file)
--- a/rlib/rspinlock.c
+++ b/rlib/rspinlock.c
@@ -1,5 +1,5 @@
-#include "rspinlock.h"
-#include "ratomic.h"
+#include "rlib/rspinlock.h"
+#include "rlib/ratomic.h"
 
 
 void r_spinlock_init(rspinlock_t *lock)

diff --git a/rlib/rstring.c b/rlib/rstring.c
index d3b7334..9b8c63e 100644 (file)
--- a/rlib/rstring.c
+++ b/rlib/rstring.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "rstring.h"
-#include "rmem.h"
+#include "rlib/rstring.h"
+#include "rlib/rmem.h"
 
 
 rinteger r_strcmp(const rchar *s1, const rchar *s2)

diff --git a/rlib/rstring.h b/rlib/rstring.h
index 0367f8c..124662e 100644 (file)
--- a/rlib/rstring.h
+++ b/rlib/rstring.h
@@ -3,14 +3,14 @@
 
 
 #include "rtypes.h"
-#include "robject.h"
+#include "rlib/robject.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
-#include "rref.h"
+#include "rlib/rref.h"
 
 
 

diff --git a/rlib/rutf.c b/rlib/rutf.c
index 826dd6f..80a5f1d 100644 (file)
--- a/rlib/rutf.c
+++ b/rlib/rutf.c
@@ -18,7 +18,7 @@
  *  Martin Stoilov <martin@rpasearch.com>
  */
 
-#include "rutf.h"
+#include "rlib/rutf.h"
 
 
 rinteger r_utf8_mbtowc(ruint32 *pwc, const ruchar *input, const ruchar *end)

diff --git a/rpa/build/linux/rpa.mk b/rpa/build/linux/rpa.mk
index 5869c19..2a96973 100644 (file)
--- a/rpa/build/linux/rpa.mk
+++ b/rpa/build/linux/rpa.mk
@@ -8,7 +8,7 @@ TARGET_RPA_LIB = $(OUTDIR)/$(RPA_LIB)
 TARGET_RPA_SO = $(OUTDIR)/$(RPA_SO)
 
 
-CFLAGS += -I$(RVM_SRCDIR)/config -I$(SRCDIR)/rlib -I$(SRCDIR)/rvm
+CFLAGS += -I$(SRCDIR)
 
 RPA_OBJECTS =  \
        $(OUTDIR)/rpacache.o \

diff --git a/rpa/doc/example/personname/personname.c b/rpa/doc/example/personname/personname.c
new file mode 100644 (file)
index 0000000..2401181
--- /dev/null
+++ b/rpa/doc/example/personname/personname.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include "rpa/rpa/rpa.h"
+
+
+int main(int argc, char *argv[])
+{
+       rpadbex_t *dbex;
+       rpastat_t *stat;
+       char name[] = "John M. Smith";
+       char bnf[] = 
+               "first  ::= [A-Za-z]+\n"
+               "middle ::= [A-Za-z]+ '.'?\n"
+               "last   ::= [A-Za-z]+\n"
+               "name   ::= <first> ' ' <middle> ' ' <last>\n";
+
+       dbex = rpa_dbex_create();
+       rpa_dbex_load(dbex, bnf);
+       rpa_dbex_close(dbex);
+       rpa_dbex_compile(dbex);
+
+
+       return 0;
+}

diff --git a/rpa/rpa.h b/rpa/rpa.h
index 7bd71e1..ad78f71 100644 (file)
--- a/rpa/rpa.h
+++ b/rpa/rpa.h
@@ -21,9 +21,9 @@
 #ifndef _RPA_H_
 #define _RPA_H_
 
-#include "rpaerror.h"
-#include "rpadbex.h"
-#include "rpastat.h"
+#include "rpa/rpaerror.h"
+#include "rpa/rpadbex.h"
+#include "rpa/rpastat.h"
 
 
 #endif

diff --git a/rpa/rpacache.c b/rpa/rpacache.c
index 3de762d..877517c 100644 (file)
--- a/rpa/rpacache.c
+++ b/rpa/rpacache.c
@@ -1,6 +1,6 @@
-#include "rpacache.h"
-#include "rmem.h"
-#include "rparecord.h"
+#include "rpa/rpacache.h"
+#include "rlib/rmem.h"
+#include "rpa/rparecord.h"
 
 #define RPA_MCACHE_BUCKET(_top_, _ruleid_) ( ( (((rulong)(_top_))<<3) ^ ((((rulong)(_ruleid_))>>5)) ) & RPA_MCACHE_MASK)
 

diff --git a/rpa/rpacache.h b/rpa/rpacache.h
index d768696..ddffc80 100644 (file)
--- a/rpa/rpacache.h
+++ b/rpa/rpacache.h
@@ -2,8 +2,8 @@
 #define _RPACACHE_H_
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rparecord.h"
+#include "rlib/rarray.h"
+#include "rpa/rparecord.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rpa/rpacompiler.c b/rpa/rpacompiler.c
index 5c76074..f13092a 100644 (file)
--- a/rpa/rpacompiler.c
+++ b/rpa/rpacompiler.c
@@ -1,6 +1,6 @@
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rstring.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rlib/rstring.h"
 
 
 static rlong rpa_codegen_add_numlabel_s(rvm_codegen_t *cg, const rchar *alphaname, rlong numname)

diff --git a/rpa/rpacompiler.h b/rpa/rpacompiler.h
index 31a1648..4cf1555 100644 (file)
--- a/rpa/rpacompiler.h
+++ b/rpa/rpacompiler.h
@@ -1,9 +1,9 @@
 #ifndef _RPACOMPILER_H_
 #define _RPACOMPILER_H_
 
-#include "rvmcodegen.h"
-#include "rvmscope.h"
-#include "rpavm.h"
+#include "rvm/rvmcodegen.h"
+#include "rvm/rvmscope.h"
+#include "rpa/rpavm.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rpa/rpadbex.c b/rpa/rpadbex.c
index 5e03b67..3b12e60 100644 (file)
--- a/rpa/rpadbex.c
+++ b/rpa/rpadbex.c
@@ -2,13 +2,13 @@
  *\file rpadbex.c
  */
 
-#include "rpacompiler.h"
-#include "rpadbex.h"
-#include "rpastatpriv.h"
-#include "rpaparser.h"
-#include "rpaoptimization.h"
-#include "rmem.h"
-#include "rutf.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpadbex.h"
+#include "rpa/rpastatpriv.h"
+#include "rpa/rpaparser.h"
+#include "rpa/rpaoptimization.h"
+#include "rlib/rmem.h"
+#include "rlib/rutf.h"
 
 typedef rinteger (*rpa_dbex_recordhandler)(rpadbex_t *dbex, rlong rec);
 

diff --git a/rpa/rpadbex.h b/rpa/rpadbex.h
index 7175b7f..4615275 100644 (file)
--- a/rpa/rpadbex.h
+++ b/rpa/rpadbex.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file rpadbex.h
+ * \file rpa/rpadbex.h
  * \brief The public interface to BNF productions database API
  *
  *
@@ -36,8 +36,8 @@ extern "C" {
 #endif
 
 #include "rtypes.h"
-#include "rvmcpu.h"
-#include "rpaerror.h"
+#include "rvm/rvmcpu.h"
+#include "rpa/rpaerror.h"
 
 
 /**

diff --git a/rpa/rpaerror.h b/rpa/rpaerror.h
index 4ecfd4e..a81cd75 100644 (file)
--- a/rpa/rpaerror.h
+++ b/rpa/rpaerror.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file rpaerror.h
+ * \file rpa/rpaerror.h
  * \brief The public interface for examining errors.
  *
  *

diff --git a/rpa/rpaoptimization.c b/rpa/rpaoptimization.c
index 992cf6e..19e3ec7 100644 (file)
--- a/rpa/rpaoptimization.c
+++ b/rpa/rpaoptimization.c
@@ -1,5 +1,5 @@
-#include "rpaoptimization.h"
-#include "rpaparser.h"
+#include "rpa/rpaoptimization.h"
+#include "rpa/rpaparser.h"
 
 
 static rlong rpa_copy_handler(rarray_t *records, rlong rec, rpointer userdata)

diff --git a/rpa/rpaoptimization.h b/rpa/rpaoptimization.h
index 813a814..e4919fa 100644 (file)
--- a/rpa/rpaoptimization.h
+++ b/rpa/rpaoptimization.h
@@ -1,7 +1,7 @@
 #ifndef _RPAOPTIMIZATION_H_
 #define _RPAOPTIMIZATION_H_
 
-#include "rparecord.h"
+#include "rpa/rparecord.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rpa/rpaparser.c b/rpa/rpaparser.c
index 4b113e4..8133da3 100644 (file)
--- a/rpa/rpaparser.c
+++ b/rpa/rpaparser.c
@@ -1,8 +1,8 @@
-#include "rmem.h"
-#include "rvmcodegen.h"
-#include "rstring.h"
-#include "rpaparser.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rvm/rvmcodegen.h"
+#include "rlib/rstring.h"
+#include "rpa/rpaparser.h"
+#include "rpa/rpastatpriv.h"
 
 static rinteger rpa_parser_init(rpa_parser_t *pa);
 

diff --git a/rpa/rpaparser.h b/rpa/rpaparser.h
index 6aefcef..2167451 100644 (file)
--- a/rpa/rpaparser.h
+++ b/rpa/rpaparser.h
@@ -1,8 +1,8 @@
 #ifndef _RPAPARSER_H_
 #define _RPAPARSER_H_
 
-#include "rpacompiler.h"
-#include "rpastat.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastat.h"
 
 #define RPA_PARSER_STACK 8196
 

diff --git a/rpa/rparecord.c b/rpa/rparecord.c
index 039bd9b..0a0a78e 100644 (file)
--- a/rpa/rparecord.c
+++ b/rpa/rparecord.c
@@ -1,7 +1,7 @@
-#include "rmem.h"
-#include "rstring.h"
-#include "rpaparser.h"
-#include "rparecord.h"
+#include "rlib/rmem.h"
+#include "rlib/rstring.h"
+#include "rpa/rpaparser.h"
+#include "rpa/rparecord.h"
 
 
 rparecord_t *rpa_record_get(rarray_t *records, rlong rec)

diff --git a/rpa/rparecord.h b/rpa/rparecord.h
index 4cf7ce1..b283205 100644 (file)
--- a/rpa/rparecord.h
+++ b/rpa/rparecord.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file rparecord.h
+ * \file rpa/rparecord.h
  * \brief The public interface for working with Abstract Syntax Tree (AST), produced by @ref rpa_stat_parse.
  *
  *
@@ -63,9 +63,9 @@
 #define _RPARECORD_H_
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rlist.h"
-#include "rpavm.h"
+#include "rlib/rarray.h"
+#include "rlib/rlist.h"
+#include "rpa/rpavm.h"
 
 
 #ifdef __cplusplus
@@ -89,7 +89,7 @@ typedef rlong (*rpa_recordtree_callback)(rarray_t *records, rlong rec, rpointer
 
 
 /**
- * \struct rparecord_s <rparecord.h> <rparecord.h>
+ * \struct rparecord_s <rpa/rparecord.h> <rpa/rparecord.h>
  * \brief Abstract Syntax Tree (AST) construction element.
  */
 struct rparecord_s {

diff --git a/rpa/rpastat.c b/rpa/rpastat.c
index e43d919..4f91c4d 100644 (file)
--- a/rpa/rpastat.c
+++ b/rpa/rpastat.c
@@ -1,10 +1,10 @@
-#include "rmem.h"
-#include "rarray.h"
-#include "rpastatpriv.h"
-#include "rvmcodegen.h"
-#include "rvmcpu.h"
-#include "rutf.h"
-#include "rcharconv.h"
+#include "rlib/rmem.h"
+#include "rlib/rarray.h"
+#include "rpa/rpastatpriv.h"
+#include "rvm/rvmcodegen.h"
+#include "rvm/rvmcpu.h"
+#include "rlib/rutf.h"
+#include "rlib/rcharconv.h"
 
 
 rpastat_t *rpa_stat_create(rpadbex_t *dbex, rulong stacksize)

diff --git a/rpa/rpastat.h b/rpa/rpastat.h
index bc789c0..6d6658a 100644 (file)
--- a/rpa/rpastat.h
+++ b/rpa/rpastat.h
@@ -2,9 +2,9 @@
 #define _RPASTAT_H_
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rvmreg.h"
-#include "rpadbex.h"
+#include "rlib/rarray.h"
+#include "rvm/rvmreg.h"
+#include "rpa/rpadbex.h"
 
 #define RPA_ENCODING_UTF8 0
 #define RPA_ENCODING_BYTE 1
@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 /**
- * \file rpastat.h
+ * \file rpa/rpastat.h
  * \brief The public interface to the execution context.
  *
  *

diff --git a/rpa/rpastatpriv.h b/rpa/rpastatpriv.h
index 282c1c5..f16a315 100644 (file)
--- a/rpa/rpastatpriv.h
+++ b/rpa/rpastatpriv.h
@@ -2,12 +2,12 @@
 #define _RPASTATPRIV_H_
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rvmreg.h"
-#include "rpavm.h"
-#include "rpadbex.h"
-#include "rpacache.h"
-#include "rpastat.h"
+#include "rlib/rarray.h"
+#include "rvm/rvmreg.h"
+#include "rpa/rpavm.h"
+#include "rpa/rpadbex.h"
+#include "rpa/rpacache.h"
+#include "rpa/rpastat.h"
 
 
 #ifdef __cplusplus

diff --git a/rpa/rpavm.c b/rpa/rpavm.c
index 4012ac8..53247a3 100644 (file)
--- a/rpa/rpavm.c
+++ b/rpa/rpavm.c
@@ -1,7 +1,7 @@
-#include "rpavm.h"
-#include "rpastatpriv.h"
-#include "rutf.h"
-#include "rmem.h"
+#include "rpa/rpavm.h"
+#include "rpa/rpastatpriv.h"
+#include "rlib/rutf.h"
+#include "rlib/rmem.h"
 
 
 static void rpavm_swi_shift(rvmcpu_t *cpu, rvm_asmins_t *ins)

diff --git a/rpa/rpavm.h b/rpa/rpavm.h
index fe18278..c62d35c 100644 (file)
--- a/rpa/rpavm.h
+++ b/rpa/rpavm.h
@@ -1,8 +1,8 @@
 #ifndef _RPAVM_H_
 #define _RPAVM_H_
 
-#include "rvmcpu.h"
-#include "rparecord.h"
+#include "rvm/rvmcpu.h"
+#include "rpa/rparecord.h"
 
 
 #ifdef __cplusplus

diff --git a/rvm/build/linux/rvm.mk b/rvm/build/linux/rvm.mk
index e164e99..069a073 100644 (file)
--- a/rvm/build/linux/rvm.mk
+++ b/rvm/build/linux/rvm.mk
@@ -7,7 +7,8 @@ RVM_SO = $(RVM_SO_NAME).$(RVM_SO_VERSION)
 TARGET_RVM_LIB = $(OUTDIR)/$(RVM_LIB)
 TARGET_RVM_SO = $(OUTDIR)/$(RVM_SO)
 
-CFLAGS += -I$(RVM_SRCDIR)/config -I$(SRCDIR)/rlib
+CFLAGS += -I$(SRCDIR)
+CFLAGS += -I$(RVM_SRCDIR)/config
 
 
 RVM_OBJECTS += $(OUTDIR)/rvmcpu.o 

diff --git a/rvm/rvmcodegen.c b/rvm/rvmcodegen.c
index b911ad8..121c1fe 100644 (file)
--- a/rvm/rvmcodegen.c
+++ b/rvm/rvmcodegen.c
@@ -1,6 +1,6 @@
-#include "rmem.h"
-#include "rvmcodegen.h"
-#include "rvmcpu.h"
+#include "rlib/rmem.h"
+#include "rvm/rvmcodegen.h"
+#include "rvm/rvmcpu.h"
 
 
 rvm_codegen_t *rvm_codegen_create()

diff --git a/rvm/rvmcodegen.h b/rvm/rvmcodegen.h
index 98c8ae9..7ccd871 100644 (file)
--- a/rvm/rvmcodegen.h
+++ b/rvm/rvmcodegen.h
@@ -2,12 +2,12 @@
 #define _RVMCODEGEN_H_
 
 #include "rtypes.h"
-#include "rvmerror.h"
-#include "rarray.h"
-#include "rhash.h"
-#include "rvmcpu.h"
-#include "rvmcodemap.h"
-#include "rvmrelocmap.h"
+#include "rvm/rvmerror.h"
+#include "rlib/rarray.h"
+#include "rlib/rhash.h"
+#include "rvm/rvmcpu.h"
+#include "rvm/rvmcodemap.h"
+#include "rvm/rvmrelocmap.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmcodemap.c b/rvm/rvmcodemap.c
index 9c86e9f..b5ee08c 100644 (file)
--- a/rvm/rvmcodemap.c
+++ b/rvm/rvmcodemap.c
@@ -1,6 +1,6 @@
-#include "rvmcodemap.h"
-#include "rstring.h"
-#include "rmem.h"
+#include "rvm/rvmcodemap.h"
+#include "rlib/rstring.h"
+#include "rlib/rmem.h"
 
 
 rvm_codemap_t *rvm_codemap_create()

diff --git a/rvm/rvmcodemap.h b/rvm/rvmcodemap.h
index e31b58d..03ec06a 100644 (file)
--- a/rvm/rvmcodemap.h
+++ b/rvm/rvmcodemap.h
@@ -2,10 +2,10 @@
 #define _RVMCODEMAP_H_
 
 #include "rtypes.h"
-#include "rvmcpu.h"
-#include "rarray.h"
-#include "rhash.h"
-#include "rstring.h"
+#include "rvm/rvmcpu.h"
+#include "rlib/rarray.h"
+#include "rlib/rhash.h"
+#include "rlib/rstring.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmcpu.c b/rvm/rvmcpu.c
index 3a3963a..79655b4 100644 (file)
--- a/rvm/rvmcpu.c
+++ b/rvm/rvmcpu.c
@@ -20,17 +20,17 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include "rvmcpu.h"
-#include "rvmoperator.h"
-#include "rvmoperatorbin.h"
-#include "rvmoperatorcast.h"
-#include "rvmoperatornot.h"
-#include "rvmoperatorlogicnot.h"
-#include "rvmcodemap.h"
-#include "rmem.h"
-#include "rstring.h"
-#include "rvmreg.h"
-#include "rmap.h"
+#include "rvm/rvmcpu.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmoperatorbin.h"
+#include "rvm/rvmoperatorcast.h"
+#include "rvm/rvmoperatornot.h"
+#include "rvm/rvmoperatorlogicnot.h"
+#include "rvm/rvmcodemap.h"
+#include "rlib/rmem.h"
+#include "rlib/rstring.h"
+#include "rvm/rvmreg.h"
+#include "rlib/rmap.h"
 
 #define RVM_DEFAULT_STACKSIZE (4 * 1024)
 

diff --git a/rvm/rvmcpu.h b/rvm/rvmcpu.h
index 152d05e..bfd77f2 100644 (file)
--- a/rvm/rvmcpu.h
+++ b/rvm/rvmcpu.h
@@ -22,10 +22,10 @@
 #define _RVMCPU_H_
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rcarray.h"
-#include "rvmreg.h"
-#include "rgc.h"
+#include "rlib/rarray.h"
+#include "rlib/rcarray.h"
+#include "rvm/rvmreg.h"
+#include "rlib/rgc.h"
 
 
 #ifdef __cplusplus

diff --git a/rvm/rvmoperator.c b/rvm/rvmoperator.c
index d7880c4..ce83dc5 100644 (file)
--- a/rvm/rvmoperator.c
+++ b/rvm/rvmoperator.c
@@ -1,5 +1,5 @@
-#include "rmem.h"
-#include "rvmoperator.h"
+#include "rlib/rmem.h"
+#include "rvm/rvmoperator.h"
 
 
 rvm_opmap_t *rvm_opmap_create()

diff --git a/rvm/rvmoperator.h b/rvm/rvmoperator.h
index 2edfc93..5b342fc 100644 (file)
--- a/rvm/rvmoperator.h
+++ b/rvm/rvmoperator.h
@@ -2,8 +2,8 @@
 #define _RVMOPERATOR_H_
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rvmcpu.h"
+#include "rlib/rarray.h"
+#include "rvm/rvmcpu.h"
 
 #define RVM_UNARY_HANDLER(__t__) (__t__)
 #define RVM_OP_HANDLER(__ft__, __st__) ((__ft__) * RVM_DTYPE_MAX + (__st__))

diff --git a/rvm/rvmoperatoradd.c b/rvm/rvmoperatoradd.c
index ebdefa8..187a83d 100644 (file)
--- a/rvm/rvmoperatoradd.c
+++ b/rvm/rvmoperatoradd.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_add_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatoradd.h b/rvm/rvmoperatoradd.h
index 94f7528..ba0c199 100644 (file)
--- a/rvm/rvmoperatoradd.h
+++ b/rvm/rvmoperatoradd.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORADD_H_
 #define __RVMOPERATORADD_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorand.c b/rvm/rvmoperatorand.c
index 396a53c..34871f7 100644 (file)
--- a/rvm/rvmoperatorand.c
+++ b/rvm/rvmoperatorand.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_and_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorand.h b/rvm/rvmoperatorand.h
index 9743fa7..3501ce1 100644 (file)
--- a/rvm/rvmoperatorand.h
+++ b/rvm/rvmoperatorand.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORAND_H_
 #define __RVMOPERATORAND_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorbin.c b/rvm/rvmoperatorbin.c
index d71c7a3..492a2c4 100644 (file)
--- a/rvm/rvmoperatorbin.c
+++ b/rvm/rvmoperatorbin.c
@@ -1,30 +1,30 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
-#include "rvmoperatornot.h"
-#include "rvmoperatorbin.h"
-#include "rvmoperatorlsr.h"
-#include "rvmoperatorlsru.h"
-#include "rvmoperatoreq.h"
-#include "rvmoperatornoteq.h"
-#include "rvmoperatorlogicor.h"
-#include "rvmoperatorlogicand.h"
-#include "rvmoperatorless.h"
-#include "rvmoperatorlesseq.h"
-#include "rvmoperatorgreater.h"
-#include "rvmoperatorgreatereq.h"
-#include "rvmoperatoror.h"
-#include "rvmoperatorxor.h"
-#include "rvmoperatorcast.h"
-#include "rvmoperatorsub.h"
-#include "rvmoperatoradd.h"
-#include "rvmoperatormod.h"
-#include "rvmoperatormul.h"
-#include "rvmoperatorlsl.h"
-#include "rvmoperatorcmn.h"
-#include "rvmoperatorcmp.h"
-#include "rvmoperatorand.h"
-#include "rvmoperatorcat.h"
-#include "rvmoperatordiv.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
+#include "rvm/rvmoperatornot.h"
+#include "rvm/rvmoperatorbin.h"
+#include "rvm/rvmoperatorlsr.h"
+#include "rvm/rvmoperatorlsru.h"
+#include "rvm/rvmoperatoreq.h"
+#include "rvm/rvmoperatornoteq.h"
+#include "rvm/rvmoperatorlogicor.h"
+#include "rvm/rvmoperatorlogicand.h"
+#include "rvm/rvmoperatorless.h"
+#include "rvm/rvmoperatorlesseq.h"
+#include "rvm/rvmoperatorgreater.h"
+#include "rvm/rvmoperatorgreatereq.h"
+#include "rvm/rvmoperatoror.h"
+#include "rvm/rvmoperatorxor.h"
+#include "rvm/rvmoperatorcast.h"
+#include "rvm/rvmoperatorsub.h"
+#include "rvm/rvmoperatoradd.h"
+#include "rvm/rvmoperatormod.h"
+#include "rvm/rvmoperatormul.h"
+#include "rvm/rvmoperatorlsl.h"
+#include "rvm/rvmoperatorcmn.h"
+#include "rvm/rvmoperatorcmp.h"
+#include "rvm/rvmoperatorand.h"
+#include "rvm/rvmoperatorcat.h"
+#include "rvm/rvmoperatordiv.h"
 
 static rvm_binopmap_t binary_operations[RVM_OPID_LAST+1];
 

diff --git a/rvm/rvmoperatorbin.h b/rvm/rvmoperatorbin.h
index f115845..bd79041 100644 (file)
--- a/rvm/rvmoperatorbin.h
+++ b/rvm/rvmoperatorbin.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORBIN_H_
 #define __RVMOPERATORBIN_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorcast.c b/rvm/rvmoperatorcast.c
index 42562e6..22f1b9a 100644 (file)
--- a/rvm/rvmoperatorcast.c
+++ b/rvm/rvmoperatorcast.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_cast_static_static(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, const rvmreg_t *arg1, const rvmreg_t *arg2)

diff --git a/rvm/rvmoperatorcast.h b/rvm/rvmoperatorcast.h
index f4ec406..efe6662 100644 (file)
--- a/rvm/rvmoperatorcast.h
+++ b/rvm/rvmoperatorcast.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORCAST_H_
 #define __RVMOPERATORCAST_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorcat.c b/rvm/rvmoperatorcat.c
index 82da162..10f5828 100644 (file)
--- a/rvm/rvmoperatorcat.c
+++ b/rvm/rvmoperatorcat.c
@@ -1,6 +1,6 @@
-#include "rvmoperator.h"
-#include "rstring.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rlib/rstring.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_cat_string_string(rvmcpu_t *cpu, rvmreg_t *res, const rvmreg_t *arg1, const rvmreg_t *arg2)

diff --git a/rvm/rvmoperatorcat.h b/rvm/rvmoperatorcat.h
index 0f5196b..ec08f71 100644 (file)
--- a/rvm/rvmoperatorcat.h
+++ b/rvm/rvmoperatorcat.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORCAT_H_
 #define __RVMOPERATORCAT_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorcmn.c b/rvm/rvmoperatorcmn.c
index 8e4f095..cfff177 100644 (file)
--- a/rvm/rvmoperatorcmn.c
+++ b/rvm/rvmoperatorcmn.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_cmn_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorcmn.h b/rvm/rvmoperatorcmn.h
index d782175..4ce370d 100644 (file)
--- a/rvm/rvmoperatorcmn.h
+++ b/rvm/rvmoperatorcmn.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORCMN_H_
 #define __RVMOPERATORCMN_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorcmp.c b/rvm/rvmoperatorcmp.c
index 622df2e..fb1598a 100644 (file)
--- a/rvm/rvmoperatorcmp.c
+++ b/rvm/rvmoperatorcmp.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_cmp_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorcmp.h b/rvm/rvmoperatorcmp.h
index b557565..a420781 100644 (file)
--- a/rvm/rvmoperatorcmp.h
+++ b/rvm/rvmoperatorcmp.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORCMP_H_
 #define __RVMOPERATORCMP_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatordiv.c b/rvm/rvmoperatordiv.c
index 828469f..ea21938 100644 (file)
--- a/rvm/rvmoperatordiv.c
+++ b/rvm/rvmoperatordiv.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_div_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatordiv.h b/rvm/rvmoperatordiv.h
index f3c3d54..9bb870a 100644 (file)
--- a/rvm/rvmoperatordiv.h
+++ b/rvm/rvmoperatordiv.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORDIV_H_
 #define __RVMOPERATORDIV_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatoreq.c b/rvm/rvmoperatoreq.c
index 52dd4d3..2d467f7 100644 (file)
--- a/rvm/rvmoperatoreq.c
+++ b/rvm/rvmoperatoreq.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_eq_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatoreq.h b/rvm/rvmoperatoreq.h
index 7ce6725..6f442e3 100644 (file)
--- a/rvm/rvmoperatoreq.h
+++ b/rvm/rvmoperatoreq.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATOREQ_H_
 #define __RVMOPERATOREQ_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorgreater.c b/rvm/rvmoperatorgreater.c
index 61ec64c..b40540d 100644 (file)
--- a/rvm/rvmoperatorgreater.c
+++ b/rvm/rvmoperatorgreater.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_greater_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorgreater.h b/rvm/rvmoperatorgreater.h
index 44f3fa8..e2c1b00 100644 (file)
--- a/rvm/rvmoperatorgreater.h
+++ b/rvm/rvmoperatorgreater.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORGREATER_H_
 #define __RVMOPERATORGREATER_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorgreatereq.c b/rvm/rvmoperatorgreatereq.c
index e153271..fb2d031 100644 (file)
--- a/rvm/rvmoperatorgreatereq.c
+++ b/rvm/rvmoperatorgreatereq.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_greatereq_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorgreatereq.h b/rvm/rvmoperatorgreatereq.h
index 83d8aba..d956aa8 100644 (file)
--- a/rvm/rvmoperatorgreatereq.h
+++ b/rvm/rvmoperatorgreatereq.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORGREATEREQ_H_
 #define __RVMOPERATORMULGREATEREQ_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorless.c b/rvm/rvmoperatorless.c
index 1f287fd..dd0b0fb 100644 (file)
--- a/rvm/rvmoperatorless.c
+++ b/rvm/rvmoperatorless.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_less_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorless.h b/rvm/rvmoperatorless.h
index da7330a..62b9c93 100644 (file)
--- a/rvm/rvmoperatorless.h
+++ b/rvm/rvmoperatorless.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORLESS_H_
 #define __RVMOPERATORLESS_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorlesseq.c b/rvm/rvmoperatorlesseq.c
index 7c772b1..1b95398 100644 (file)
--- a/rvm/rvmoperatorlesseq.c
+++ b/rvm/rvmoperatorlesseq.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_lesseq_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorlesseq.h b/rvm/rvmoperatorlesseq.h
index 945481e..9badc1e 100644 (file)
--- a/rvm/rvmoperatorlesseq.h
+++ b/rvm/rvmoperatorlesseq.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORLESSEQ_H_
 #define __RVMOPERATORLESSEQ_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorlogicand.c b/rvm/rvmoperatorlogicand.c
index 0ea7e66..6f814a8 100644 (file)
--- a/rvm/rvmoperatorlogicand.c
+++ b/rvm/rvmoperatorlogicand.c
@@ -1,6 +1,6 @@
-#include "rvmoperator.h"
-#include "rvmoperatorlogicand.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmoperatorlogicand.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_logicand_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorlogicand.h b/rvm/rvmoperatorlogicand.h
index 9ad59a3..b6be628 100644 (file)
--- a/rvm/rvmoperatorlogicand.h
+++ b/rvm/rvmoperatorlogicand.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORLOGICAND_H_
 #define __RVMOPERATORLOGICAND_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorlogicnot.c b/rvm/rvmoperatorlogicnot.c
index f6dd20d..155af97 100644 (file)
--- a/rvm/rvmoperatorlogicnot.c
+++ b/rvm/rvmoperatorlogicnot.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 static void rvm_op_logicnot_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, const rvmreg_t *arg1)

diff --git a/rvm/rvmoperatorlogicnot.h b/rvm/rvmoperatorlogicnot.h
index 1da9ac5..f57308a 100644 (file)
--- a/rvm/rvmoperatorlogicnot.h
+++ b/rvm/rvmoperatorlogicnot.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORLOGICNOT_H_
 #define __RVMOPERATORLOGICNOT_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorlogicor.c b/rvm/rvmoperatorlogicor.c
index 0118eb1..17e611c 100644 (file)
--- a/rvm/rvmoperatorlogicor.c
+++ b/rvm/rvmoperatorlogicor.c
@@ -1,6 +1,6 @@
-#include "rvmoperator.h"
-#include "rvmoperatorlogicor.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmoperatorlogicor.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_logicor_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorlogicor.h b/rvm/rvmoperatorlogicor.h
index 567fbce..30b7578 100644 (file)
--- a/rvm/rvmoperatorlogicor.h
+++ b/rvm/rvmoperatorlogicor.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORLOGICOR_H_
 #define __RVMOPERATORLOGICOR_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorlsl.c b/rvm/rvmoperatorlsl.c
index 78eb838..82a5dfc 100644 (file)
--- a/rvm/rvmoperatorlsl.c
+++ b/rvm/rvmoperatorlsl.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_lsl_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorlsl.h b/rvm/rvmoperatorlsl.h
index 211f179..279122e 100644 (file)
--- a/rvm/rvmoperatorlsl.h
+++ b/rvm/rvmoperatorlsl.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORLSL_H_
 #define __RVMOPERATORLSL_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorlsr.c b/rvm/rvmoperatorlsr.c
index 2450a72..2246458 100644 (file)
--- a/rvm/rvmoperatorlsr.c
+++ b/rvm/rvmoperatorlsr.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_lsr_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorlsr.h b/rvm/rvmoperatorlsr.h
index 7ffedae..e149a88 100644 (file)
--- a/rvm/rvmoperatorlsr.h
+++ b/rvm/rvmoperatorlsr.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORLSR_H_
 #define __RVMOPERATORLSR_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorlsru.c b/rvm/rvmoperatorlsru.c
index ce48f4c..781ce7e 100644 (file)
--- a/rvm/rvmoperatorlsru.c
+++ b/rvm/rvmoperatorlsru.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_lsru_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorlsru.h b/rvm/rvmoperatorlsru.h
index a96fa82..23bac81 100644 (file)
--- a/rvm/rvmoperatorlsru.h
+++ b/rvm/rvmoperatorlsru.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORLSRU_H_
 #define __RVMOPERATORLSRU_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatormod.c b/rvm/rvmoperatormod.c
index d8d8c95..69291a7 100644 (file)
--- a/rvm/rvmoperatormod.c
+++ b/rvm/rvmoperatormod.c
@@ -1,6 +1,6 @@
-#include "rmath.h"
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rlib/rmath.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_mod_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatormod.h b/rvm/rvmoperatormod.h
index 3a156a0..5fdc75e 100644 (file)
--- a/rvm/rvmoperatormod.h
+++ b/rvm/rvmoperatormod.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORMOD_H_
 #define __RVMOPERATORMOD_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatormul.c b/rvm/rvmoperatormul.c
index b3cab52..f607df8 100644 (file)
--- a/rvm/rvmoperatormul.c
+++ b/rvm/rvmoperatormul.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_mul_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatormul.h b/rvm/rvmoperatormul.h
index 055431c..7750a14 100644 (file)
--- a/rvm/rvmoperatormul.h
+++ b/rvm/rvmoperatormul.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORMUL_H_
 #define __RVMOPERATORMUL_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatornot.c b/rvm/rvmoperatornot.c
index 526c6b4..34a3db9 100644 (file)
--- a/rvm/rvmoperatornot.c
+++ b/rvm/rvmoperatornot.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 static void rvm_op_not_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, const rvmreg_t *arg1)

diff --git a/rvm/rvmoperatornot.h b/rvm/rvmoperatornot.h
index 333d68e..b422f35 100644 (file)
--- a/rvm/rvmoperatornot.h
+++ b/rvm/rvmoperatornot.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORNOT_H_
 #define __RVMOPERATORNOT_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatornoteq.c b/rvm/rvmoperatornoteq.c
index c459f3b..8f5dfb9 100644 (file)
--- a/rvm/rvmoperatornoteq.c
+++ b/rvm/rvmoperatornoteq.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_noteq_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatornoteq.h b/rvm/rvmoperatornoteq.h
index 03f556a..b164cd3 100644 (file)
--- a/rvm/rvmoperatornoteq.h
+++ b/rvm/rvmoperatornoteq.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORNOTEQ_H_
 #define __RVMOPERATORNOTEQ_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatoror.c b/rvm/rvmoperatoror.c
index 25c0441..ac2c744 100644 (file)
--- a/rvm/rvmoperatoror.c
+++ b/rvm/rvmoperatoror.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_or_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatoror.h b/rvm/rvmoperatoror.h
index 305b7e3..b5fdc3a 100644 (file)
--- a/rvm/rvmoperatoror.h
+++ b/rvm/rvmoperatoror.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATOROR_H_
 #define __RVMOPERATOROR_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorsub.c b/rvm/rvmoperatorsub.c
index be133f8..bd94c53 100644 (file)
--- a/rvm/rvmoperatorsub.c
+++ b/rvm/rvmoperatorsub.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_sub_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorsub.h b/rvm/rvmoperatorsub.h
index 340decf..f8c33df 100644 (file)
--- a/rvm/rvmoperatorsub.h
+++ b/rvm/rvmoperatorsub.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORSUB_H_
 #define __RVMOPERATORSUB_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmoperatorxor.c b/rvm/rvmoperatorxor.c
index d139f5f..6ea4558 100644 (file)
--- a/rvm/rvmoperatorxor.c
+++ b/rvm/rvmoperatorxor.c
@@ -1,5 +1,5 @@
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 
 void rvm_op_xor_unsigned(rvmcpu_t *cpu, rushort opid, rvmreg_t *res, rword op1, rword op2)

diff --git a/rvm/rvmoperatorxor.h b/rvm/rvmoperatorxor.h
index 385e1f9..41358e6 100644 (file)
--- a/rvm/rvmoperatorxor.h
+++ b/rvm/rvmoperatorxor.h
@@ -1,8 +1,8 @@
 #ifndef __RVMOPERATORXOR_H_
 #define __RVMOPERATORXOR_H_
 
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmreg.c b/rvm/rvmreg.c
index d63f65d..de8f145 100644 (file)
--- a/rvm/rvmreg.c
+++ b/rvm/rvmreg.c
@@ -1,6 +1,6 @@
-#include "rmem.h"
-#include "rvmreg.h"
-#include "rref.h"
+#include "rlib/rmem.h"
+#include "rvm/rvmreg.h"
+#include "rlib/rref.h"
 
 
 static void rvm_reg_array_oncopy(rarray_t *array)

diff --git a/rvm/rvmreg.h b/rvm/rvmreg.h
index 947a5cb..7aad10c 100644 (file)
--- a/rvm/rvmreg.h
+++ b/rvm/rvmreg.h
@@ -1,13 +1,13 @@
 #ifndef _RVMREG_H_
 #define _RVMREG_H_
 
-//#include "rvmcpu.h"
-#include "robject.h"
-#include "rarray.h"
-#include "rharray.h"
-#include "rcarray.h"
-#include "rmap.h"
-#include "rstring.h"
+//#include "rvm/rvmcpu.h"
+#include "rlib/robject.h"
+#include "rlib/rarray.h"
+#include "rlib/rharray.h"
+#include "rlib/rcarray.h"
+#include "rlib/rmap.h"
+#include "rlib/rstring.h"
 
 
 #ifdef __cplusplus

diff --git a/rvm/rvmrelocmap.c b/rvm/rvmrelocmap.c
index 06e926a..3172b4f 100644 (file)
--- a/rvm/rvmrelocmap.c
+++ b/rvm/rvmrelocmap.c
@@ -1,5 +1,5 @@
-#include "rvmrelocmap.h"
-#include "rmem.h"
+#include "rvm/rvmrelocmap.h"
+#include "rlib/rmem.h"
 
 rvm_relocmap_t *rvm_relocmap_create()
 {

diff --git a/rvm/rvmrelocmap.h b/rvm/rvmrelocmap.h
index 74b1ff3..c2a1ee3 100644 (file)
--- a/rvm/rvmrelocmap.h
+++ b/rvm/rvmrelocmap.h
@@ -2,11 +2,11 @@
 #define _RVMRELOCMAP_H_
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rhash.h"
-#include "rstring.h"
-#include "rvmcpu.h"
-#include "rvmcodemap.h"
+#include "rlib/rarray.h"
+#include "rlib/rhash.h"
+#include "rlib/rstring.h"
+#include "rvm/rvmcpu.h"
+#include "rvm/rvmcodemap.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rvm/rvmscope.c b/rvm/rvmscope.c
index 6833f8b..980e2c2 100644 (file)
--- a/rvm/rvmscope.c
+++ b/rvm/rvmscope.c
@@ -1,6 +1,6 @@
-#include "rvmscope.h"
-#include "rstring.h"
-#include "rmem.h"
+#include "rvm/rvmscope.h"
+#include "rlib/rstring.h"
+#include "rlib/rmem.h"
 
 
 rvm_scope_t *rvm_scope_create()

diff --git a/rvm/rvmscope.h b/rvm/rvmscope.h
index 2ce2d5e..e5ab768 100644 (file)
--- a/rvm/rvmscope.h
+++ b/rvm/rvmscope.h
@@ -2,8 +2,8 @@
 #define _RVMSCOPE_H_
 
 #include "rtypes.h"
-#include "rarray.h"
-#include "rhash.h"
+#include "rlib/rarray.h"
+#include "rlib/rhash.h"
 
 
 #ifdef __cplusplus

diff --git a/tests/testmisc/asm-bl.c b/tests/testmisc/asm-bl.c
index 7524e1d..92c6c57 100644 (file)
--- a/tests/testmisc/asm-bl.c
+++ b/tests/testmisc/asm-bl.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "common.h"
-#include "rvmcodemap.h"
-#include "rvmrelocmap.h"
+#include "rvm/rvmcodemap.h"
+#include "rvm/rvmrelocmap.h"
 
 
        

diff --git a/tests/testmisc/asm-cast.c b/tests/testmisc/asm-cast.c
index b45affd..52f8246 100644 (file)
--- a/tests/testmisc/asm-cast.c
+++ b/tests/testmisc/asm-cast.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
-#include "rstring.h"
-#include "rvmreg.h"
-#include "rvmcpu.h"
+#include "rlib/rstring.h"
+#include "rvm/rvmreg.h"
+#include "rvm/rvmcpu.h"
 #include "common.h"
 
 static void test_swi_print_r(rvmcpu_t *cpu, rvm_asmins_t *ins)

diff --git a/tests/testmisc/asm-eadd.c b/tests/testmisc/asm-eadd.c
index 3f3e16d..da0f36f 100644 (file)
--- a/tests/testmisc/asm-eadd.c
+++ b/tests/testmisc/asm-eadd.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include "common.h"
-#include "rvmreg.h"
+#include "rvm/rvmreg.h"
 
        
 int main(int argc, char *argv[])

diff --git a/tests/testmisc/asm-ecmp.c b/tests/testmisc/asm-ecmp.c
index 677e846..7f0750b 100644 (file)
--- a/tests/testmisc/asm-ecmp.c
+++ b/tests/testmisc/asm-ecmp.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include "common.h"
-#include "rvmreg.h"
+#include "rvm/rvmreg.h"
 
        
 int main(int argc, char *argv[])

diff --git a/tests/testmisc/asm-esub.c b/tests/testmisc/asm-esub.c
index b262827..06b11f5 100644 (file)
--- a/tests/testmisc/asm-esub.c
+++ b/tests/testmisc/asm-esub.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include "common.h"
-#include "rvmreg.h"
+#include "rvm/rvmreg.h"
 
        
 int main(int argc, char *argv[])

diff --git a/tests/testmisc/build/linux/misc-tests.mk b/tests/testmisc/build/linux/misc-tests.mk
index 7c6ae8f..0fea462 100644 (file)
--- a/tests/testmisc/build/linux/misc-tests.mk
+++ b/tests/testmisc/build/linux/misc-tests.mk
@@ -4,7 +4,7 @@ RVM_SRCDIR = $(SRCDIR)/rvm
 RPA_SRCDIR = $(SRCDIR)/rpa
 RAST_SRCDIR = $(SRCDIR)/rast
 TESTS_SRCDIR = $(SRCDIR)/tests/testmisc
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(ROBJECT_SRCDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RPA_SRCDIR)
+INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(RPA_SRCDIR)
 
 LIBS =  -L$(ROBJECT_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 

diff --git a/tests/testmisc/codegen-test.c b/tests/testmisc/codegen-test.c
index d35b2b7..214bd9e 100644 (file)
--- a/tests/testmisc/codegen-test.c
+++ b/tests/testmisc/codegen-test.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rvmcpu.h"
-#include "rvmcodegen.h"
-#include "rvmcodemap.h"
+#include "rvm/rvmcpu.h"
+#include "rvm/rvmcodegen.h"
+#include "rvm/rvmcodemap.h"
 
 
 static void test_swi_print_r(rvmcpu_t *cpu, rvm_asmins_t *ins)

diff --git a/tests/testmisc/codemap-test.c b/tests/testmisc/codemap-test.c
index 01c4528..df2ccc9 100644 (file)
--- a/tests/testmisc/codemap-test.c
+++ b/tests/testmisc/codemap-test.c
@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rstring.h"
-#include "rhash.h"
-#include "rmem.h"
-#include "rvmcodemap.h"
+#include "rlib/rstring.h"
+#include "rlib/rhash.h"
+#include "rlib/rmem.h"
+#include "rvm/rvmcodemap.h"
 
 
 void codelabel_print_info(rvm_codemap_t *codemap, rchar* name)

diff --git a/tests/testmisc/common.h b/tests/testmisc/common.h
index 7410e61..aefdc89 100644 (file)
--- a/tests/testmisc/common.h
+++ b/tests/testmisc/common.h
@@ -1,4 +1,4 @@
-#include "rvmcpu.h"
+#include "rvm/rvmcpu.h"
 #include <stdio.h>
 
 #define EXECDEBUG 1

diff --git a/tests/testmisc/funcarg-test.c b/tests/testmisc/funcarg-test.c
index ce3aea6..51770e6 100644 (file)
--- a/tests/testmisc/funcarg-test.c
+++ b/tests/testmisc/funcarg-test.c
@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rvmcpu.h"
-#include "rvmreg.h"
-#include "rvmcodegen.h"
-#include "rvmcodemap.h"
+#include "rvm/rvmcpu.h"
+#include "rvm/rvmreg.h"
+#include "rvm/rvmcodegen.h"
+#include "rvm/rvmcodemap.h"
 
 
 static void test_swi_print_r(rvmcpu_t *cpu, rvm_asmins_t *ins)

diff --git a/tests/testmisc/loop-test.c b/tests/testmisc/loop-test.c
index 117324f..5caa83a 100644 (file)
--- a/tests/testmisc/loop-test.c
+++ b/tests/testmisc/loop-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "common.h"
-#include "rvmoperator.h"
+#include "rvm/rvmoperator.h"
 
 
 static void rvm_eadd(rvmcpu_t *cpu, rvm_asmins_t *ins)

diff --git a/tests/testmisc/memalloc-test.c b/tests/testmisc/memalloc-test.c
index 119a0a9..8ea4775 100644 (file)
--- a/tests/testmisc/memalloc-test.c
+++ b/tests/testmisc/memalloc-test.c
@@ -1,7 +1,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "rmem.h"
+#include "rlib/rmem.h"
 
 
 #define NUM_THREADS 10

diff --git a/tests/testmisc/opmap-test.c b/tests/testmisc/opmap-test.c
index d8c9bac..b107d1b 100644 (file)
--- a/tests/testmisc/opmap-test.c
+++ b/tests/testmisc/opmap-test.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rvmcpu.h"
-#include "rvmreg.h"
-#include "rvmoperator.h"
+#include "rvm/rvmcpu.h"
+#include "rvm/rvmreg.h"
+#include "rvm/rvmoperator.h"
 
 
 int main(int argc, char *argv[])

diff --git a/tests/testmisc/rarray-test.c b/tests/testmisc/rarray-test.c
index 394c0ce..aaab842 100644 (file)
--- a/tests/testmisc/rarray-test.c
+++ b/tests/testmisc/rarray-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rarray.h"
-#include "rmem.h"
+#include "rlib/rarray.h"
+#include "rlib/rmem.h"
 
 
 static void r_array_addint(rarray_t *array, int elt)

diff --git a/tests/testmisc/rcarray-test.c b/tests/testmisc/rcarray-test.c
index 4cbc2a8..0d28047 100644 (file)
--- a/tests/testmisc/rcarray-test.c
+++ b/tests/testmisc/rcarray-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rcarray.h"
-#include "rmem.h"
+#include "rlib/rcarray.h"
+#include "rlib/rmem.h"
 
 
 static void r_carray_replaceint(rcarray_t *carray, ruinteger index, rinteger elt)

diff --git a/tests/testmisc/rharray-test.c b/tests/testmisc/rharray-test.c
index d482d57..fc1dced 100644 (file)
--- a/tests/testmisc/rharray-test.c
+++ b/tests/testmisc/rharray-test.c
@@ -1,11 +1,11 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rvmcodegen.h"
-#include "rvmreg.h"
+#include "rvm/rvmcodegen.h"
+#include "rvm/rvmreg.h"
 
-#include "rstring.h"
-#include "rmem.h"
-#include "rvmcpu.h"
+#include "rlib/rstring.h"
+#include "rlib/rmem.h"
+#include "rvm/rvmcpu.h"
 
 
 

diff --git a/tests/testmisc/rhash-test.c b/tests/testmisc/rhash-test.c
index 2d0f2f2..fe32f81 100644 (file)
--- a/tests/testmisc/rhash-test.c
+++ b/tests/testmisc/rhash-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rhash.h"
-#include "rmem.h"
+#include "rlib/rhash.h"
+#include "rlib/rmem.h"
 
 
 int main(int argc, char *argv[])

diff --git a/tests/testmisc/rlock-test.c b/tests/testmisc/rlock-test.c
index 9960afa..4e3ea42 100644 (file)
--- a/tests/testmisc/rlock-test.c
+++ b/tests/testmisc/rlock-test.c
@@ -1,7 +1,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "rspinlock.h"
+#include "rlib/rspinlock.h"
 
 #define NUM_THREADS 10
 #define NUM_ITERATIONS 100000

diff --git a/tests/testmisc/rmap-test.c b/tests/testmisc/rmap-test.c
index 662a630..99e4cdf 100644 (file)
--- a/tests/testmisc/rmap-test.c
+++ b/tests/testmisc/rmap-test.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rmem.h"
-#include "rmap.h"
-#include "rstring.h"
+#include "rlib/rmem.h"
+#include "rlib/rmap.h"
+#include "rlib/rstring.h"
 
 
 rlong test_rmap_add(rmap_t *map, const rchar *name, rlong val)

diff --git a/tests/testmisc/robject-ver.c b/tests/testmisc/robject-ver.c
index c6f252a..7fead03 100644 (file)
--- a/tests/testmisc/robject-ver.c
+++ b/tests/testmisc/robject-ver.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "robject.h"
+#include "rlib/robject.h"
 
 typedef struct _RTestStruct {
        int i;

diff --git a/tests/testmisc/rpagen-test.c b/tests/testmisc/rpagen-test.c
index f490d1e..3ebb855 100644 (file)
--- a/tests/testmisc/rpagen-test.c
+++ b/tests/testmisc/rpagen-test.c
@@ -6,15 +6,15 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
+#include "rlib/rmem.h"
 #include "rjsobject.h"
-#include "rvmcpu.h"
-#include "rpadbex.h"
-#include "rpaerror.h"
-#include "rvmcodegen.h"
-#include "rvmcodemap.h"
-#include "rvmscope.h"
-#include "rvmoperator.h"
+#include "rvm/rvmcpu.h"
+#include "rpa/rpadbex.h"
+#include "rpa/rpaerror.h"
+#include "rvm/rvmcodegen.h"
+#include "rvm/rvmcodemap.h"
+#include "rvm/rvmscope.h"
+#include "rvm/rvmoperator.h"
 
 #define DEBUGPRINT 1
 static int debuginfo = 0;

diff --git a/tests/testmisc/rvm-test.c b/tests/testmisc/rvm-test.c
index dc97364..9b210d0 100644 (file)
--- a/tests/testmisc/rvm-test.c
+++ b/tests/testmisc/rvm-test.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rvmcpu.h"
+#include "rvm/rvmcpu.h"
 
 
 static void test_swi_sub(rvmcpu_t *cpu, rvm_asmins_t *ins)

diff --git a/tests/testmisc/scope-test.c b/tests/testmisc/scope-test.c
index af0a285..885ed01 100644 (file)
--- a/tests/testmisc/scope-test.c
+++ b/tests/testmisc/scope-test.c
@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rstring.h"
-#include "rhash.h"
-#include "rmem.h"
-#include "rvmscope.h"
+#include "rlib/rstring.h"
+#include "rlib/rhash.h"
+#include "rlib/rmem.h"
+#include "rvm/rvmscope.h"
 
 
 void print_var_info(rvm_scope_t *scope, rchar* varname)

diff --git a/tests/testmisc/speed-test.c b/tests/testmisc/speed-test.c
index d403ee8..c0d0a40 100644 (file)
--- a/tests/testmisc/speed-test.c
+++ b/tests/testmisc/speed-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "common.h"
-#include "rvmoperator.h"
+#include "rvm/rvmoperator.h"
 
 
 static void rvm_eadd(rvmcpu_t *cpu, rvm_asmins_t *ins)

diff --git a/tests/testmisc/string-test.c b/tests/testmisc/string-test.c
index 6fcacd3..99eacd7 100644 (file)
--- a/tests/testmisc/string-test.c
+++ b/tests/testmisc/string-test.c
@@ -1,11 +1,11 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "rvmcodegen.h"
-#include "rstring.h"
-#include "rmem.h"
-#include "rvmcpu.h"
-#include "rvmreg.h"
-#include "rvmoperator.h"
+#include "rvm/rvmcodegen.h"
+#include "rlib/rstring.h"
+#include "rlib/rmem.h"
+#include "rvm/rvmcpu.h"
+#include "rvm/rvmreg.h"
+#include "rvm/rvmoperator.h"
 
 
 typedef struct rvm_testctx_s {

diff --git a/tests/testrjs/build/linux/testrjs.mk b/tests/testrjs/build/linux/testrjs.mk
index 1f8b6fd..aa7c906 100644 (file)
--- a/tests/testrjs/build/linux/testrjs.mk
+++ b/tests/testrjs/build/linux/testrjs.mk
@@ -4,7 +4,7 @@ RVM_SRCDIR = $(SRCDIR)/rvm
 RPA_SRCDIR = $(SRCDIR)/rpa
 RJS_SRCDIR = $(SRCDIR)/rjs
 TESTS_SRCDIR = $(SRCDIR)/tests/testrjs
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(ROBJECT_SRCDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RJS_SRCDIR) -I$(RPA_SRCDIR) 
+INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
 
 LIBS =  -L$(ROBJECT_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
 LIBS += -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 

diff --git a/tests/testrjs/rjs-args.c b/tests/testrjs/rjs-args.c
index cf811ae..11b4d12 100644 (file)
--- a/tests/testrjs/rjs-args.c
+++ b/tests/testrjs/rjs-args.c
@@ -7,8 +7,8 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-#include "rstring.h"
-#include "rjs.h"
+#include "rlib/rstring.h"
+#include "rjs/rjs.h"
 
 
 int main(int argc, char *argv[])

diff --git a/tests/testrjs/rjs-simple.c b/tests/testrjs/rjs-simple.c
index 91e57de..93ed78e 100644 (file)
--- a/tests/testrjs/rjs-simple.c
+++ b/tests/testrjs/rjs-simple.c
@@ -7,8 +7,8 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-#include "rstring.h"
-#include "rjs.h"
+#include "rlib/rstring.h"
+#include "rjs/rjs.h"
 
 
 int main(int argc, char *argv[])

diff --git a/tests/testrpa/build/linux/testrpa2.mk b/tests/testrpa/build/linux/testrpa2.mk
index 1febc62..45d9c73 100644 (file)
--- a/tests/testrpa/build/linux/testrpa2.mk
+++ b/tests/testrpa/build/linux/testrpa2.mk
@@ -2,7 +2,7 @@ RLIB_SRCDIR = $(SRCDIR)/rlib
 RVM_SRCDIR = $(SRCDIR)/rvm
 RPA_SRCDIR = $(SRCDIR)/rpa
 TESTS_SRCDIR = $(SRCDIR)/tests/testrpa
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(RLIB_SRCDIR) -I$(RVM_SRCDIR) -I$(RPA_SRCDIR)
+INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
 
 
 LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 

diff --git a/tests/testrpa/common.h b/tests/testrpa/common.h
index 1330e18..8b93fed 100644 (file)
--- a/tests/testrpa/common.h
+++ b/tests/testrpa/common.h
@@ -1,4 +1,4 @@
-#include "rvmcpu.h"
+#include "rvm/rvmcpu.h"
 #include <stdio.h>
 
 #define EXECDEBUG 0

diff --git a/tests/testrpa/rpacompiler-altexp.c b/tests/testrpa/rpacompiler-altexp.c
index 6c34ecb..ad79a3c 100644 (file)
--- a/tests/testrpa/rpacompiler-altexp.c
+++ b/tests/testrpa/rpacompiler-altexp.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpacompiler-class.c b/tests/testrpa/rpacompiler-class.c
index aae602b..5130d31 100644 (file)
--- a/tests/testrpa/rpacompiler-class.c
+++ b/tests/testrpa/rpacompiler-class.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpacompiler-exp.c b/tests/testrpa/rpacompiler-exp.c
index bd7c285..b459035 100644 (file)
--- a/tests/testrpa/rpacompiler-exp.c
+++ b/tests/testrpa/rpacompiler-exp.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpacompiler-minusexp.c b/tests/testrpa/rpacompiler-minusexp.c
index 5aab380..9f26ec8 100644 (file)
--- a/tests/testrpa/rpacompiler-minusexp.c
+++ b/tests/testrpa/rpacompiler-minusexp.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpacompiler-notexp.c b/tests/testrpa/rpacompiler-notexp.c
index 512a3dd..a193f37 100644 (file)
--- a/tests/testrpa/rpacompiler-notexp.c
+++ b/tests/testrpa/rpacompiler-notexp.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpacompiler-rule.c b/tests/testrpa/rpacompiler-rule.c
index 0ec3ad7..b648075 100644 (file)
--- a/tests/testrpa/rpacompiler-rule.c
+++ b/tests/testrpa/rpacompiler-rule.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpacompiler-rulealtrec.c b/tests/testrpa/rpacompiler-rulealtrec.c
index b34db45..6999222 100644 (file)
--- a/tests/testrpa/rpacompiler-rulealtrec.c
+++ b/tests/testrpa/rpacompiler-rulealtrec.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpacompiler-ruleloop.c b/tests/testrpa/rpacompiler-ruleloop.c
index 514609d..c99f8bb 100644 (file)
--- a/tests/testrpa/rpacompiler-ruleloop.c
+++ b/tests/testrpa/rpacompiler-ruleloop.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpacompiler-ruleloopcls.c b/tests/testrpa/rpacompiler-ruleloopcls.c
index 198ac5e..e6c2ee9 100644 (file)
--- a/tests/testrpa/rpacompiler-ruleloopcls.c
+++ b/tests/testrpa/rpacompiler-ruleloopcls.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 /*

diff --git a/tests/testrpa/rpacompiler-rulerec.c b/tests/testrpa/rpacompiler-rulerec.c
index d6f08e0..848fc97 100644 (file)
--- a/tests/testrpa/rpacompiler-rulerec.c
+++ b/tests/testrpa/rpacompiler-rulerec.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpaparser-test.c b/tests/testrpa/rpaparser-test.c
index 69cd03f..b0716d2 100644 (file)
--- a/tests/testrpa/rpaparser-test.c
+++ b/tests/testrpa/rpaparser-test.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpaparser.h"
-#include "rpadbex.h"
+#include "rlib/rmem.h"
+#include "rpa/rpaparser.h"
+#include "rpa/rpadbex.h"
 
 
 typedef struct rpa_buffer_s {

diff --git a/tests/testrpa/rpavm-matchchr.c b/tests/testrpa/rpavm-matchchr.c
index e6f668a..1698baf 100644 (file)
--- a/tests/testrpa/rpavm-matchchr.c
+++ b/tests/testrpa/rpavm-matchchr.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpavm-matchrng.c b/tests/testrpa/rpavm-matchrng.c
index 7c67baa..576cf3c 100644 (file)
--- a/tests/testrpa/rpavm-matchrng.c
+++ b/tests/testrpa/rpavm-matchrng.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpavm-mnode.c b/tests/testrpa/rpavm-mnode.c
index 52b3d15..753d2af 100644 (file)
--- a/tests/testrpa/rpavm-mnode.c
+++ b/tests/testrpa/rpavm-mnode.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"
 
 

diff --git a/tests/testrpa/rpavm-ref.c b/tests/testrpa/rpavm-ref.c
index 77e5748..72c91b5 100644 (file)
--- a/tests/testrpa/rpavm-ref.c
+++ b/tests/testrpa/rpavm-ref.c
@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include "rmem.h"
-#include "rpacompiler.h"
-#include "rpastatpriv.h"
+#include "rlib/rmem.h"
+#include "rpa/rpacompiler.h"
+#include "rpa/rpastatpriv.h"
 #include "common.h"