Native method annotation fixes for OpenJDK6. Copyright fixes. openjdk7-support
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 08 Feb 2013 11:18:39 +0100
branchopenjdk7-support
changeset 2049 17a00367b040
parent 2048 7d86bfb97bfc
child 2050 c77d58b7076b
Native method annotation fixes for OpenJDK6. Copyright fixes.
JavaNativeMethodImpl_OpenJDK6.st
JavaNativeMethodImpl_OpenJDK7.st
JavaNativeMethodImpl_SunJDK6.st
--- a/JavaNativeMethodImpl_OpenJDK6.st	Fri Feb 08 10:40:02 2013 +0100
+++ b/JavaNativeMethodImpl_OpenJDK6.st	Fri Feb 08 11:18:39 2013 +0100
@@ -1,8 +1,4 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
  COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
                             SWING Research Group, Czech Technical University in Prague
 
@@ -12,11 +8,6 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
-     of one of the above copright owners. For exact set of such code,
-     see the differences between this version and version stx:libjava
-     as of 1.9.2010
 "
 "{ Package: 'stx:libjava' }"
 
@@ -31,10 +22,6 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
  COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
                             SWING Research Group, Czech Technical University in Prague
 
@@ -44,12 +31,6 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
-     of one of the above copright owners. For exact set of such code,
-     see the differences between this version and version stx:libjava
-     as of 1.9.2010
-
 "
 !
 
@@ -9538,11 +9519,11 @@
 
 _java_lang_StrictMath_sin: this _:a1 _: a2 
 
-    <javanative: 'java/lang/StrictMath' name: 'cos(D)D'>
+    <javanative: 'java/lang/StrictMath' name: 'sin(D)D'>
 
     ^ JavaMathSupport sin: a1
 
-    "Modified: / 07-09-2011 / 17:32:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 08-02-2013 / 10:49:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 _java_lang_StrictMath_sinh: this _:a1 _: a2 
@@ -11642,7 +11623,10 @@
 !JavaNativeMethodImpl_OpenJDK6 class methodsFor:'native - java.security'!
 
 _java_security_AccessController_doPrivileged: this _:a1 
+
     <javanative: 'java/security/AccessController' name: 'doPrivileged(Ljava/security/PrivilegedAction;)Ljava/lang/Object;'>
+    <javanative: 'java/security/AccessController' name: 'doPrivileged(Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;'>
+
     "we don't care about permissions, we will just allow this. Now it's guaranteed that called code will not perform access permission checks"
 
     | retval |
@@ -11654,13 +11638,14 @@
 
     "Created: / 20-10-2010 / 12:31:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 09-10-2011 / 23:56:31 / Marcel Hlopko <hlopik@gmail.com>"
-    "Modified: / 18-10-2011 / 23:28:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 10-09-2012 / 23:22:59 / m"
+    "Modified: / 08-02-2013 / 11:15:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 _java_security_AccessController_doPrivileged: this _: a1 _: a2 
 
     <javanative: 'java/security/AccessController' name: 'doPrivileged(Ljava/security/PrivilegedAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;'>
+    <javanative: 'java/security/AccessController' name: 'doPrivileged(Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;'>
 
     | retval |
     JavaVM privilegedAccessQuery answer: true
@@ -11669,7 +11654,7 @@
         ].
     ^ retval
 
-    "Modified: / 08-02-2013 / 09:31:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 08-02-2013 / 10:48:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 _java_security_AccessController_getInheritedAccessControlContext: this 
--- a/JavaNativeMethodImpl_OpenJDK7.st	Fri Feb 08 10:40:02 2013 +0100
+++ b/JavaNativeMethodImpl_OpenJDK7.st	Fri Feb 08 11:18:39 2013 +0100
@@ -1,8 +1,4 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
  COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
                             SWING Research Group, Czech Technical University in Prague
 
@@ -12,11 +8,6 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
-     of one of the above copright owners. For exact set of such code,
-     see the differences between this version and version stx:libjava
-     as of 1.9.2010
 "
 "{ Package: 'stx:libjava' }"
 
@@ -31,10 +22,6 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
  COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
                             SWING Research Group, Czech Technical University in Prague
 
@@ -44,12 +31,6 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
-     of one of the above copright owners. For exact set of such code,
-     see the differences between this version and version stx:libjava
-     as of 1.9.2010
-
 "
 ! !
 
@@ -104,13 +85,6 @@
     "Modified: / 07-02-2013 / 23:35:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-_java_lang_StrictMath_sin: this _: a1 _: a2 
-
-    <javanative: 'java/lang/StrictMath' name: 'sin(D)D'>
-
-    ^ JavaVM unimplementedNativeMethodSignal raise
-!
-
 _java_lang_Thread_setNativeName: this _: a1 
 
     <javanative: 'java/lang/Thread' name: 'setNativeName(Ljava/lang/String;)V'>
@@ -165,30 +139,6 @@
     "Modified: / 08-02-2013 / 01:28:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!JavaNativeMethodImpl_OpenJDK7 class methodsFor:'native - java.security'!
-
-_java_security_AccessController_doPrivileged: this _: a1 
-
-    <javanative: 'java/security/AccessController' name: 'doPrivileged(Ljava/security/PrivilegedAction;)Ljava/lang/Object;'>
-    <javanative: 'java/security/AccessController' name: 'doPrivileged(Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;'>
-
-    "Funny, different descriptor!!!!!!"                    
-    ^super _java_security_AccessController_doPrivileged: this _: a1
-
-    "Modified: / 08-02-2013 / 09:31:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-_java_security_AccessController_doPrivileged: this _: a1 _: a2 
-
-    <javanative: 'java/security/AccessController' name: 'doPrivileged(Ljava/security/PrivilegedAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;'>
-    <javanative: 'java/security/AccessController' name: 'doPrivileged(Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;'>
-
-    "Funny, different descriptor!!!!!!"                    
-    ^super _java_security_AccessController_doPrivileged: this _: a1 _: a2
-
-    "Modified: / 08-02-2013 / 09:31:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
 !JavaNativeMethodImpl_OpenJDK7 class methodsFor:'native - java.util.zip'!
 
 _java_util_zip_ZipFile_getCommentBytes: this _: jzentry _: a2 
--- a/JavaNativeMethodImpl_SunJDK6.st	Fri Feb 08 10:40:02 2013 +0100
+++ b/JavaNativeMethodImpl_SunJDK6.st	Fri Feb 08 11:18:39 2013 +0100
@@ -1,8 +1,4 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
  COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
                             SWING Research Group, Czech Technical University in Prague
 
@@ -12,11 +8,6 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
-     of one of the above copright owners. For exact set of such code,
-     see the differences between this version and version stx:libjava
-     as of 1.9.2010
 "
 "{ Package: 'stx:libjava' }"
 
@@ -31,10 +22,6 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
  COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
                             SWING Research Group, Czech Technical University in Prague
 
@@ -44,12 +31,6 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
-     of one of the above copright owners. For exact set of such code,
-     see the differences between this version and version stx:libjava
-     as of 1.9.2010
-
 "
 ! !