util: update Java JNI interface to m5ops

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

diff --git a/util/m5/jni/gem5Op.java b/util/m5/jni/gem5Op.java
index bb324b37c14eae04bcfe63dd33c8e661ad14770b..9a58a84f2c382d9059081c3ec1b3c89d777b3ea6 100644 (file)
--- a/util/m5/jni/gem5Op.java
+++ b/util/m5/jni/gem5Op.java
@@ -53,7 +53,8 @@ public class gem5Op {
     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 --git a/util/m5/jni_gem5Op.c b/util/m5/jni_gem5Op.c
index 501933e625d73c9cc4fc3de8a1c07b0a4158b46b..c7e73bcbc6b61bfa43243ffa663d8f2f1126195f 100644 (file)
--- a/util/m5/jni_gem5Op.c
+++ b/util/m5/jni_gem5Op.c
@@ -101,10 +101,17 @@ Java_jni_gem5Op_exit(JNIEnv *env, jobject obj, jlong j_ns_delay)
     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);