#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;
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)
*/
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
#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
#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"
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
-#include "rjsrules.h"
+#include "rjs/linux/rjsrules.h"
extern char _binary_____________rjs_ecma262_rpa_start[];
#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);
#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 {
-#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);
#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)
#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;
-#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)
#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 {
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
-#include "rarray.h"
-#include "rmem.h"
+#include "rlib/rarray.h"
+#include "rlib/rmem.h"
#define MIN_ARRAY_LEN 2
#define _RARRAY_H_
#include "rtypes.h"
-#include "robject.h"
+#include "rlib/robject.h"
#ifdef __cplusplus
#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)
-#include "rcarray.h"
-#include "rmem.h"
+#include "rlib/rcarray.h"
+#include "rlib/rmem.h"
static rpointer r_carray_allocate_chunk(rsize_t elt_size)
#define _RCARRAY_H_
#include "rtypes.h"
-#include "robject.h"
-#include "rarray.h"
+#include "rlib/robject.h"
+#include "rlib/rarray.h"
#ifdef __cplusplus
extern "C" {
* Martin Stoilov <martin@rpasearch.com>
*/
-#include "rcharconv.h"
+#include "rlib/rcharconv.h"
#define LOWANSICHAR(c) (((c) >= 'A' && (c) <= 'Z') ? (c) + ('a' - 'A') : (c))
-#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)
#ifndef _RASTGC_H_
#define _RASTGC_H_
-#include "robject.h"
-#include "rlist.h"
+#include "rlib/robject.h"
+#include "rlib/rlist.h"
#ifdef __cplusplus
extern "C" {
-#include "rharray.h"
-#include "rstring.h"
-#include "rmem.h"
+#include "rlib/rharray.h"
+#include "rlib/rstring.h"
+#include "rlib/rmem.h"
/*
* Hash array
#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" {
-#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 {
#define _RHASH_H_
#include "rtypes.h"
-#include "robject.h"
-#include "rlist.h"
+#include "rlib/robject.h"
+#include "rlib/rlist.h"
#ifdef __cplusplus
extern "C" {
-#include "rlist.h"
+#include "rlib/rlist.h"
void r_list_init(rlist_t *ptr)
#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 {
#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" {
#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;
-#include "rmem.h"
-#include "robject.h"
+#include "rlib/rmem.h"
+#include "rlib/robject.h"
robject_t *r_object_create(rsize_t size)
#define _ROBJECT_H_
#include "rtypes.h"
-#include "rlist.h"
+#include "rlib/rlist.h"
#ifdef __cplusplus
extern "C" {
-#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)
#include "rtypes.h"
-#include "robject.h"
-#include "rspinlock.h"
+#include "rlib/robject.h"
+#include "rlib/rspinlock.h"
#ifdef __cplusplus
extern "C" {
-#include "rspinlock.h"
-#include "ratomic.h"
+#include "rlib/rspinlock.h"
+#include "rlib/ratomic.h"
void r_spinlock_init(rspinlock_t *lock)
#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)
#include "rtypes.h"
-#include "robject.h"
+#include "rlib/robject.h"
#ifdef __cplusplus
extern "C" {
#endif
-#include "rref.h"
+#include "rlib/rref.h"
* Martin Stoilov <martin@rpasearch.com>
*/
-#include "rutf.h"
+#include "rlib/rutf.h"
rinteger r_utf8_mbtowc(ruint32 *pwc, const ruchar *input, const ruchar *end)
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 \
--- /dev/null
+#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;
+}
#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
-#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)
#define _RPACACHE_H_
#include "rtypes.h"
-#include "rarray.h"
-#include "rparecord.h"
+#include "rlib/rarray.h"
+#include "rpa/rparecord.h"
#ifdef __cplusplus
extern "C" {
-#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)
#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" {
*\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);
*/
/**
- * \file rpadbex.h
+ * \file rpa/rpadbex.h
* \brief The public interface to BNF productions database API
*
*
#endif
#include "rtypes.h"
-#include "rvmcpu.h"
-#include "rpaerror.h"
+#include "rvm/rvmcpu.h"
+#include "rpa/rpaerror.h"
/**
*/
/**
- * \file rpaerror.h
+ * \file rpa/rpaerror.h
* \brief The public interface for examining errors.
*
*
-#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)
#ifndef _RPAOPTIMIZATION_H_
#define _RPAOPTIMIZATION_H_
-#include "rparecord.h"
+#include "rpa/rparecord.h"
#ifdef __cplusplus
extern "C" {
-#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);
#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
-#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)
*/
/**
- * \file rparecord.h
+ * \file rpa/rparecord.h
* \brief The public interface for working with Abstract Syntax Tree (AST), produced by @ref rpa_stat_parse.
*
*
#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
/**
- * \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 {
-#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)
#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
#endif
/**
- * \file rpastat.h
+ * \file rpa/rpastat.h
* \brief The public interface to the execution context.
*
*
#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
-#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)
#ifndef _RPAVM_H_
#define _RPAVM_H_
-#include "rvmcpu.h"
-#include "rparecord.h"
+#include "rvm/rvmcpu.h"
+#include "rpa/rparecord.h"
#ifdef __cplusplus
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
-#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()
#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" {
-#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()
#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" {
#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)
#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
-#include "rmem.h"
-#include "rvmoperator.h"
+#include "rlib/rmem.h"
+#include "rvm/rvmoperator.h"
rvm_opmap_t *rvm_opmap_create()
#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__))
-#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)
#ifndef __RVMOPERATORADD_H_
#define __RVMOPERATORADD_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORAND_H_
#define __RVMOPERATORAND_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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];
#ifndef __RVMOPERATORBIN_H_
#define __RVMOPERATORBIN_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORCAST_H_
#define __RVMOPERATORCAST_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORCAT_H_
#define __RVMOPERATORCAT_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORCMN_H_
#define __RVMOPERATORCMN_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORCMP_H_
#define __RVMOPERATORCMP_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORDIV_H_
#define __RVMOPERATORDIV_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATOREQ_H_
#define __RVMOPERATOREQ_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORGREATER_H_
#define __RVMOPERATORGREATER_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORGREATEREQ_H_
#define __RVMOPERATORMULGREATEREQ_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORLESS_H_
#define __RVMOPERATORLESS_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORLESSEQ_H_
#define __RVMOPERATORLESSEQ_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORLOGICAND_H_
#define __RVMOPERATORLOGICAND_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORLOGICNOT_H_
#define __RVMOPERATORLOGICNOT_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORLOGICOR_H_
#define __RVMOPERATORLOGICOR_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORLSL_H_
#define __RVMOPERATORLSL_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORLSR_H_
#define __RVMOPERATORLSR_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORLSRU_H_
#define __RVMOPERATORLSRU_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORMOD_H_
#define __RVMOPERATORMOD_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORMUL_H_
#define __RVMOPERATORMUL_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORNOT_H_
#define __RVMOPERATORNOT_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORNOTEQ_H_
#define __RVMOPERATORNOTEQ_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATOROR_H_
#define __RVMOPERATOROR_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORSUB_H_
#define __RVMOPERATORSUB_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#ifndef __RVMOPERATORXOR_H_
#define __RVMOPERATORXOR_H_
-#include "rvmoperator.h"
-#include "rvmreg.h"
+#include "rvm/rvmoperator.h"
+#include "rvm/rvmreg.h"
#ifdef __cplusplus
extern "C" {
-#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)
#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
-#include "rvmrelocmap.h"
-#include "rmem.h"
+#include "rvm/rvmrelocmap.h"
+#include "rlib/rmem.h"
rvm_relocmap_t *rvm_relocmap_create()
{
#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" {
-#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()
#define _RVMSCOPE_H_
#include "rtypes.h"
-#include "rarray.h"
-#include "rhash.h"
+#include "rlib/rarray.h"
+#include "rlib/rhash.h"
#ifdef __cplusplus
#include <stdio.h>
#include "common.h"
-#include "rvmcodemap.h"
-#include "rvmrelocmap.h"
+#include "rvm/rvmcodemap.h"
+#include "rvm/rvmrelocmap.h"
#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)
#include <stdio.h>
#include "common.h"
-#include "rvmreg.h"
+#include "rvm/rvmreg.h"
int main(int argc, char *argv[])
#include <stdio.h>
#include "common.h"
-#include "rvmreg.h"
+#include "rvm/rvmreg.h"
int main(int argc, char *argv[])
#include <stdio.h>
#include "common.h"
-#include "rvmreg.h"
+#include "rvm/rvmreg.h"
int main(int argc, char *argv[])
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
#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)
#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)
-#include "rvmcpu.h"
+#include "rvm/rvmcpu.h"
#include <stdio.h>
#define EXECDEBUG 1
#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)
#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)
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
-#include "rmem.h"
+#include "rlib/rmem.h"
#define NUM_THREADS 10
#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[])
#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)
#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)
#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"
#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[])
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
-#include "rspinlock.h"
+#include "rlib/rspinlock.h"
#define NUM_THREADS 10
#define NUM_ITERATIONS 100000
#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)
#include <stdio.h>
-#include "robject.h"
+#include "rlib/robject.h"
typedef struct _RTestStruct {
int i;
#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;
#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)
#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)
#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)
#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 {
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
#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[])
#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[])
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
-#include "rvmcpu.h"
+#include "rvm/rvmcpu.h"
#include <stdio.h>
#define EXECDEBUG 0
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
/*
#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"
#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 {
#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"
#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"
#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"
#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"