Refactored computations of sizes of data types and offsets of fields

in data structures in GlueGen to be performed lazily via SizeThunks.
The concrete size of primitive data types is computed only by passing
a MachineDescription into one of these thunks. Changed generated glue
code for struct accessors to delegate their instantiation and field
access to specialized 32- or 64-bit versions. This should allow one
jar file to support both 32-bit and 64-bit CPUs; the native code is of
course still specialized for the processor and data model. Changed
default build to generate both 32-bit and 64-bit accessors for all
generated data structures. Tested on Windows; more testing, including
build testing, is needed on other platforms.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@426 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 4 insertions, 12 deletions

diff --git a/src/classes/com/sun/gluegen/GlueGen.java b/src/classes/com/sun/gluegen/GlueGen.java
index c192ae8cd..a7c64a840 100644
--- a/src/classes/com/sun/gluegen/GlueGen.java
+++ b/src/classes/com/sun/gluegen/GlueGen.java
@@ -146,16 +146,6 @@ public class GlueGen implements GlueEmitterControls {
       }
 
       HeaderParser headerParser = new HeaderParser();
-      MachineDescription machDesc;
-      String os = System.getProperty("os.name").toLowerCase();
-      String cpu = System.getProperty("os.arch").toLowerCase();
-      if ((os.startsWith("linux") && cpu.equals("amd64")) ||
-          (os.startsWith("linux") && cpu.equals("ia64"))) {
-           machDesc = new MachineDescription64Bit();
-      } else {
-           machDesc = new MachineDescription32Bit();
-      }
-      headerParser.setMachineDescription(machDesc);
       TypeDictionary td = new TypeDictionary();
       headerParser.setTypedefDictionary(td);
       TypeDictionary sd = new TypeDictionary();
@@ -190,8 +180,10 @@ public class GlueGen implements GlueEmitterControls {
         emit.readConfigurationFile((String) iter.next());
       }
 
-      // provide MachineDescription to emitter if it needs it
-      emit.setMachineDescription(machDesc);
+      // Provide MachineDescriptions to emitter
+      MachineDescription md32 = new MachineDescription32Bit();
+      MachineDescription md64 = new MachineDescription64Bit();
+      emit.setMachineDescription(md32, md64);
 
       // begin emission of glue code
       emit.beginEmission(this);