[Core] Fix ExceptionInInitializerError

Over-Run · Aug 1, 2023 · 229c299 · 229c299
1 parent a6f43dc
commit 229c299
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/modules/overrungl.core/src/main/java/overrungl/FunctionDescriptors.java b/modules/overrungl.core/src/main/java/overrungl/FunctionDescriptors.java
@@ -16,7 +16,7 @@
 
 package overrungl;
 
-import overrungl.internal.RuntimeHelper;
+import overrungl.util.MemoryUtil;
 
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.ValueLayout;
@@ -25,7 +25,6 @@
 
 /**
  * The function descriptors.
- *
  * <h2>Mappings</h2>
  * {@snippet lang = java:
  * switch (c) {
@@ -123,7 +122,7 @@ public static ValueLayout ofValue(char c) throws IllegalArgumentException {
             case 'F' -> JAVA_FLOAT;
             case 'D' -> JAVA_DOUBLE;
             case 'P' -> ADDRESS;
-            case 'p' -> RuntimeHelper.ADDRESS_UNBOUNDED;
+            case 'p' -> MemoryUtil.ADDRESS_UNBOUNDED;
             default ->
                 throw new IllegalArgumentException(
                     STR."Invalid argument c: expected one of B, S, I, J, C, Z, F, D, P or p; got '\{c}'"

diff --git a/modules/overrungl.core/src/main/java/overrungl/util/MemoryUtil.java b/modules/overrungl.core/src/main/java/overrungl/util/MemoryUtil.java
@@ -34,6 +34,10 @@
  * @since 0.1.0
  */
 public final class MemoryUtil {
+    /**
+     * An unbounded address layout.
+     */
+    public static final AddressLayout ADDRESS_UNBOUNDED = ValueLayout.ADDRESS.withTargetLayout(MemoryLayout.sequenceLayout(ValueLayout.JAVA_BYTE));
     private static final SymbolLookup LOOKUP = RuntimeHelper.LINKER.defaultLookup();
     private static final MethodHandle
         m_malloc = downcall("malloc", JP),
@@ -48,10 +52,6 @@ public final class MemoryUtil {
      * The address of {@code NULL}.
      */
     public static final long NULL = 0x0L;
-    /**
-     * An unbounded address layout.
-     */
-    public static final AddressLayout ADDRESS_UNBOUNDED = ValueLayout.ADDRESS.withTargetLayout(MemoryLayout.sequenceLayout(ValueLayout.JAVA_BYTE));
 
     private static MethodHandle downcall(String name, FunctionDescriptors function) {
         return RuntimeHelper.downcallThrow(LOOKUP.find(name), function);