From 0a8e1566c766f3b5a5e71b5d80500034f1a614a8 Mon Sep 17 00:00:00 2001 From: Sven Gothel 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 Buffer w/ index os sizeof() doesn't work, since offset may not be multiple of sizeof()! 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()" is invalid, but "byteBuffer.getLong()" must be done. The actual impl. doesn't matter, hence dropping the other nio type mappings is good. --- src/junit/com/jogamp/common/util/IntIntHashMapTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/junit/com/jogamp/common/util/IntIntHashMapTest.java') diff --git a/src/junit/com/jogamp/common/util/IntIntHashMapTest.java b/src/junit/com/jogamp/common/util/IntIntHashMapTest.java index 09aff1c..22ff25a 100644 --- a/src/junit/com/jogamp/common/util/IntIntHashMapTest.java +++ b/src/junit/com/jogamp/common/util/IntIntHashMapTest.java @@ -55,7 +55,7 @@ public class IntIntHashMapTest { @BeforeClass public static void init() { - iterations = ( Platform.CPUType.ARM == Platform.CPU_TYPE ) ? 100 : 10000; + iterations = ( Platform.getCPUType().getFamily() == Platform.CPUFamily.ARM ) ? 100 : 10000; pairs = new IntIntUniqueRndValues(iterations); } -- cgit v1.2.3