libjava/ChangeLog:
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* sources.am, Makfile.in: Regenerate.
2008-10-17 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix bashisms.
* configure: Regenerate.
2008-10-15 Matthias Klose <doko@ubuntu.com>
* configure.ac: Disable build of gjdoc, if configured without
--with-antlr-jar or if no antlr.jar found.
* configure: Regenerate.
2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure.ac,
* classpath/m4/ac_prog_antlr.m4,
* classpath/m4/ac_prog_java.m4,
* classpath/tools/Makefile.am:
Ported --regen-gjdoc-parser patch and
cantlr support from GNU Classpath.
2008-10-06 Andrew Haley <aph@redhat.com>
* java/lang/Thread.java (Thread): Always create the ThreadLocalMap
when creating a thread.
(getThreadLocals) Don't lazily create the ThreadLocalMap.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/java/lang/ThreadLocalMap.java,
* java/lang/ThreadLocalMap$Entry.h,
* java/lang/ThreadLocalMap.h,
* lib/java/lang/ThreadLocalMap.class,
* lib/java/lang/ThreadLocalMap$Entry.class:
Add the new files for the ThreadLocal patch.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/ChangeLog,
* classpath/java/lang/InheritableThreadLocal.java,
* classpath/java/lang/Thread.java,
* classpath/java/lang/ThreadLocal.java:
Merge Daniel Frampton's ThreadLocal patch.
* gcj/javaprims.h: Updated.
* java/lang/Thread.h: Regenerated.
* java/lang/Thread.java:
Replace WeakIdentityHashMap with ThreadLocalMap.
(getThreadLocals()): Likewise.
* java/lang/ThreadLocal.h: Regenerated.
* java/lang/ThreadLocal.java:
(computeNextHash()): New method.
(ThreadLocal()): Initialise fastHash.
(internalGet()): Updated to match Classpath's get().
(internalSet(Object)): Likewise for set(Object).
(internalRemove()): Likewise for remove().
2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure,
* classpath/configure.ac:
Resynchronise with Classpath's configure.
* classpath/examples/Makefile.in:
Add equivalent support for building as in
tools/Makefile.in.
* classpath/java/nio/Buffer.java,
* classpath/java/nio/ByteBuffer.java,
* classpath/java/nio/ByteBufferImpl.java,
* classpath/java/nio/CharBuffer.java,
* classpath/java/nio/CharBufferImpl.java,
* classpath/java/nio/CharSequenceBuffer.java,
* classpath/java/nio/CharViewBufferImpl.java,
* classpath/java/nio/DirectByteBufferImpl.java,
* classpath/java/nio/DoubleBuffer.java,
* classpath/java/nio/DoubleBufferImpl.java,
* classpath/java/nio/DoubleViewBufferImpl.java,
* classpath/java/nio/FloatBuffer.java,
* classpath/java/nio/FloatBufferImpl.java,
* classpath/java/nio/FloatViewBufferImpl.java,
* classpath/java/nio/IntBuffer.java,
* classpath/java/nio/IntBufferImpl.java,
* classpath/java/nio/IntViewBufferImpl.java,
* classpath/java/nio/LongBuffer.java,
* classpath/java/nio/LongBufferImpl.java,
* classpath/java/nio/LongViewBufferImpl.java,
* classpath/java/nio/MappedByteBuffer.java,
* classpath/java/nio/MappedByteBufferImpl.java,
* classpath/java/nio/ShortBuffer.java,
* classpath/java/nio/ShortBufferImpl.java,
* classpath/java/nio/ShortViewBufferImpl.java:
Replace use of gnu.classpath.Pointer with gnu.gcj.RawData,
and fix some formatting issues.
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt:
Regenerated (later version of antlr).
* java/nio/Buffer.h: Regenerated.
* java/nio/Buffer.java: Ported changes from Classpath.
* java/nio/ByteBuffer.h,
* java/nio/CharBuffer.h: Regenerated.
* java/nio/DirectByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/DoubleBuffer.h,
* java/nio/FloatBuffer.h,
* java/nio/IntBuffer.h,
* java/nio/LongBuffer.h,
* java/nio/MappedByteBuffer.h,
* java/nio/MappedByteBufferImpl.h: Regenerated.
* java/nio/MappedByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/ShortBuffer.h: Regenerated.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* configure.ac: Search for antlr.jar, if not configured.
* configure: Regenerate.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* Makefile.am: Build a gjdoc binary, if enabled.
* configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file.
* Makefile.in, */Makefile.in, configure: Regenerate.
2008-09-22 Andrew Haley <aph@redhat.com>
* java/lang/String.java (toString(char[], int, int)): New method.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080914).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --disable-gjdoc to classpath.
* sources.am: Regenerated.
* HACKING: Mention to build gjdoc in maintainer builds.
* gnu/classpath/Configuration.java: Update classpath version.
* gcj/javaprims.h: Update.
2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am: Replace natStringBuffer.cc
and natStringBuilder.cc with natAbstractStringBuffer.cc.
* Makefile.in: Regenerated.
* java/lang/AbstractStringBuffer.java:
(append(int)): Made native.
(regionMatches(int,String)): Likewise.
* java/lang/StringBuffer.h: Regenerated.
* java/lang/StringBuffer.java: Remerged with GNU Classpath.
* java/lang/StringBuilder.h: Regenerated.
* java/lang/StringBuilder.java: Remerged with GNU Classpath.
* java/lang/natAbstractStringBuffer.cc: Provide common
native methods for StringBuffer and StringBuilder.
* java/lang/natStringBuffer.cc,
* java/lang/natStringBuilder.cc: Removed.
2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in,
* classpath/configure: Regenerated.
* gnu/gcj/util/natDebug.cc,
* gnu/gcj/xlib/natColormap.cc,
* gnu/gcj/xlib/natDisplay.cc,
* gnu/gcj/xlib/natDrawable.cc,
* gnu/gcj/xlib/natFont.cc,
* gnu/gcj/xlib/natWMSizeHints.cc,
* gnu/gcj/xlib/natWindow.cc,
* gnu/gcj/xlib/natXImage.cc:
Add :: prefix to namespaces.
* java/io/CharArrayWriter.h,
* java/lang/StringBuffer.h:
Regenerated using patched gjavah.
* java/lang/natStringBuffer.cc:
Fix naming of append(jint).
* java/sql/Timestamp.h: Regenerated
using patched gjavah.
* jni.cc: Rename p to functions
to match change in GNU Classpath.
* scripts/makemake.tcl: Switch
gnu.java.math to BC compilation.
* sources.am: Regenerated.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated location of Configuration.java.
* classpath/lib/gnu/java/locale/LocaleData.class: Regenerated.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated with new Java files.
* classpath/configure: Regenerated.
* classpath/tools/Makefile.am: Add missing
use of GJDOC_EX so --disable-gjdoc works.
* classpath/tools/Makefile.in: Regenerated.
2008-08-15 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080811).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --with-fastjar to classpath, substitute new
dummy value in classpath/gnu/classpath/Configuration.java.in, pass
--disable-gjdoc to classpath.
* scripts/makemake.tcl:
* sources.am: Regenerated.
* java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java:
New, copied from classpath, use System instead of VMSystem.
* java/lang/StringBuffer.java: Merge from classpath.
* java/lang/ClassLoader.java: Merge from classpath.
* gcj/javaprims.h: Update class definitions,
remove _Jv_jobjectRefType, jobjectRefType definitions.
libjava/classpath/ChangeLog.gcj:
2008-10-21 Matthias Klose <doko@ubuntu.com>
* classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
* classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
* Update .class files.
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Always generate parser in the srcdir.
2008-10-21 Matthias Klose <doko@ubuntu.com>
* doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1.
* doc/Makefile.in: Regenerate.
2008-10-20 Matthias Klose <doko@ubuntu.com>
* configure.ac: Don't check for working java, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_java.m4: Revert previous change.
* m4/ac_prog_javac.m4: Apply it here.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Don't check for working javac, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
* Makefile.in, */Makefile.in: Regenerate.
2008-09-30 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for cantlr binary as well.
2008-09-29 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for antlr binary as well.
2008-09-28 Matthias Klose <doko@ubuntu.com>
* PR libgcj/37636. Revert:
2008-02-20 Matthias Klose <doko@ubuntu.com>
* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
Do copy resource files in JAVA_MAINTAINER_MODE only.
* tools/Makefile.in: Regenerate.
2008-09-14 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4:
Revert local changes.
* m4/ac_prog_antlr.m4: Check for an runantlr binary.
* tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER).
* tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in
GLIBJ_CLASSPATH.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Revert:
Daniel Frampton <zyridium at zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-08-15 Matthias Klose <doko@ubuntu.com>
* m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown
args for javac.
libjava/classpath/ChangeLog:
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr.m4:
Remove redundant checks.
* tools/Makefile.am:
Use gjdoc_gendir when calling antlr.
2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Remove superfluous AC_PROG_JAVA call.
2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr:
Check for cantlr as well.
* tools/Makefile.am:
Only build GJDoc parser when both
CREATE_GJDOC and CREATE_GJDOC_PARSER
are on.
2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Add regen-gjdoc-parser option,
and separate antlr tests.
* m4/ac_prog_antlr.m4:
Turn single test into AC_LIB_ANTLR
and AC_PROG_ANTLR.
* m4/ac_prog_java.m4:
Quote tests.
* tools/Makefile.am:
Support CREATE_GJDOC_PARSER option.
2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
* m4/acinclude.m4:
Only require the class files to be built
to allow the tools and examples to be built,
not the installation of glibj.zip.
* tools/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am,
* lib/Makefile.am:
Add GCJ rules.
* m4/ac_prog_javac.m4:
Check whether JAVAC is gcj.
* m4/ac_prog_javac_works.m4:
Add GCJ rules.
* m4/acinclude.m4:
Don't bother checking for -J
if using GCJ.
* tools/Makefile.am:
Add GCJ rules.
2007-08-23 Daniel Frampton <zyridium@zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk>
* java/util/zip/ZipEntry.java:
Use byte fields instead of integer fields,
store the time as well as the DOS time and
don't retain a global Calendar instance.
(setDOSTime(int)): Set KNOWN_DOSTIME instead
of KNOWN_TIME, and unset KNOWN_TIME.
(getDOSTime()): Compute DOS time from UNIX time
only when needed.
(clone()): Provide cloning via the ZipEntry constructor
where possible.
(setTime(long)): Don't compute DOS time at this point.
(getCalendar()): Removed.
2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/getopt/Parser.java:
(setHeader(String)): Make synchronized.
(setFooter(String)): Likewise.
* tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java,
(reset()): Make synchronized.
(name(Class)): Likewise.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* gnu/java/nio/charset/ByteDecodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
* gnu/java/nio/charset/ByteEncodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* java/text/DecimalFormat.java:
(scanFix): Use 'i + 1' when looking at following character.
(scanNegativePattern): Dito.
2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/javah/ClassWrapper.java:
(makeVtable()): Populate methodNameMap.
(printMethods(CniPrintStream)): Always use pre-populated
methodNameMap for bridge targets.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override
annotation to allow compilation on javac < 1.6 and ecj < 3.4.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support
new Escher API.
* gnu/java/awt/peer/x/XImage.java (getSource): method implemented.
* gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer
for getSource.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/BacktrackStack.java,
* gnu/java/util/regex/CharIndexed.java,
* gnu/java/util/regex/CharIndexedCharArray.java,
* gnu/java/util/regex/CharIndexedCharSequence.java,
* gnu/java/util/regex/CharIndexedInputStream.java,
* gnu/java/util/regex/CharIndexedString.java,
* gnu/java/util/regex/CharIndexedStringBuffer.java,
* gnu/java/util/regex/RE.java,
* gnu/java/util/regex/REException.java,
* gnu/java/util/regex/REFilterInputStream.java,
* gnu/java/util/regex/REMatch.java,
* gnu/java/util/regex/REMatchEnumeration.java,
* gnu/java/util/regex/RESyntax.java,
* gnu/java/util/regex/REToken.java,
* gnu/java/util/regex/RETokenAny.java,
* gnu/java/util/regex/RETokenBackRef.java,
* gnu/java/util/regex/RETokenChar.java,
* gnu/java/util/regex/RETokenEnd.java,
* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
* gnu/java/util/regex/RETokenEndSub.java,
* gnu/java/util/regex/RETokenIndependent.java,
* gnu/java/util/regex/RETokenLookAhead.java,
* gnu/java/util/regex/RETokenLookBehind.java,
* gnu/java/util/regex/RETokenNamedProperty.java,
* gnu/java/util/regex/RETokenOneOf.java,
* gnu/java/util/regex/RETokenPOSIX.java,
* gnu/java/util/regex/RETokenRange.java,
* gnu/java/util/regex/RETokenRepeated.java,
* gnu/java/util/regex/RETokenStart.java,
* gnu/java/util/regex/RETokenWordBoundary.java,
* gnu/java/util/regex/UncheckedRE.java:
Fix indentation.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/RETokenStart.java:
(getMaximumLength()): Add Override annotation.
(matchThis(CharIndexed, REMatch)): Likewise.
(returnsFixedLengthMatches()): Renamed from
returnsFixedLengthmatches and added Override
annotation.
(findFixedLengthMatches(CharIndexed,REMatch,int)):
Add Override annotation.
(dump(CPStringBuilder)): Likewise.
* gnu/javax/print/ipp/IppRequest.java:
(RequestWriter.writeOperationAttributes(AttributeSet)):
Throw exception, don't just create and drop it.
* javax/management/MBeanServerPermission.java:
(MBeanServerPermissionCollection.add(Permission)): Compare
against individual Strings not the entire array, and
store the result of replace.
* javax/swing/text/html/StyleSheet.java:
(setBaseFontSize(size)): Store result of trim().
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/tools/FileObject.java:
(openReader(boolean)): Document new parameter.
2008-03-27 Michael Franz <mvfranz@gmail.com>
PR classpath/35690:
* javax/tools/FileObject.java:
(toUri()): Fix case from toURI.
(openReader(boolean)): Add missing boolean argument.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/35487:
* gnu/javax/management/Server.java:
(beans): Change to ConcurrentHashMap.
(defaultDomain): Make final.
(outer): Likewise.
(LazyListenersHolder): Added to wrap
listeners, also now a ConcurrentHashMap,
providing lazy initialisation safely.
(sequenceNumber): Documented.
(getBean(ObjectName)): Remove redundant cast.
(addNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Remove map initialisation
and use holder.
(getObjectInstance(ObjectName)): Remove redundant cast.
(registerMBean(Object,ObjectName)): Add bean atomically.
(removeNotificationListener(ObjectName,NotificationListener)):
Simplified.
(removeNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Likewise.
(notify(ObjectName,String)): Documented.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Server.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Translator.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/DefaultLoaderRepository.java,
* javax/management/JMX.java,
* javax/management/MBeanAttributeInfo.java,
* javax/management/MBeanConstructorInfo.java,
* javax/management/MBeanOperationInfo.java,
* javax/management/MBeanServerDelegate.java:
Fix warnings due to generics.
2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/MBeanPermission.java,
* javax/management/MBeanServerDelegate.java,
* javax/management/MBeanServerFactory.java,
* javax/management/MBeanServerInvocationHandler.java,
* javax/management/MBeanServerPermission.java:
Fix warnings due to use of non-generic collections.
2008-08-25 Mario Torre <neugens@aicas.com>
* gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is
null to avoid NPE.
2008-08-22 Mario Torre <neugens@aicas.com>
* gnu/CORBA/OrbFunctional.java (set_parameters): Fix
NullPointerException checking when param is null.
2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(reset()): Reset append position so
we don't try and append to the end of
the old input.
2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
Also allow versions of GJDoc from 0.8* on, as
CVS is 0.8.0-pre.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
(CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is
being used.
2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Add taglets subdirectory to list of excluded
paths when GJDoc is not compiled.
2008-08-19 David P Grove <groved@us.ibm.com>
* scripts/check_jni_methods.sh.in:
Fix build issue on AIX by splitting generation
of method list.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/gstreamer-peer/gst_native_pipeline.c:
(get_free_space(int)): Use #else not #elif when
there is no condition.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/31895:
* java/text/DecimalFormat.java:
(setCurrency(Currency)): Update prefixes and
suffixes when currency changes.
* java/text/DecimalFormatSymbols.java:
(DecimalFormatSymbols(Locale)): Set locale earlier
so it can be used by setCurrency(Currency).
(setCurrency(Currency)): Set the symbol correctly using
the locale of the instance.
* java/util/Currency.java:
Throw error instead of just printing a message.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/activation/ActivationDataFlavor.java:
Suppress warnings from public API.
(mimeType): Made final.
(representationClass): Added generic type and
made final.
(normalizeMimeTypeParameter(String,String)):
Use CPStringBuilder.
* javax/activation/CommandInfo.java:
(verb): Made final.
(className): Made final.
* javax/activation/DataHandler.java:
(dataSource): Made final.
* javax/activation/FileDataSource.java:
(file): Made final.
* javax/activation/MailcapCommandMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeType.java:
(toString()): Use CPStringBuilder.
(getBaseType()): Likewise.
* javax/activation/MimeTypeParameterList.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeTypeParseException.java:
(MimeTypeParseException(String,String)): Use
CPStringBuilder.
* javax/activation/MimetypesFileTypeMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/URLDataSource.java:
(url): Made final.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/activation/viewers/ImageViewer.java,
* gnu/javax/activation/viewers/TextEditor.java,
* gnu/javax/activation/viewers/TextViewer.java,
* javax/activation/ActivationDataFlavor.java,
* javax/activation/CommandInfo.java,
* javax/activation/CommandMap.java,
* javax/activation/CommandObject.java,
* javax/activation/DataContentHandler.java,
* javax/activation/DataContentHandlerFactory.java,
* javax/activation/DataHandler.java,
* javax/activation/DataHandlerDataSource.java,
* javax/activation/DataSource.java,
* javax/activation/DataSourceDataContentHandler.java,
* javax/activation/FileDataSource.java,
* javax/activation/FileTypeMap.java,
* javax/activation/MailcapCommandMap.java,
* javax/activation/MimeType.java,
* javax/activation/MimeTypeParameterList.java,
* javax/activation/MimeTypeParseException.java,
* javax/activation/MimetypesFileTypeMap.java,
* javax/activation/ObjectDataContentHandler.java,
* javax/activation/URLDataSource.java,
* javax/activation/UnsupportedDataTypeException.java,
* javax/activation/package.html,
* resource/META-INF/mailcap.default,
* resource/META-INF/mimetypes.default:
Import GNU JAF CVS as of 17/08/2008.
2006-04-25 Archit Shah <ashah@redhat.com>
* javax/activation/MimeTypeParameterList.java:
Insert ';' separator before parameter list.
2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com>
* javax/activation/ObjectDataContentHandler.java:
Fixed typo.
2005-05-28 Chris Burdess <dog@bluezoo.org>
* javax/activation/CommandMap.java,
* javax/activation/MailcapCommandMap.java:
Updated to JAF 1.1.
2004-06-09 Chris Burdess <dog@bluezoo.org>
* javax/activation/MailcapCommandMap.java:
Fixed bug whereby x-java prefix was not
attempted.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* AUTHORS: Added Laszlo.
2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/30436:
* java/util/Scanner.java:
Fix package to be java.util and correct
indentation.
2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at>
PR classpath/30436:
* java/util/Scanner.java:
Initial implementation.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(toMatchResult()): Implemented.
2008-08-13 Joshua Sumali <jsumali@redhat.com>
* doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo
instead of invoke.texi. Remove invoke.texi from EXTRA_DIST.
* doc/invoke.texi: Removed and merged into ...
* doc/cp-tools.texinfo: Here
2008-08-12 Robert Schuster <robertschuster@fsfe.org>
* native/jni/java-net/local.c
(local_bind): Removed fprintf call, fixed access outside
of array bounds.
From-SVN: r141271
1397 lines
40 KiB
C
1397 lines
40 KiB
C
/* gnu_java_math_GMP.c -- Native MPI implemenetation over GNU MP
|
|
Copyright (C) 2006 Free Software Foundation, Inc.
|
|
|
|
This file is a part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or (at
|
|
your option) any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
|
|
USA
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif /* HAVE_CONFIG_H */
|
|
|
|
#include "gnu_java_math_GMP.h"
|
|
#include <jcl.h>
|
|
|
|
#if defined(HAVE_GMP_H)
|
|
#include <gmp.h>
|
|
#endif /* defined(HAVE_GMP_H) */
|
|
|
|
#if defined(WITH_GNU_MP)
|
|
#else
|
|
#warning GNU MP not available or wanted!
|
|
#warning Invocation of natXXX() methods will raise an exception
|
|
#endif
|
|
|
|
/*
|
|
* This is the implementation of the native BigInteger$NativeMPI methods which
|
|
* use the GNU MP (GMP) library.
|
|
*
|
|
* In all the Java non-statically declared native methods, the second argument,
|
|
* an instance of jobject, refers to the current NativeMPI instance; i.e.
|
|
* "this" in Java parlance. The corresponding allocated data structure
|
|
* representing the GMP's counter-part is pointed-to by the pointer stored in a
|
|
* transient java field named "native_ptr". The first thing these methods do is
|
|
* (a) access that field with a JNI GetObjectField() call to obtain the
|
|
* reference to the gnu.classpath.Pointer subclass instance, then (b) obtain
|
|
* the native GMP pointer (an mpz_ptr), in order to perform their job; e.g.
|
|
*
|
|
* JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr))
|
|
*
|
|
* For static methods the second argument, an instance of jclass, is almost
|
|
* always unused --except when initializing the library, which is the only time
|
|
* we get hold of the native pointer field.
|
|
*
|
|
* This code was written and tested with GNU MP version 4.1.2. More recent
|
|
* versions of that library offer more operations; e.g. in the implementation
|
|
* of the method Java_java_math_BigInteger_00024NativeMPI_natFlipBit, mpz_combit()
|
|
* should be used with GNU MP versions later than 4.2. As a consequence, this
|
|
* code should be reviewed, from time to time, to use newer features of the GNU
|
|
* MP library.
|
|
*/
|
|
|
|
static jfieldID native_ptr;
|
|
|
|
#ifdef DEBUG
|
|
#define TRACE(msg) fprintf (stderr, "%s(%s:%d) -- %s\n", __FUNCTION__, __FILE__, __LINE__, msg)
|
|
#else
|
|
#define TRACE(msg)
|
|
#endif
|
|
|
|
#define throw_config_exception(env) JCL_ThrowException (env, "java/lang/Error", "GNU MP was not specified/found by configure")
|
|
|
|
/*
|
|
* Initialize the native library. Specifically this method:
|
|
*
|
|
* a. Pass NULLs to the mp_set_memory_functions implying that GMP should use
|
|
* malloc, realloc and free for memory allocation, and if they fail GMP
|
|
* will print a message to the standard error output and terminates the
|
|
* program.
|
|
* b. Find out and store the reference to the NativeMPI class's 'native_ptr'
|
|
* field. This is done so later in the method invocations we can access that
|
|
* field and acquire the native value associated with that Pointer instance.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natInitializeLibrary (JNIEnv *env,
|
|
jclass nativeMPI)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
TRACE("Loading GMP-based BigInteger native library");
|
|
mp_set_memory_functions (NULL, NULL, NULL);
|
|
native_ptr = (*env)->GetFieldID (env, nativeMPI, "native_ptr",
|
|
"Lgnu/classpath/Pointer;");
|
|
TRACE("Loaded GMP-based BigInteger native library");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) nativeMPI;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* Allocate and initialize the data structure for an instance of a NativeMPI.
|
|
*
|
|
* @param this an instance of NativeMPI.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natInitialize(JNIEnv *env, jobject this)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_ptr _this;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_ptr)JCL_malloc (env, sizeof (mpz_t));
|
|
/* initialize --GMP sets the value to zero. */
|
|
mpz_init (_this);
|
|
/* instantiate the Pointer instance for this NativeMPI. */
|
|
jobject native_ptr_fld = JCL_NewRawDataObject (env, _this);
|
|
/* ... and assign it to the native_ptr field. */
|
|
(*env)->SetObjectField (env, this, native_ptr, native_ptr_fld);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* Clear and free the data structure for an instance of a NativeMPI.
|
|
*
|
|
* @param this an instance of NativeMPI.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natFinalize(JNIEnv *env, jobject this)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_ptr _this;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_ptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
if (_this != NULL)
|
|
{
|
|
mpz_clear (_this);
|
|
free (_this);
|
|
_this = NULL;
|
|
}
|
|
else
|
|
{
|
|
TRACE("WARNING: Already cleared + freed");
|
|
}
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI. On exit, this will have a value of n.
|
|
* @param n a Java long primitive value.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natFromLong(JNIEnv *env, jobject this,
|
|
jlong n)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_ptr _this;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_ptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
/* the size of jlong (64-bit) is either the same as a long, or that of a long long.
|
|
* if it's the former, we use as is. */
|
|
if (sizeof (jlong) == sizeof (long))
|
|
{
|
|
mpz_set_si (_this, (signed long)n);
|
|
}
|
|
else
|
|
{
|
|
/* ...otherwise, we operate on the two halves of the long long, each half
|
|
* being 32-bit wide. for simplicity, we work with positive
|
|
* values negating, if necessary, the final outcome.
|
|
*/
|
|
const int isnegative = n < 0 ? 1 : 0;
|
|
if (isnegative)
|
|
{
|
|
n = -n;
|
|
}
|
|
mpz_set_ui (_this, (unsigned long)(((unsigned long long)n) >> 32));
|
|
mpz_mul_2exp (_this, _this, 32); /* shift left by 32 bits */
|
|
mpz_add_ui (_this, _this, (unsigned long)n);
|
|
if (isnegative)
|
|
{
|
|
mpz_neg (_this, _this);
|
|
}
|
|
}
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) n;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI. On exit, this will have the same
|
|
* value as x.
|
|
* @param x an instance of a NativeMPI's Pointer.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natFromBI(JNIEnv *env, jobject this,
|
|
jobject x)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_ptr _this;
|
|
mpz_srcptr _x;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_ptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
mpz_set (_this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI. On exit, this will have the value
|
|
* represented by the v Java byte array (in 2's complement with most
|
|
* significant byte at index position 0). The sign is implied by the
|
|
* value of the most significant byte.
|
|
* @param v a Java byte array containing the byte representation, in 2's
|
|
* complement of the signed value to assign to this.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natFromByteArray(JNIEnv *env,
|
|
jobject this,
|
|
jbyteArray v)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_ptr _this;
|
|
jbyte *_v;
|
|
unsigned long b;
|
|
int vlength, isnegative, i;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_ptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_v = (*env)->GetByteArrayElements (env, v, NULL);
|
|
vlength = (*env)->GetArrayLength (env, v);
|
|
b = (unsigned long)(_v[0] & 0xFF);
|
|
isnegative = (b > 0x7F) ? 1 : 0;
|
|
mpz_set_ui (_this, 0);
|
|
for (i = 0; i < vlength; i++)
|
|
{
|
|
mpz_mul_2exp (_this, _this, 8); /* shift left 8 positions. */
|
|
b = (unsigned long)(_v[i] & 0xFF);
|
|
b = (isnegative) ? ~b : b;
|
|
mpz_add_ui (_this, _this, (unsigned long)(b & 0xFF));
|
|
}
|
|
(*env)->ReleaseByteArrayElements (env, v, _v, JNI_ABORT);
|
|
if (isnegative)
|
|
{
|
|
mpz_add_ui (_this, _this, 1);
|
|
mpz_neg (_this, _this);
|
|
}
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) v;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI. On exit, this will have the value
|
|
* represented by the s Java string.
|
|
* @param s a Java string containing, a possibly signed, value to assign to
|
|
* this.
|
|
* @param rdx the base in which the symbols, in s, are represented.
|
|
* @return 0 if the entire string is a valid number in base rdx. Otherwise it
|
|
* returns -1.
|
|
*
|
|
* Implementation note:
|
|
* While the GMP library is more tolerant in what it accepts as parameter values
|
|
* for conversions from strings, the BigInteger code, which calls this method,
|
|
* ensures that the contract described in the RI's documentation is respected;
|
|
* e.g. no white spaces in the middle, limited valid radix values, etc...
|
|
*/
|
|
JNIEXPORT jint JNICALL
|
|
Java_gnu_java_math_GMP_natFromString(JNIEnv *env,
|
|
jobject this, jstring s,
|
|
jint rdx)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_ptr _this;
|
|
const char *_s;
|
|
int result;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_ptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_s = (*env)->GetStringUTFChars (env, s, NULL);
|
|
result = mpz_set_str (_this, _s, (int)rdx);
|
|
JCL_free_cstring (env, s, _s);
|
|
TRACE("end");
|
|
return (result);
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) s;
|
|
(void) rdx;
|
|
throw_config_exception(env);
|
|
return (-1);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI. On exit, this will have the value
|
|
* represented by the m Java byte array (most significant byte at
|
|
* index position 0). It will be positive, or negative, depending on
|
|
* the value of isnegative.
|
|
* @param m a Java byte array containing the byte representation of the
|
|
* absolute value (most significant byte being at index position 0)
|
|
* to assign to this.
|
|
* @param isnegative true if this should be negative and false if it should
|
|
* be positive.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natFromSignedMagnitude(JNIEnv *env,
|
|
jobject this,
|
|
jbyteArray m,
|
|
jboolean isnegative)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_ptr _this;
|
|
jbyte *_m;
|
|
int mlength, i;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_ptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_m = (*env)->GetByteArrayElements (env, m, NULL);
|
|
mlength = (*env)->GetArrayLength (env, m);
|
|
mpz_set_ui (_this, 0);
|
|
for (i = 0; i < mlength; i++)
|
|
{
|
|
mpz_mul_2exp (_this, _this, 8);
|
|
mpz_add_ui (_this, _this, (unsigned long)(_m[i] & 0xFF));
|
|
}
|
|
(*env)->ReleaseByteArrayElements (env, m, _m, JNI_ABORT);
|
|
if (isnegative == JNI_TRUE)
|
|
{
|
|
mpz_neg (_this, _this);
|
|
}
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) m;
|
|
(void) isnegative;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param n the base in which to represent this.
|
|
* @return the Java string representing the value of this in base n.
|
|
*/
|
|
JNIEXPORT jstring JNICALL
|
|
Java_gnu_java_math_GMP_natToString(JNIEnv *env, jobject this,
|
|
jint n)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
char *cstr;
|
|
jstring result;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
cstr = mpz_get_str (NULL, (int)n, _this);
|
|
result = (*env)->NewStringUTF (env, cstr);
|
|
free (cstr);
|
|
TRACE("end");
|
|
return (result);
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) n;
|
|
throw_config_exception(env);
|
|
return (NULL);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this a non-ZERO instance of NativeMPI.
|
|
*
|
|
* output:
|
|
* @param r a Java byte array which shall contain the byte representation of
|
|
* this.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natToByteArray(JNIEnv *env,
|
|
jobject this,
|
|
jbyteArray r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
mpz_t _w; /* a temporary work mpi */
|
|
jbyte *_r;
|
|
int rlength, sign, i;
|
|
unsigned long b;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_r = (*env)->GetByteArrayElements (env, r, NULL);
|
|
rlength = (*env)->GetArrayLength (env, r);
|
|
mpz_init (_w);
|
|
/* if this is negative set w to its 2's complement otherwise use as is. */
|
|
sign = mpz_sgn (_this);
|
|
if (sign == 1)
|
|
{
|
|
mpz_set (_w, _this);
|
|
}
|
|
else
|
|
{
|
|
mpz_neg (_w, _this);
|
|
mpz_sub_ui (_w, _w, 1);
|
|
}
|
|
/* _w SHOULD be >= 0.
|
|
* start filling the array starting from the least significant byte. */
|
|
for (i = rlength; --i >= 0; )
|
|
{
|
|
b = mpz_tdiv_q_ui (_w, _w, 256);
|
|
b = (sign == -1) ? ~b : b;
|
|
_r[i] = (unsigned long)(b & 0xFF);
|
|
}
|
|
(*env)->ReleaseByteArrayElements (env, r, _r, JNI_COMMIT);
|
|
/* if _w > 0 the byte array was short. */
|
|
if (mpz_cmp_ui (_w, 0) > 0)
|
|
{
|
|
TRACE("WARNING: byte array is too short");
|
|
}
|
|
mpz_clear (_w);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @return the "int" value (least significant 32 bits) of the absolute value
|
|
* of this NativeMPI. The calling code MUST handle the sign. We do
|
|
* this so we can use the same method when computing the "long" value
|
|
* as well.
|
|
*/
|
|
JNIEXPORT jint JNICALL
|
|
Java_gnu_java_math_GMP_natAbsIntValue(JNIEnv *env,
|
|
jobject this)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
TRACE("end");
|
|
return ((jint)mpz_get_ui (_this));
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) s;
|
|
throw_config_exception(env);
|
|
return (-1);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @return the, eventually truncated, double value of this NativeMPI.
|
|
*/
|
|
JNIEXPORT jdouble JNICALL
|
|
Java_gnu_java_math_GMP_natDoubleValue(JNIEnv *env,
|
|
jobject this)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
TRACE("end");
|
|
return ((jdouble)mpz_get_d (_this));
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
throw_config_exception(env);
|
|
return (0.0);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this a NativeMPI instance.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
* @return -1, 0, +1 if x is respectively less than, equal to, or greater
|
|
* than y.
|
|
*/
|
|
JNIEXPORT jint JNICALL
|
|
Java_gnu_java_math_GMP_natCompare(JNIEnv *env, jobject this,
|
|
jobject x)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_ptr _this, _x;
|
|
int res;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_ptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_ptr)JCL_GetRawData (env, x);
|
|
res = mpz_cmp (_this, _x);
|
|
TRACE("end");
|
|
if (res == 0)
|
|
return ((jint)0);
|
|
else if (res < 0)
|
|
return ((jint)-1);
|
|
else
|
|
return ((jint)1);
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) x;
|
|
(void) y;
|
|
throw_config_exception(env);
|
|
return (0);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this + x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natAdd(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_add (_r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this - x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natSubtract(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_sub (_r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this * x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natMultiply(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_mul (_r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this div x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natQuotient(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_tdiv_q (_r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this mod x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natRemainder(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_tdiv_r (_r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param q a NativeMPI's Pointer such that q = this div x.
|
|
* @param r a NativeMPI's Pointer such that r = this mod x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natQuotientAndRemainder(JNIEnv *env,
|
|
jobject this,
|
|
jobject x,
|
|
jobject q,
|
|
jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _q, _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_q = (mpz_ptr)JCL_GetRawData (env, q);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_tdiv_qr (_q, _r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) q;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this mod x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natModulo(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_mod (_r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param n a non-negative number to raise this to.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this ** n.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natPow(JNIEnv *env, jobject this,
|
|
jint n, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_pow_ui (_r, _this, (unsigned long)n);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) n;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param e an instance of NativeMPI's Pointer.
|
|
* @param m another instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = (this**e) mod m.
|
|
*
|
|
* @throws java.lang.ArithmeticException if e is negative and (1 / this) mod m
|
|
* has no multiplicative inverse.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natModPow(JNIEnv *env, jobject this,
|
|
jobject e, jobject m,
|
|
jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _e, _m;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_e = (mpz_srcptr)JCL_GetRawData (env, e);
|
|
_m = (mpz_srcptr)JCL_GetRawData (env, m);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
/* the documentation of mpz_powm(rop, b, e, m) states that it: "Set rop to
|
|
* (b raised to e) modulo m. Negative e is supported if an inverse b^-1 mod m
|
|
* exists.... If an inverse doesn't exist then a divide by zero is raised."
|
|
* to work around this case we use the same code as in the pure java class;
|
|
* i.e.:
|
|
* if (e.isNegative())
|
|
* return this.modInverse(m).modPow(e.negate(), m); */
|
|
if (mpz_sgn (_e) == -1)
|
|
{
|
|
mpz_t _w; /* a temporary work mpi */
|
|
const int res = mpz_invert (_r, _this, _m);
|
|
if (res == 0)
|
|
{
|
|
JCL_ThrowException (env, "java/lang/ArithmeticException",
|
|
"No multiplicative inverse modulo the designated number exists");
|
|
}
|
|
mpz_init (_w);
|
|
mpz_neg (_w, _e);
|
|
mpz_powm (_r, _r, _w, _m);
|
|
mpz_clear (_w);
|
|
}
|
|
else
|
|
{
|
|
mpz_powm (_r, _this, _e, _m);
|
|
}
|
|
|
|
while (mpz_sgn (_r) == -1)
|
|
{
|
|
mpz_add (_r, _r, _m);
|
|
}
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) e;
|
|
(void) m;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param m an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = (1 / this) mod m.
|
|
* @throws java.lang.ArithmeticException if (1 / this) mod m has no
|
|
* multiplicative inverse.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natModInverse(JNIEnv *env,
|
|
jobject this,
|
|
jobject m, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _m;
|
|
mpz_ptr _r;
|
|
int res;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_m = (mpz_srcptr)JCL_GetRawData (env, m);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
res = mpz_invert (_r, _this, _m);
|
|
if (res == 0)
|
|
{
|
|
JCL_ThrowException (env, "java/lang/ArithmeticException",
|
|
"No multiplicative inverse modulo the designated number exists");
|
|
}
|
|
|
|
while (mpz_sgn (_r) == -1)
|
|
{
|
|
mpz_add (_r, _r, _m);
|
|
}
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r is the GCD of this and x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natGCD(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_gcd (_r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param n number of Miller-Rabin tests to conduct.
|
|
* @return 2 if this is definitely prime. Returns 1 if this is probably prime
|
|
* (without being certain). Finally, returns 0 if this is definitely
|
|
* composite.
|
|
*/
|
|
JNIEXPORT jint JNICALL
|
|
Java_gnu_java_math_GMP_natTestPrimality(JNIEnv *env,
|
|
jobject this, jint n)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
TRACE("end");
|
|
return ((jint)mpz_probab_prime_p (_this, (int)n));
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) n;
|
|
throw_config_exception(env);
|
|
return (0);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param n the non-negative number of positions to shift right this by.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this * 2**n.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natShiftLeft(JNIEnv *env, jobject this,
|
|
jint n, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_mul_2exp (_r, _this, (unsigned long)n);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) n;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param n the non-negative number of positions to shift left this by.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = floor(this / 2**n).
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natShiftRight(JNIEnv *env,
|
|
jobject this, jint n,
|
|
jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_fdiv_q_2exp (_r, _this, (unsigned long)n);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) n;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @return the 0-based index of the lowest significant bit set (to 1) in this.
|
|
*/
|
|
JNIEXPORT jint JNICALL
|
|
Java_gnu_java_math_GMP_natLowestSetBit(JNIEnv *env,
|
|
jobject this)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
TRACE("end");
|
|
return ((jint)mpz_scan1 (_this, 0));
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
throw_config_exception(env);
|
|
return (-1);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = abs(x).
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natAbs(JNIEnv *env, jobject this,
|
|
jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_abs (_r, _this);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = -x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natNegate(JNIEnv *env, jobject this,
|
|
jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_neg (_r, _this);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @return the number of bits needed to represent this.
|
|
*/
|
|
JNIEXPORT jint JNICALL
|
|
Java_gnu_java_math_GMP_natBitLength(JNIEnv *env, jobject this)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
TRACE("end");
|
|
return ((jint)mpz_sizeinbase (_this, 2));
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
throw_config_exception(env);
|
|
return (-1);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI. It MUST be >= ZERO.
|
|
* @return the number of bits set (to 1) in this.
|
|
*/
|
|
JNIEXPORT jint JNICALL
|
|
Java_gnu_java_math_GMP_natSetBitCount(JNIEnv *env,
|
|
jobject this)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
mpz_ptr _bi;
|
|
unsigned long res = 0;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
switch (mpz_sgn (_this))
|
|
{
|
|
case -1:
|
|
/* initialize --GMP sets the value to zero. */
|
|
_bi = (mpz_ptr)JCL_malloc (env, sizeof (mpz_t));
|
|
mpz_init (_bi);
|
|
mpz_neg (_bi, _this);
|
|
res = mpz_popcount (_bi);
|
|
mpz_clear (_bi);
|
|
free (_bi);
|
|
break;
|
|
case 0:
|
|
res = 0;
|
|
break;
|
|
case 1:
|
|
res = mpz_popcount (_this);
|
|
default:
|
|
JCL_ThrowException (env, "java/lang/Error",
|
|
"Unexpected sign value for a native MPI");
|
|
}
|
|
TRACE("end");
|
|
return ((jint)res);
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
throw_config_exception(env);
|
|
return (ULONG_MAX);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this ^ x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natXor(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_xor (_r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this | x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natOr(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_ior (_r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this & x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natAnd(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_and (_r, _this, _x);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param x an instance of NativeMPI's Pointer.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = this & ~x.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natAndNot(JNIEnv *env, jobject this,
|
|
jobject x, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this, _x;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_x = (mpz_srcptr)JCL_GetRawData (env, x);
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_com (_r, _x);
|
|
mpz_and (_r, _this, _r);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) x;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param n the 0-based index position of the bit to flip in this. n MUST be
|
|
* greater than, or equal to 0.
|
|
*
|
|
* output:
|
|
* @param r a copy of this NativeMPI's Pointer with its n-th bit flipped.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natFlipBit(JNIEnv *env, jobject this,
|
|
jint n, jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_set (_r, _this);
|
|
/* GNU MP versions earlier than 4.2 do not define this method:
|
|
* mpz_combit (_r, (unsigned long)n); */
|
|
if (mpz_tstbit (_r, (unsigned long)n) == 1)
|
|
{
|
|
mpz_clrbit (_r, (unsigned long)n);
|
|
}
|
|
else
|
|
{
|
|
mpz_setbit (_r, (unsigned long)n);
|
|
}
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) n;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param n the 0-based index position of the bit to test in this. n MUST be
|
|
* greater than, or equal to 0.
|
|
* @return +1, or -1 depending on whether the n-th bit in this is set or not
|
|
* respectively.
|
|
*/
|
|
JNIEXPORT jint JNICALL
|
|
Java_gnu_java_math_GMP_natTestBit(JNIEnv *env, jobject this,
|
|
jint n)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
TRACE("end");
|
|
return ((jint)mpz_tstbit (_this, (unsigned long)n));
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) n;
|
|
throw_config_exception(env);
|
|
return (-1);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
* @param n the 0-based index position of the bit to set, or clear, in this.
|
|
* n MUST be greater than, or equal to 0.
|
|
* @param setIt if true, then the n-th bit in this will be set, otherwise it
|
|
* will be cleared.
|
|
*
|
|
* output:
|
|
* @param r a copy of this NativeMPI's Pointer with its n-th bit set or cleared
|
|
* as requested.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natSetBit(JNIEnv *env, jobject this,
|
|
jint n, jboolean setIt,
|
|
jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_set (_r, _this);
|
|
if (setIt == JNI_TRUE)
|
|
{
|
|
mpz_setbit (_r, (unsigned long)n);
|
|
}
|
|
else
|
|
{
|
|
mpz_clrbit (_r, (unsigned long)n);
|
|
}
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) n;
|
|
(void) setIt;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|
|
|
|
/*
|
|
* @param this an instance of NativeMPI.
|
|
*
|
|
* output:
|
|
* @param r a NativeMPI's Pointer such that r = ~this.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_math_GMP_natNot(JNIEnv *env, jobject this,
|
|
jobject r)
|
|
{
|
|
#if defined(WITH_GNU_MP)
|
|
mpz_srcptr _this;
|
|
mpz_ptr _r;
|
|
|
|
TRACE("begin");
|
|
_this = (mpz_srcptr)JCL_GetRawData (env, (*env)->GetObjectField (env, this, native_ptr));
|
|
_r = (mpz_ptr)JCL_GetRawData (env, r);
|
|
mpz_com (_r, _this);
|
|
TRACE("end");
|
|
#else /* !defined(WITH_GNU_MP) */
|
|
(void) this;
|
|
(void) r;
|
|
throw_config_exception(env);
|
|
#endif /* defined(WITH_GNU_MP) */
|
|
}
|