From 0a8e1566c766f3b5a5e71b5d80500034f1a614a8 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 20 Jul 2011 07:30:48 +0200
Subject: Cleanup: Platform CPU enum, MachineDescription,

Platform:
  - enum CPUFamily is part of CPUType
  - DALVIK -> ANDROID
  - ARM: ARM + ARMv[567]

MachineDescription
   - self contained
   - static size/alignment Config (enum) for unix32, unix64, win32, win64 and armeabi
   - add 'long double'
   - Removed MachineDescription32Bit, MachineDescription64Bit
   - createStatic(..) uses OS/CPU to fetch best match if not at runtime

FIXES: JavaEmitter's struct-emit: Proper 32/64 struct sizes

TODO: StructAccessor's mapping to <Type>Buffer w/ index os sizeof(<Type>)
      doesn't work, since offset may not be multiple of sizeof(<Type>)!

i.e.
typedef struct {
    int8_t bits1;  // +1       -   0
                   // +3 (p32)
    int32_t id;    // +4       -   4
    int8_t bits2;  // +1       -   8
                   // +3 (p32) -
    int64_t long0; // +8       -  12

so "longBuffer.get(<type-sized index>)" is invalid,
but "byteBuffer.getLong(<byte index>)" must be done.

The actual impl. doesn't matter, hence dropping the other nio type mappings is good.
---
 .../common/os/MachineDescriptionRuntime.java       | 25 ++++++++--------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'src/java/jogamp/common/os/MachineDescriptionRuntime.java')

diff --git a/src/java/jogamp/common/os/MachineDescriptionRuntime.java b/src/java/jogamp/common/os/MachineDescriptionRuntime.java
index 5d4a8c3..a5ecc1d 100644
--- a/src/java/jogamp/common/os/MachineDescriptionRuntime.java
+++ b/src/java/jogamp/common/os/MachineDescriptionRuntime.java
@@ -31,6 +31,7 @@ package jogamp.common.os;
 import com.jogamp.common.nio.Buffers;
 import com.jogamp.common.os.MachineDescription;
 import com.jogamp.common.os.NativeLibrary;
+import com.jogamp.common.os.Platform;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
@@ -66,11 +67,7 @@ public class MachineDescriptionRuntime {
             
             return getMachineDescriptionImpl(pointerSizeInBytes, (int) pageSizeL);
         } else {
-            if(is32BitByCPUArch) {
-                return new MachineDescription32Bit();            
-            } else {
-                return new MachineDescription64Bit();            
-            }
+            return MachineDescription.createStatic(is32BitByCPUArch);
         }
     }
 
@@ -78,21 +75,15 @@ public class MachineDescriptionRuntime {
         // size:      int, long, float, double, pointer, pageSize
         // alignment: int8, int16, int32, int64, int, long, float, double, pointer
         return new MachineDescription( 
-            true /* runtime validated */,
-            isLittleEndianImpl(),
+            true /* runtime validated */, MachineDescription.queryIsLittleEndian(),
+            
             getSizeOfIntImpl(), getSizeOfLongImpl(),
-            getSizeOfFloatImpl(), getSizeOfDoubleImpl(), pointerSize, pageSize,
+            getSizeOfFloatImpl(), getSizeOfDoubleImpl(), getSizeOfLongDoubleImpl(), pointerSize, pageSize,
             
             getAlignmentInt8Impl(), getAlignmentInt16Impl(), getAlignmentInt32Impl(), getAlignmentInt64Impl(),
             getAlignmentIntImpl(), getAlignmentLongImpl(), 
-            getAlignmentFloatImpl(), getAlignmentDoubleImpl(), getAlignmentPointerImpl());        
-    }
-    private static boolean isLittleEndianImpl() {
-        ByteBuffer tst_b = Buffers.newDirectByteBuffer(Buffers.SIZEOF_INT); // 32bit in native order
-        IntBuffer tst_i = tst_b.asIntBuffer();
-        ShortBuffer tst_s = tst_b.asShortBuffer();
-        tst_i.put(0, 0x0A0B0C0D);
-        return 0x0C0D == tst_s.get(0);
+            getAlignmentFloatImpl(), getAlignmentDoubleImpl(), getAlignmentLongDoubleImpl(), 
+            getAlignmentPointerImpl());        
     }
     
     private static native int getPointerSizeInBytesImpl();
@@ -107,10 +98,12 @@ public class MachineDescriptionRuntime {
     private static native int getAlignmentPointerImpl();
     private static native int getAlignmentFloatImpl();
     private static native int getAlignmentDoubleImpl();
+    private static native int getAlignmentLongDoubleImpl();
     private static native int getSizeOfIntImpl();
     private static native int getSizeOfLongImpl();
     private static native int getSizeOfPointerImpl();
     private static native int getSizeOfFloatImpl();
     private static native int getSizeOfDoubleImpl();    
+    private static native int getSizeOfLongDoubleImpl();    
 }
 
-- 
cgit v1.2.3