[gem5-dev] changeset in gem5: util: update Java JNI interface to m5ops

[Prakash Ramrakhyani]

changeset cd41493e8b7e in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=cd41493e8b7e
description:
        util: update Java JNI interface to m5ops

        Synchronize with
        ab19693da "pseudo inst,util: Add optional key to initparam pseudo 
instruction"

diffstat:

 util/m5/jni/gem5Op.java |   3 ++-
 util/m5/jni_gem5Op.c    |  11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 6668387fa488 -r cd41493e8b7e util/m5/jni/gem5Op.java
--- a/util/m5/jni/gem5Op.java   Mon Aug 10 11:25:52 2015 +0100
+++ b/util/m5/jni/gem5Op.java   Mon Feb 29 19:13:15 2016 -0600
@@ -53,7 +53,8 @@
     public native void wakeCPU(long cpuid);
 
     public native void exit(long ns_delay);
-    public native long initparam();
+    public native void fail(long ns_delay, long code);
+    public native long initparam(long key_str1, long key_str2);
     public native void checkpoint(long ns_delay, long ns_period);
     public native void reset_stats(long ns_delay, long ns_period);
     public native void dump_stats(long ns_delay, long ns_period);
diff -r 6668387fa488 -r cd41493e8b7e util/m5/jni_gem5Op.c
--- a/util/m5/jni_gem5Op.c      Mon Aug 10 11:25:52 2015 +0100
+++ b/util/m5/jni_gem5Op.c      Mon Feb 29 19:13:15 2016 -0600
@@ -101,10 +101,17 @@
     m5_exit(j_ns_delay);
 }
 
+JNIEXPORT void JNICALL
+Java_jni_gem5Op_fail(JNIEnv *env, jobject obj, jlong j_ns_delay, jlong j_code)
+{
+    m5_fail(j_ns_delay, j_code);
+}
+
 JNIEXPORT jlong JNICALL
-Java_jni_gem5Op_initparam(JNIEnv *env, jobject obj)
+Java_jni_gem5Op_initparam(JNIEnv *env, jobject obj, jlong j_key_str1,
+                          jlong j_key_str2)
 {
-    uint64_t param = m5_initparam();
+    uint64_t param = m5_initparam(j_key_str1, j_key_str2);
     if (param & 0x8000000000000000ULL)
         printf("Truncated return value from m_initparam() to 63 bits\n");
     return (param & 0x7FFFFFFFFFFFFFFFULL);
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev