public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Use JNI names in JNI bindings.
@ 2008-05-14 17:28 cagney
  0 siblings, 0 replies; only message in thread
From: cagney @ 2008-05-14 17:28 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  2e8fe2df0981ab97667bcdf302897ad9028d6855 (commit)
      from  9e07b5e5c951f582ed2e466295376bafc6c46df3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 2e8fe2df0981ab97667bcdf302897ad9028d6855
Author: Andrew Cagney <cagney@redhat.com>
Date:   Wed May 14 13:27:33 2008 -0400

    Use JNI names in JNI bindings.
    
    frysk-sys/frysk/jnixx/ChangeLog
    2008-05-14  Andrew Cagney  <cagney@redhat.com>
    
    	* JniBindings.java: Generate array method names identical to JNI.
    	* chars.hxx (class ByteArrayElements): Update.
    	* chars.cxx (strings2chars): Update.
    
    frysk-sys/frysk/sys/ChangeLog
    2008-05-14  Andrew Cagney  <cagney@redhat.com>
    
    	* jni/Fork.cxx (spawn): Use JNI names.
    
    frysk-sys/frysk/testbed/ChangeLog
    2008-05-14  Andrew Cagney  <cagney@redhat.com>
    
    	* jni/LocalMemory.cxx (getBytes): Use JNI names.

-----------------------------------------------------------------------

Summary of changes:
 frysk-sys/frysk/jnixx/ChangeLog             |    4 ++
 frysk-sys/frysk/jnixx/JniBindings.java      |   48 ++++++++++-----------------
 frysk-sys/frysk/jnixx/chars.cxx             |   10 +++---
 frysk-sys/frysk/jnixx/chars.hxx             |    4 +-
 frysk-sys/frysk/sys/ChangeLog               |    4 ++
 frysk-sys/frysk/sys/jni/Fork.cxx            |    2 +-
 frysk-sys/frysk/testbed/ChangeLog           |    4 ++
 frysk-sys/frysk/testbed/jni/LocalMemory.cxx |    4 +-
 8 files changed, 40 insertions(+), 40 deletions(-)

First 500 lines of diff:
diff --git a/frysk-sys/frysk/jnixx/ChangeLog b/frysk-sys/frysk/jnixx/ChangeLog
index 84ffdc5..93ad5c8 100644
--- a/frysk-sys/frysk/jnixx/ChangeLog
+++ b/frysk-sys/frysk/jnixx/ChangeLog
@@ -1,5 +1,9 @@
 2008-05-14  Andrew Cagney  <cagney@redhat.com>
 
+	* JniBindings.java: Generate array method names identical to JNI.
+	* chars.hxx (class ByteArrayElements): Update.
+	* chars.cxx (strings2chars): Update.
+	
 	* chars.hxx (class ByteArrayElements): New.
 	* bounds.hxx: New.
 	* JniBindings.java: Generate GetArrayLength, and Throw.
diff --git a/frysk-sys/frysk/jnixx/JniBindings.java b/frysk-sys/frysk/jnixx/JniBindings.java
index 40026dc..b350433 100644
--- a/frysk-sys/frysk/jnixx/JniBindings.java
+++ b/frysk-sys/frysk/jnixx/JniBindings.java
@@ -304,34 +304,34 @@ class JniBindings {
 	    String Type = (Character.toUpperCase(type.charAt(0))
 			   + type.substring(1));
 	    bindings
-		.put(types[i], true,
-		     "::jnixx::" + type + "Array", "New",
+		.put(types[i], false,
+		     "jsize", "GetArrayLength",
 		     new String[] {
 			 "::jnixx::env", "env",
-			 "jsize", "length",
 		     },
 		     new Object[] {
-			 "return " + type + "Array(env, env.New" + Type + "Array(length));",
+			 "return env.GetArrayLength((j" + type + "Array) _object);"
 		     })
-		.put(types[i], false,
-		     "j" + type + "*", "GetElements",
+		.put(types[i], true,
+		     "::jnixx::" + type + "Array", "New" + Type + "Array",
 		     new String[] {
 			 "::jnixx::env", "env",
-			 "jboolean*", "isCopy",
+			 "jsize", "length",
 		     },
 		     new Object[] {
-			 "return env.Get" + Type + "ArrayElements((j" + type + "Array) _object, isCopy);"
+			 "return " + type + "Array(env, env.New" + Type + "Array(length));",
 		     })
 		.put(types[i], false,
-		     "jsize", "GetArrayLength",
+		     "j" + type + "*", "Get" + Type + "ArrayElements",
 		     new String[] {
 			 "::jnixx::env", "env",
+			 "jboolean*", "isCopy",
 		     },
 		     new Object[] {
-			 "return env.GetArrayLength((j" + type + "Array) _object);"
+			 "return env.Get" + Type + "ArrayElements((j" + type + "Array) _object, isCopy);"
 		     })
 		.put(types[i], false,
-		     null, "ReleaseElements",
+		     null, "Release" + Type +"ArrayElements",
 		     new String[] {
 			 "::jnixx::env", "env",
 			 "j" + type + "*", "elements",
@@ -341,7 +341,7 @@ class JniBindings {
 			 "env.Release" + Type + "ArrayElements((j" + type + "Array)_object, elements, mode);",
 		     })
 		.put(types[i], false,
-		     "void", "GetRegion",
+		     "void", "Get" + Type + "ArrayRegion",
 		     new String[] {
 			 "::jnixx::env", "env",
 			 "jsize", "start",
@@ -352,7 +352,7 @@ class JniBindings {
 			 "env.Get" + Type + "ArrayRegion((j" + type + "Array) _object, start, length, buf);"
 		     })
 		.put(types[i], false,
-		     "void", "SetRegion",
+		     "void", "Set" + Type + "ArrayRegion",
 		     new String[] {
 			 "::jnixx::env", "env",
 			 "jsize", "start",
@@ -389,33 +389,21 @@ class JniBindings {
 			},
 			"array() : ::java::lang::Object()", new Object[] {
 			},
-			"jsize GetLength(::jnixx::env env)", new Object[] {
+			"jsize GetArrayLength(::jnixx::env env)", new Object[] {
 			    "return env.GetArrayLength((jarray)_object);",
 			},
-			"static array<component> New(::jnixx::env env, jsize length)", new Object[] {
+			"static array<component> NewObjectArray(::jnixx::env env, jsize length)", new Object[] {
 			    "return array<component>(env, env.NewObjectArray(length, component::_class_(env), NULL));",
 			},
-			"static array<component> New(::jnixx::env env, jsize length, component init)", new Object[] {
+			"static array<component> NewObjectArray(::jnixx::env env, jsize length, component init)", new Object[] {
 			    "return array<component>(env, env.NewObjectArray(length, component::_class_(env), init._object));",
 			},
-			"component GetElement(::jnixx::env env, jsize index)", new Object[] {
+			"component GetObjectArrayElement(::jnixx::env env, jsize index)", new Object[] {
 			    "return component(env, env.GetObjectArrayElement((jobjectArray)_object, index));",
 			},
-			"void SetElement(::jnixx::env env, jsize index, component object)", new Object[] {
+			"void SetObjectArrayElement(::jnixx::env env, jsize index, component object)", new Object[] {
 			    "env.SetObjectArrayElement((jobjectArray)_object, index, object._object);",
 			},
-			"static array<component> New(jsize length)", new Object[] {
-			    "return New(_env_(), length);",
-			},
-			"static array<component> New(jsize length, component init)", new Object[] {
-			    "return New(_env_(), length, init);",
-			},
-			"component GetElement(jsize index)", new Object[] {
-			    "return GetElement(_env_(), index);"
-			},
-			"void SetElement(jsize index, component object)", new Object[] {
-			    "SetElement(_env_(), index, object);"
-			},
 		    });
 	    }
 	}
diff --git a/frysk-sys/frysk/jnixx/chars.cxx b/frysk-sys/frysk/jnixx/chars.cxx
index 56caf4d..3a8829c 100644
--- a/frysk-sys/frysk/jnixx/chars.cxx
+++ b/frysk-sys/frysk/jnixx/chars.cxx
@@ -46,13 +46,13 @@ using namespace java::lang;
 
 char**
 strings2chars(jnixx::env env, ::jnixx::array<String> strings) {
-  jsize arrayLength = strings.GetLength(env);
+  jsize arrayLength = strings.GetArrayLength(env);
   // compute the allocated size.
   size_t size = 0;
   size += sizeof(void*); // NULL
   for (int i = 0; i < arrayLength; i++) {
     size += sizeof(void*); // pointer
-    String string = strings.GetElement(env, i);
+    String string = strings.GetObjectArrayElement(env, i);
     size += string.GetStringUTFLength(env); // chars
     size += 1; // NUL
     string.DeleteLocalRef(env);
@@ -65,7 +65,7 @@ strings2chars(jnixx::env env, ::jnixx::array<String> strings) {
   // Copy
   for (int i = 0; i < arrayLength; i++) {
     *argv++ = arg;
-    String string = strings.GetElement(env, i);
+    String string = strings.GetObjectArrayElement(env, i);
     int utfLength = string.GetStringUTFLength(env);
     string.GetStringUTFRegion(env, 0, string.GetStringLength(env), arg);
     arg += utfLength;
@@ -83,10 +83,10 @@ chars2strings(::jnixx::env env, char** argv) {
     length++;
   }
   ::jnixx::array<String> strings
-      = ::jnixx::array<String>::New(env, length);
+      = ::jnixx::array<String>::NewObjectArray(env, length);
   for (int i = 0; i < length; i++) {
     String string = String::NewStringUTF(env, argv[i]);
-    strings.SetElement(env, i, string);
+    strings.SetObjectArrayElement(env, i, string);
     string.DeleteLocalRef(env);
   }
   return strings;
diff --git a/frysk-sys/frysk/jnixx/chars.hxx b/frysk-sys/frysk/jnixx/chars.hxx
index f00cf2c..24a37df 100644
--- a/frysk-sys/frysk/jnixx/chars.hxx
+++ b/frysk-sys/frysk/jnixx/chars.hxx
@@ -99,14 +99,14 @@ public:
     this->bytes = bytes;
     this->env = env;
     if (bytes != NULL) {
-      this->p = bytes.GetElements(env, NULL);
+      this->p = bytes.GetByteArrayElements(env, NULL);
     } else {
       this->p = NULL;
     }
   }
   void release() {
     if (p != NULL) {
-      bytes.ReleaseElements(env, p, 0);
+      bytes.ReleaseByteArrayElements(env, p, 0);
       p = NULL;
     }
   }
diff --git a/frysk-sys/frysk/sys/ChangeLog b/frysk-sys/frysk/sys/ChangeLog
index 1922e23..aaa782a 100644
--- a/frysk-sys/frysk/sys/ChangeLog
+++ b/frysk-sys/frysk/sys/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-14  Andrew Cagney  <cagney@redhat.com>
+
+	* jni/Fork.cxx (spawn): Use JNI names.
+
 2008-05-13  Andrew Cagney  <cagney@redhat.com>
 
 	* jni/Fork.cxx: Implement.
diff --git a/frysk-sys/frysk/sys/jni/Fork.cxx b/frysk-sys/frysk/sys/jni/Fork.cxx
index 8705196..4b8a42f 100644
--- a/frysk-sys/frysk/sys/jni/Fork.cxx
+++ b/frysk-sys/frysk/sys/jni/Fork.cxx
@@ -166,7 +166,7 @@ spawn(jnixx::env env, java::io::File exe,
   StringChars inPath = StringChars(env, in);
   StringChars outPath = StringChars(env, out);
   StringChars errPath = StringChars(env, err);
-  int argc = args.GetLength(env);
+  int argc = args.GetArrayLength(env);
   StringArrayChars argv = StringArrayChars(env, args);
   int pid = ::spawn(exePath.p, inPath.p, outPath.p, errPath.p,
 		    argc, argv.p, (char**)environ, trace);
diff --git a/frysk-sys/frysk/testbed/ChangeLog b/frysk-sys/frysk/testbed/ChangeLog
index e87ef84..bb4ebdb 100644
--- a/frysk-sys/frysk/testbed/ChangeLog
+++ b/frysk-sys/frysk/testbed/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-14  Andrew Cagney  <cagney@redhat.com>
+
+	* jni/LocalMemory.cxx (getBytes): Use JNI names.
+
 2008-05-12  Andrew Cagney  <cagney@redhat.com>
 
 	* jni/LocalMemory.cxx (LocalMemory::getDataBytes): Use
diff --git a/frysk-sys/frysk/testbed/jni/LocalMemory.cxx b/frysk-sys/frysk/testbed/jni/LocalMemory.cxx
index fbf7713..68b64e9 100644
--- a/frysk-sys/frysk/testbed/jni/LocalMemory.cxx
+++ b/frysk-sys/frysk/testbed/jni/LocalMemory.cxx
@@ -48,8 +48,8 @@ using namespace java::lang;
 
 static ::jnixx::byteArray
 getBytes(::jnixx::env env, void *addr, size_t length) {
-  ::jnixx::byteArray bytes = ::jnixx::byteArray::New(env, length);
-  bytes.SetRegion(env, 0, length, (jbyte*) addr);
+  ::jnixx::byteArray bytes = ::jnixx::byteArray::NewByteArray(env, length);
+  bytes.SetByteArrayRegion(env, 0, length, (jbyte*) addr);
   return bytes;
 }
 


hooks/post-receive
--
frysk system monitor/debugger


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-05-14 17:28 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-14 17:28 [SCM] master: Use JNI names in JNI bindings cagney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).