GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

enable the PGF JIT compiler for Android

Browse Source
This commit is contained in:
kr.angelov
2013-09-12 09:05:43 +00:00
parent b3a644300c
commit d88084a2d5
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/c/pgf/jit.c
View File

@@ -48,7 +48,11 @@ pgf_jit_alloc_page(PgfJitState* state)
size_t page_size = getpagesize(); size_t page_size = getpagesize();
#ifndef ANDROID
if (posix_memalign(&page, page_size, page_size) != 0) { if (posix_memalign(&page, page_size, page_size) != 0) {
#else
if ((page = memalign(page_size, page_size)) == NULL) {
#endif
gu_fatal("Memory allocation failed"); gu_fatal("Memory allocation failed");
} }

11
src/runtime/c/pgf/reader.c
View File

@@ -2,10 +2,7 @@
#include "expr.h" #include "expr.h"
#include "literals.h" #include "literals.h"
#include "reader.h" #include "reader.h"
#ifndef ANDROID
#include "jit.h" #include "jit.h"
#endif
#include <gu/defs.h> #include <gu/defs.h>
#include <gu/map.h> #include <gu/map.h>
@@ -27,9 +24,7 @@ struct PgfReader {
GuExn* err; GuExn* err;
GuPool* opool; GuPool* opool;
GuPool* tmp_pool; GuPool* tmp_pool;
#ifndef ANDROID
PgfJitState* jit_state; PgfJitState* jit_state;
#endif
}; };
typedef struct PgfReadTagExn PgfReadTagExn; typedef struct PgfReadTagExn PgfReadTagExn;
@@ -546,9 +541,7 @@ pgf_read_abscat(PgfReader* rdr, PgfAbstr* abstr, PgfCIdMap* abscats)
gu_buf_push(functions, PgfAbsFun*, absfun); gu_buf_push(functions, PgfAbsFun*, absfun);
} }
#ifndef ANDROID
pgf_jit_predicate(rdr->jit_state, abscats, abscat, functions); pgf_jit_predicate(rdr->jit_state, abscats, abscat, functions);
#endif
return abscat; return abscat;
} }
@@ -1212,16 +1205,12 @@ pgf_new_reader(GuIn* in, GuPool* opool, GuPool* tmp_pool, GuExn* err)
rdr->tmp_pool = tmp_pool; rdr->tmp_pool = tmp_pool;
rdr->err = err; rdr->err = err;
rdr->in = in; rdr->in = in;
#ifndef ANDROID
rdr->jit_state = pgf_jit_init(tmp_pool, rdr->opool); rdr->jit_state = pgf_jit_init(tmp_pool, rdr->opool);
#endif
return rdr; return rdr;
} }
void void
pgf_reader_done(PgfReader* rdr, PgfPGF* pgf) pgf_reader_done(PgfReader* rdr, PgfPGF* pgf)
{ {
#ifndef ANDROID
pgf_jit_done(rdr->jit_state, &pgf->abstract); pgf_jit_done(rdr->jit_state, &pgf->abstract);
#endif
} }

2
src/runtime/java/jpgf.c
View File

@@ -169,7 +169,7 @@ Java_org_grammaticalframework_pgf_PGF_readPGF__Ljava_io_InputStream_2(JNIEnv *en
JInStream* jstream = gu_new(JInStream, tmp_pool); JInStream* jstream = gu_new(JInStream, tmp_pool);
jstream->stream.begin_buffer = jpgf_jstream_begin_buffer; jstream->stream.begin_buffer = jpgf_jstream_begin_buffer;
jstream->stream.end_buffer = jpgf_jstream_end_buffer; jstream->stream.end_buffer = jpgf_jstream_end_buffer;
jstream->stream.input = NULL;; jstream->stream.input = NULL;
jstream->java_stream = java_stream; jstream->java_stream = java_stream;
jstream->env = env; jstream->env = env;

17
src/ui/android/jni/Android.mk
View File

@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
jni_c_files := jpgf.c jni_c_files := jpgf.c
pgf_c_files := data.c expr.c graphviz.c lexer.c linearizer.c literals.c parser.c parseval.c pgf.c printer.c reader.c reasoner.c pgf_c_files := data.c expr.c graphviz.c lexer.c linearizer.c literals.c parser.c parseval.c pgf.c printer.c reader.c reasoner.c jit.c
gu_c_files := assert.c choice.c exn.c fun.c in.c list.c map.c out.c str.c type.c utf8.c \ gu_c_files := assert.c choice.c exn.c fun.c in.c list.c map.c out.c str.c type.c utf8.c \
bits.c defs.c enum.c file.c hash.c log.c mem.c prime.c seq.c string.c ucs.c variant.c bits.c defs.c enum.c file.c hash.c log.c mem.c prime.c seq.c string.c ucs.c variant.c
@@ -11,6 +11,19 @@ LOCAL_MODULE := jpgf
LOCAL_SRC_FILES := $(addprefix ../../../runtime/java/, $(jni_c_files)) \ LOCAL_SRC_FILES := $(addprefix ../../../runtime/java/, $(jni_c_files)) \
$(addprefix ../../../runtime/c/pgf/, $(pgf_c_files)) \ $(addprefix ../../../runtime/c/pgf/, $(pgf_c_files)) \
$(addprefix ../../../runtime/c/gu/, $(gu_c_files)) $(addprefix ../../../runtime/c/gu/, $(gu_c_files))
LOCAL_C_INCLUDES := ../../../runtime/c LOCAL_C_INCLUDES := . ../../../runtime/c
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
$(realpath ../obj/local/armeabi/objs/jpgf/__/__/__/runtime/c/pgf/jit.o): lightning
$(realpath ../obj/local/armeabi/objs-debug/jpgf/__/__/__/runtime/c/pgf/jit.o): lightning
lightning:
mkdir lightning
mkdir lightning/arm
ln -s ../../../../runtime/c/pgf/lightning/arm/asm.h lightning/asm.h
ln -s ../../../../runtime/c/pgf/lightning/arm/core.h lightning/core.h
ln -s ../../../../runtime/c/pgf/lightning/arm/fp.h lightning/fp.h
ln -s ../../../../../runtime/c/pgf/lightning/arm/fp-swf.h lightning/arm/fp-swf.h
ln -s ../../../../../runtime/c/pgf/lightning/arm/fp-vfp.h lightning/arm/fp-vfp.h
ln -s ../../../../runtime/c/pgf/lightning/arm/funcs.h lightning/funcs.h