From 2105188bd0ab85a6388bc18de12e43936f996105 Mon Sep 17 00:00:00 2001
From: "kr.angelov" <kr.angelov@gmail.com>
Date: Thu, 12 Sep 2013 09:05:43 +0000
Subject: enable the PGF JIT compiler for Android

---
 src/runtime/c/pgf/jit.c    |  4 ++++
 src/runtime/c/pgf/reader.c | 11 -----------
 src/runtime/java/jpgf.c    |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'src/runtime')

diff --git a/src/runtime/c/pgf/jit.c b/src/runtime/c/pgf/jit.c
index 2cad7f849..fe3f4dcc2 100644
--- a/src/runtime/c/pgf/jit.c
+++ b/src/runtime/c/pgf/jit.c
@@ -48,7 +48,11 @@ pgf_jit_alloc_page(PgfJitState* state)
 
 	size_t page_size = getpagesize();
 
+#ifndef ANDROID
 	if (posix_memalign(&page, page_size, page_size) != 0) {
+#else
+	if ((page = memalign(page_size, page_size)) == NULL) {
+#endif
 		gu_fatal("Memory allocation failed");
 	}
 
diff --git a/src/runtime/c/pgf/reader.c b/src/runtime/c/pgf/reader.c
index bf7207874..1b776beec 100644
--- a/src/runtime/c/pgf/reader.c
+++ b/src/runtime/c/pgf/reader.c
@@ -2,10 +2,7 @@
 #include "expr.h"
 #include "literals.h"
 #include "reader.h"
-
-#ifndef ANDROID
 #include "jit.h"
-#endif
 
 #include <gu/defs.h>
 #include <gu/map.h>
@@ -27,9 +24,7 @@ struct PgfReader {
 	GuExn* err;
 	GuPool* opool;
 	GuPool* tmp_pool;
-#ifndef ANDROID
 	PgfJitState* jit_state;
-#endif
 };
 
 typedef struct PgfReadTagExn PgfReadTagExn;
@@ -546,9 +541,7 @@ pgf_read_abscat(PgfReader* rdr, PgfAbstr* abstr, PgfCIdMap* abscats)
 		gu_buf_push(functions, PgfAbsFun*, absfun);
 	}
 
-#ifndef ANDROID
 	pgf_jit_predicate(rdr->jit_state, abscats, abscat, functions);
-#endif
 
 	return abscat;
 }
@@ -1212,16 +1205,12 @@ pgf_new_reader(GuIn* in, GuPool* opool, GuPool* tmp_pool, GuExn* err)
 	rdr->tmp_pool = tmp_pool;
 	rdr->err = err;
 	rdr->in = in;
-#ifndef ANDROID
 	rdr->jit_state = pgf_jit_init(tmp_pool, rdr->opool);
-#endif
 	return rdr;
 }
 
 void
 pgf_reader_done(PgfReader* rdr, PgfPGF* pgf)
 {
-#ifndef ANDROID
 	pgf_jit_done(rdr->jit_state, &pgf->abstract);
-#endif
 }
diff --git a/src/runtime/java/jpgf.c b/src/runtime/java/jpgf.c
index a0290aeae..50807e19e 100644
--- a/src/runtime/java/jpgf.c
+++ b/src/runtime/java/jpgf.c
@@ -169,7 +169,7 @@ Java_org_grammaticalframework_pgf_PGF_readPGF__Ljava_io_InputStream_2(JNIEnv *en
 	JInStream* jstream = gu_new(JInStream, tmp_pool);
 	jstream->stream.begin_buffer = jpgf_jstream_begin_buffer;
 	jstream->stream.end_buffer = jpgf_jstream_end_buffer;
-	jstream->stream.input = NULL;;
+	jstream->stream.input = NULL;
 	jstream->java_stream = java_stream;
 	jstream->env = env;
 
-- 
cgit v1.2.3