From c0fd63416e2160f3d35d13d52a8d1fdcf7f7ffbf Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 25 May 2010 21:00:58 +0200 Subject: Fix: Prepare CMethodBindingEmitter for struct methods as well --- src/java/com/sun/gluegen/JavaEmitter.java | 47 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 25 deletions(-) (limited to 'src/java/com/sun/gluegen/JavaEmitter.java') diff --git a/src/java/com/sun/gluegen/JavaEmitter.java b/src/java/com/sun/gluegen/JavaEmitter.java index ec7d951..f25c738 100644 --- a/src/java/com/sun/gluegen/JavaEmitter.java +++ b/src/java/com/sun/gluegen/JavaEmitter.java @@ -593,17 +593,34 @@ public class JavaEmitter implements GlueEmitter { // variant taking only NIO Buffers. if (!cfg.isUnimplemented(binding.getName()) && !binding.signatureUsesJavaPrimitiveArrays()) { + CMethodBindingEmitter cEmitter; + // Generate a binding without mixed access (NIO-direct, -indirect, array) + cEmitter = + new CMethodBindingEmitter(binding, + cWriter(), + cfg.implPackageName(), + cfg.implClassName(), + true, // NOTE: we always disambiguate with a suffix now, so this is optional + cfg.allStatic(), + (binding.needsNIOWrappingOrUnwrapping() || hasPrologueOrEpilogue), + !cfg.nioDirectOnly(binding.getName()), + machDesc64); + prepCEmitter(binding, cEmitter); + allEmitters.add(cEmitter); + } + } + + protected void prepCEmitter(MethodBinding binding, CMethodBindingEmitter cEmitter) + { // See whether we need an expression to help calculate the // length of any return type - MessageFormat returnValueCapacityFormat = null; - MessageFormat returnValueLengthFormat = null; JavaType javaReturnType = binding.getJavaReturnType(); if (javaReturnType.isNIOBuffer() || javaReturnType.isCompoundTypeWrapper()) { // See whether capacity has been specified String capacity = cfg.returnValueCapacity(binding.getName()); if (capacity != null) { - returnValueCapacityFormat = new MessageFormat(capacity); + cEmitter.setReturnValueCapacityExpression( new MessageFormat(capacity) ); } } else if (javaReturnType.isArray() || javaReturnType.isArrayOfCompoundTypeWrappers()) { @@ -618,32 +635,11 @@ public class JavaEmitter implements GlueEmitter { // See whether length has been specified String len = cfg.returnValueLength(binding.getName()); if (len != null) { - returnValueLengthFormat = new MessageFormat(len); + cEmitter.setReturnValueLengthExpression( new MessageFormat(len) ); } } - - CMethodBindingEmitter cEmitter; - // Generate a binding without mixed access (NIO-direct, -indirect, array) - cEmitter = - new CMethodBindingEmitter(binding, - cWriter(), - cfg.implPackageName(), - cfg.implClassName(), - true, // NOTE: we always disambiguate with a suffix now, so this is optional - cfg.allStatic(), - (binding.needsNIOWrappingOrUnwrapping() || hasPrologueOrEpilogue), - !cfg.nioDirectOnly(binding.getName()), - machDesc64); - if (returnValueCapacityFormat != null) { - cEmitter.setReturnValueCapacityExpression(returnValueCapacityFormat); - } - if (returnValueLengthFormat != null) { - cEmitter.setReturnValueLengthExpression(returnValueLengthFormat); - } cEmitter.setTemporaryCVariableDeclarations(cfg.temporaryCVariableDeclarations(binding.getName())); cEmitter.setTemporaryCVariableAssignments(cfg.temporaryCVariableAssignments(binding.getName())); - allEmitters.add(cEmitter); - } } /** @@ -1018,6 +1014,7 @@ public class JavaEmitter implements GlueEmitter { true, false, // FIXME: should unify this with the general emission code machDesc64); + prepCEmitter(binding, cEmitter); cEmitter.emit(); } catch (Exception e) { System.err.println("While processing field " + field + " of type " + name + ":"); -- cgit v1.2.3 From c9c1ab75ea5c5ef7feae32f20bed840c2e8feaf4 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Mon, 31 May 2010 18:39:58 +0200 Subject: fixed handling of size_t which was broken since the introduction of Int64Buffer. --- src/java/com/sun/gluegen/JavaEmitter.java | 4 ++++ test/junit/com/sun/gluegen/test.c | 3 +++ test/junit/com/sun/gluegen/test.h | 3 +++ 3 files changed, 10 insertions(+) (limited to 'src/java/com/sun/gluegen/JavaEmitter.java') diff --git a/src/java/com/sun/gluegen/JavaEmitter.java b/src/java/com/sun/gluegen/JavaEmitter.java index f25c738..2a51a64 100644 --- a/src/java/com/sun/gluegen/JavaEmitter.java +++ b/src/java/com/sun/gluegen/JavaEmitter.java @@ -1279,6 +1279,10 @@ public class JavaEmitter implements GlueEmitter { if (targetType.isVoid()) { return JavaType.createForVoidPointer(); } else if (targetType.isInt()) { + // size_t is always a PointerBuffer since size is arch dependent + if ("size_t".equals(targetType.getName())) { + return JavaType.forNIOPointerBufferClass(); + } switch ((int) targetType.getSize(curMachDesc)) { case 1: return JavaType.createForCCharPointer(); case 2: return JavaType.createForCShortPointer(); diff --git a/test/junit/com/sun/gluegen/test.c b/test/junit/com/sun/gluegen/test.c index 06d5508..c511a53 100644 --- a/test/junit/com/sun/gluegen/test.c +++ b/test/junit/com/sun/gluegen/test.c @@ -8,6 +8,9 @@ int bufferTest(void * object) { return 42; } +void pbTest(size_t * object) { +} + int manyBuffersTest(void * object1, void * object2, void * object3, void * object4, void * object5) { return 42; } diff --git a/test/junit/com/sun/gluegen/test.h b/test/junit/com/sun/gluegen/test.h index 10399a6..cef2b7e 100644 --- a/test/junit/com/sun/gluegen/test.h +++ b/test/junit/com/sun/gluegen/test.h @@ -2,11 +2,14 @@ #define AL_FLANGER_DEFAULT_FEEDBACK (-0.5f) typedef unsigned long foo; +typedef unsigned long size_t; int arrayTest(long context, foo * array ); int bufferTest(void * object); +void pbTest(size_t * object); + int manyBuffersTest(void * object1, void * object2, void * object3, void * object4, void * object5); int mixedTest(long context, void * object, foo * array ); -- cgit v1.2.3