diff options
author | Prakash Ramrakhyani <prakash.ramrakhyani@arm.com> | 2016-02-29 19:13:15 -0600 |
---|---|---|
committer | Prakash Ramrakhyani <prakash.ramrakhyani@arm.com> | 2016-02-29 19:13:15 -0600 |
commit | fed0ea55c476d9843e3f07e4f879254d34d99279 (patch) | |
tree | 4f2906243c9a17202235ae4fc0bc7a00552e7a43 /util/m5/jni_gem5Op.c | |
parent | f703160e5a49bf22b831d3a7f3355d7b4b3008fa (diff) | |
download | gem5-fed0ea55c476d9843e3f07e4f879254d34d99279.tar.xz |
util: update Java JNI interface to m5ops
Synchronize with
ab19693da "pseudo inst,util: Add optional key to initparam pseudo instruction"
Diffstat (limited to 'util/m5/jni_gem5Op.c')
-rw-r--r-- | util/m5/jni_gem5Op.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/util/m5/jni_gem5Op.c b/util/m5/jni_gem5Op.c index 501933e62..c7e73bcbc 100644 --- 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); |