From 153c25fb9df915880cbc5b1500bfed0f11ccb388 Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Thu, 16 Mar 2023 11:45:59 +0800 Subject: [PATCH] Add riscv64 support Signed-off-by: Kai Zhang --- src/main/java/jnr/ffi/Platform.java | 6 ++ .../platform/riscv64/linux/TypeAliases.java | 72 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 src/main/java/jnr/ffi/provider/jffi/platform/riscv64/linux/TypeAliases.java diff --git a/src/main/java/jnr/ffi/Platform.java b/src/main/java/jnr/ffi/Platform.java index ce247abd..ebb6422e 100644 --- a/src/main/java/jnr/ffi/Platform.java +++ b/src/main/java/jnr/ffi/Platform.java @@ -130,6 +130,9 @@ public enum CPU { /** 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 @@ private static CPU determineCPU() { 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 @@ -308,6 +313,7 @@ private static int calculateAddressSize(CPU cpu) { case AARCH64: case MIPS64EL: case LOONGARCH64: + case RISCV64: dataModel = 64; break; default: diff --git a/src/main/java/jnr/ffi/provider/jffi/platform/riscv64/linux/TypeAliases.java b/src/main/java/jnr/ffi/provider/jffi/platform/riscv64/linux/TypeAliases.java new file mode 100644 index 00000000..db837ca2 --- /dev/null +++ b/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 ALIASES = buildTypeMap(); + private static Map buildTypeMap() { + Map m = new EnumMap(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; + } +}