[Git][java-team/jnr-ffi][upstream] New upstream version 2.2.15

Miguel Landaeta (@nomadium) gitlab at salsa.debian.org
Sun Dec 3 17:27:36 GMT 2023



Miguel Landaeta pushed to branch upstream at Debian Java Maintainers / jnr-ffi


Commits:
14cd4c6c by Miguel Landaeta at 2023-11-25T21:26:34+00:00
New upstream version 2.2.15

- - - - -


5 changed files:

- pom.xml
- src/main/java/jnr/ffi/Platform.java
- src/main/java/jnr/ffi/provider/jffi/StubCompiler.java
- + src/main/java/jnr/ffi/provider/jffi/platform/aarch64/windows/TypeAliases.java
- + src/main/java/jnr/ffi/provider/jffi/platform/riscv64/linux/TypeAliases.java


Changes:

=====================================
pom.xml
=====================================
@@ -9,7 +9,7 @@
   <groupId>com.github.jnr</groupId>
   <artifactId>jnr-ffi</artifactId>
   <packaging>jar</packaging>
-  <version>2.2.13</version>
+  <version>2.2.15</version>
   <name>jnr-ffi</name>
   <description>A library for invoking native functions from java</description>
   <url>http://github.com/jnr/jnr-ffi</url>
@@ -61,13 +61,13 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jffi</artifactId>
-      <version>1.3.10</version>
+      <version>1.3.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jffi</artifactId>
-      <version>1.3.10</version>
+      <version>1.3.12</version>
       <scope>runtime</scope>
       <classifier>native</classifier>
     </dependency>


=====================================
src/main/java/jnr/ffi/Platform.java
=====================================
@@ -130,6 +130,9 @@ public abstract class Platform {
         /** 64 bit LOONGARCH */
         LOONGARCH64,
 
+        /** 64 bit RISC-V */
+        RISCV64,
+
         /**
          * Unknown CPU architecture.  A best effort will be made to infer architecture
          * specific values such as address and long size.
@@ -246,6 +249,8 @@ public abstract class Platform {
             return CPU.MIPS64EL;
         } else if (equalsIgnoreCase("loongarch64", archString)) {
            return CPU.LOONGARCH64;
+        } else if (equalsIgnoreCase("riscv64", archString)) {
+           return CPU.RISCV64;
         }
 
         // Try to find by lookup up in the CPU list
@@ -306,8 +311,9 @@ public abstract class Platform {
                 case SPARCV9:
                 case S390X:
                 case AARCH64:
-		case MIPS64EL:
-		case LOONGARCH64:
+                case MIPS64EL:
+                case LOONGARCH64:
+                case RISCV64:
                     dataModel = 64;
                     break;
                 default:


=====================================
src/main/java/jnr/ffi/provider/jffi/StubCompiler.java
=====================================
@@ -50,7 +50,7 @@ abstract class StubCompiler {
                     break;
                 case X86_64:
                     if (Platform.getPlatform().getOS() != Platform.OS.WINDOWS) {
-                        return new X86_64StubCompiler(runtime);	//currently supporting only A64
+                        return new X86_64StubCompiler(runtime);    //currently supporting only A64
                     }
                     break;
                 case AARCH64:


=====================================
src/main/java/jnr/ffi/provider/jffi/platform/aarch64/windows/TypeAliases.java
=====================================
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2012 Wayne Meissner
+ *
+ * This file is part of the JNR project.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jnr.ffi.provider.jffi.platform.aarch64.windows;
+
+import jnr.ffi.NativeType;
+import jnr.ffi.TypeAlias;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+public final class TypeAliases {
+    public static final Map<TypeAlias, NativeType> ALIASES = buildTypeMap();
+    private static Map<TypeAlias, NativeType> buildTypeMap() {
+        Map<TypeAlias, NativeType> m = new EnumMap<TypeAlias, NativeType>(TypeAlias.class);
+        m.put(TypeAlias.int8_t, NativeType.SCHAR);
+        m.put(TypeAlias.u_int8_t, NativeType.UCHAR);
+        m.put(TypeAlias.int16_t, NativeType.SSHORT);
+        m.put(TypeAlias.u_int16_t, NativeType.USHORT);
+        m.put(TypeAlias.int32_t, NativeType.SINT);
+        m.put(TypeAlias.u_int32_t, NativeType.UINT);
+        m.put(TypeAlias.int64_t, NativeType.SLONGLONG);
+        m.put(TypeAlias.u_int64_t, NativeType.ULONGLONG);
+        m.put(TypeAlias.intptr_t, NativeType.SLONGLONG);
+        m.put(TypeAlias.uintptr_t, NativeType.ULONGLONG);
+        m.put(TypeAlias.caddr_t, NativeType.ADDRESS);
+        m.put(TypeAlias.dev_t, NativeType.UINT);
+        m.put(TypeAlias.blkcnt_t, NativeType.SLONG);
+        m.put(TypeAlias.blksize_t, NativeType.SLONG);
+        m.put(TypeAlias.gid_t, NativeType.SINT);
+        m.put(TypeAlias.in_addr_t, NativeType.UINT);
+        m.put(TypeAlias.in_port_t, NativeType.USHORT);
+        m.put(TypeAlias.ino_t, NativeType.USHORT);
+        m.put(TypeAlias.ino64_t, NativeType.ULONGLONG);
+        m.put(TypeAlias.key_t, NativeType.SINT);
+        m.put(TypeAlias.mode_t, NativeType.USHORT);
+        m.put(TypeAlias.nlink_t, NativeType.SINT);
+        m.put(TypeAlias.id_t, NativeType.SINT);
+        m.put(TypeAlias.pid_t, NativeType.SLONGLONG);
+        m.put(TypeAlias.off_t, NativeType.SLONGLONG);
+        m.put(TypeAlias.swblk_t, NativeType.SLONG);
+        m.put(TypeAlias.uid_t, NativeType.SINT);
+        m.put(TypeAlias.clock_t, NativeType.SINT);
+        m.put(TypeAlias.size_t, NativeType.ULONGLONG);
+        m.put(TypeAlias.ssize_t, NativeType.SLONGLONG);
+        m.put(TypeAlias.time_t, NativeType.SLONGLONG);
+        m.put(TypeAlias.fsblkcnt_t, NativeType.ULONG);
+        m.put(TypeAlias.fsfilcnt_t, NativeType.ULONG);
+        m.put(TypeAlias.sa_family_t, NativeType.USHORT);
+        m.put(TypeAlias.socklen_t, NativeType.SINT);
+        m.put(TypeAlias.rlim_t, NativeType.SINT);
+        m.put(TypeAlias.cc_t, NativeType.UCHAR);
+        m.put(TypeAlias.speed_t, NativeType.UINT);
+        m.put(TypeAlias.tcflag_t, NativeType.UINT);
+        return m;
+    }
+}


=====================================
src/main/java/jnr/ffi/provider/jffi/platform/riscv64/linux/TypeAliases.java
=====================================
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2016 Wayne Meissner
+ *
+ * This file is part of the JNR project.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jnr.ffi.provider.jffi.platform.riscv64.linux;
+
+import jnr.ffi.NativeType;
+import jnr.ffi.TypeAlias;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+public final class TypeAliases {
+    public static final Map<TypeAlias, jnr.ffi.NativeType> ALIASES = buildTypeMap();
+    private static Map<TypeAlias, jnr.ffi.NativeType> buildTypeMap() {
+        Map<TypeAlias, jnr.ffi.NativeType> m = new EnumMap<TypeAlias, jnr.ffi.NativeType>(TypeAlias.class);
+        m.put(TypeAlias.int8_t, NativeType.SCHAR);
+        m.put(TypeAlias.u_int8_t, NativeType.UCHAR);
+        m.put(TypeAlias.int16_t, NativeType.SSHORT);
+        m.put(TypeAlias.u_int16_t, NativeType.USHORT);
+        m.put(TypeAlias.int32_t, NativeType.SINT);
+        m.put(TypeAlias.u_int32_t, NativeType.UINT);
+        m.put(TypeAlias.int64_t, NativeType.SLONG);
+        m.put(TypeAlias.u_int64_t, NativeType.ULONG);
+        m.put(TypeAlias.intptr_t, NativeType.SLONG);
+        m.put(TypeAlias.uintptr_t, NativeType.ULONG);
+        m.put(TypeAlias.caddr_t, NativeType.ADDRESS);
+        m.put(TypeAlias.dev_t, NativeType.ULONG);
+        m.put(TypeAlias.blkcnt_t, NativeType.SLONG);
+        m.put(TypeAlias.blksize_t, NativeType.SINT);
+        m.put(TypeAlias.gid_t, NativeType.UINT);
+        m.put(TypeAlias.in_addr_t, NativeType.UINT);
+        m.put(TypeAlias.in_port_t, NativeType.USHORT);
+        m.put(TypeAlias.ino_t, NativeType.ULONG);
+        m.put(TypeAlias.ino64_t, NativeType.ULONG);
+        m.put(TypeAlias.key_t, NativeType.SINT);
+        m.put(TypeAlias.mode_t, NativeType.UINT);
+        m.put(TypeAlias.nlink_t, NativeType.UINT);
+        m.put(TypeAlias.id_t, NativeType.UINT);
+        m.put(TypeAlias.pid_t, NativeType.SINT);
+        m.put(TypeAlias.off_t, NativeType.SLONG);
+        m.put(TypeAlias.swblk_t, NativeType.SLONG);
+        m.put(TypeAlias.uid_t, NativeType.UINT);
+        m.put(TypeAlias.clock_t, NativeType.SLONG);
+        m.put(TypeAlias.size_t, NativeType.ULONG);
+        m.put(TypeAlias.ssize_t, NativeType.SLONG);
+        m.put(TypeAlias.time_t, NativeType.SLONG);
+        m.put(TypeAlias.fsblkcnt_t, NativeType.ULONG);
+        m.put(TypeAlias.fsfilcnt_t, NativeType.ULONG);
+        m.put(TypeAlias.sa_family_t, NativeType.USHORT);
+        m.put(TypeAlias.socklen_t, NativeType.UINT);
+        m.put(TypeAlias.rlim_t, NativeType.ULONG);
+        m.put(TypeAlias.cc_t, NativeType.UCHAR);
+        m.put(TypeAlias.speed_t, NativeType.UINT);
+        m.put(TypeAlias.tcflag_t, NativeType.UINT);
+        return m;
+    }
+}



View it on GitLab: https://salsa.debian.org/java-team/jnr-ffi/-/commit/14cd4c6c99ee89886a2715985fb4763df4c3ef00

-- 
View it on GitLab: https://salsa.debian.org/java-team/jnr-ffi/-/commit/14cd4c6c99ee89886a2715985fb4763df4c3ef00
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20231203/a097c572/attachment.htm>


More information about the pkg-java-commits mailing list