Skip to content

Commit

Permalink
Merge pull request #327 from laokz/master
Browse files Browse the repository at this point in the history
Add riscv64 linux support
  • Loading branch information
headius committed Sep 12, 2023
2 parents 5d4b94c + 153c25f commit 7340b87
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/main/java/jnr/ffi/Platform.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -308,6 +313,7 @@ private static int calculateAddressSize(CPU cpu) {
case AARCH64:
case MIPS64EL:
case LOONGARCH64:
case RISCV64:
dataModel = 64;
break;
default:
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
}

0 comments on commit 7340b87

Please sign in to comment.