sb121: merged in DEV300_m77

8 files changed, 30 insertions, 53 deletions

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index c0166b720f0b..0483e86b7280 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -100,8 +100,6 @@ enum x86_64_reg_class
 
 #define MAX_CLASSES 4
 
-#define ALIGN(v, a) (((((size_t) (v))-1) | ((a)-1))+1)
-
 /* x86-64 register passing implementation.  See x86-64 ABI for details.  Goal
    of this code is to classify each 8bytes of incoming argument by the register
    class and assign registers accordingly.  */
@@ -153,11 +151,8 @@ merge_classes (enum x86_64_reg_class class1, enum x86_64_reg_class class2)
    See the x86-64 PS ABI for details.
 */
 static int
-classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_class classes[], int &rByteOffset )
+classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_class classes[], int byteOffset )
 {
-    /* First, align to the right place.  */
-    rByteOffset = ALIGN( rByteOffset, pTypeRef->pType->nAlignment );
-
     switch ( pTypeRef->eTypeClass )
     {
         case typelib_TypeClass_VOID:
@@ -173,13 +168,13 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
         case typelib_TypeClass_HYPER:
         case typelib_TypeClass_UNSIGNED_HYPER:
         case typelib_TypeClass_ENUM:
-            if ( ( rByteOffset % 8 + pTypeRef->pType->nSize ) <= 4 )
+            if ( ( byteOffset % 8 + pTypeRef->pType->nSize ) <= 4 )
                 classes[0] = X86_64_INTEGERSI_CLASS;
             else
                 classes[0] = X86_64_INTEGER_CLASS;
             return 1;
         case typelib_TypeClass_FLOAT:
-            if ( ( rByteOffset % 8 ) == 0 )
+            if ( ( byteOffset % 8 ) == 0 )
                 classes[0] = X86_64_SSESF_CLASS;
             else
                 classes[0] = X86_64_SSE_CLASS;
@@ -226,9 +221,9 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
                 for ( sal_Int32 nMember = 0; nMember < pStruct->nMembers; ++nMember )
                 {
                     typelib_TypeDescriptionReference *pTypeInStruct = pStruct->ppTypeRefs[ nMember ];
-                    rByteOffset = pStruct->pMemberOffsets[ nMember ];
+                    int offset = byteOffset + pStruct->pMemberOffsets[ nMember ];
 
-                    int num = classify_argument( pTypeInStruct, subclasses, rByteOffset );
+                    int num = classify_argument( pTypeInStruct, subclasses, offset );
 
                     if ( num == 0 )
                     {
@@ -238,7 +233,7 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
 
                     for ( int i = 0; i < num; i++ )
                     {
-                        int pos = rByteOffset / 8;
+                        int pos = offset / 8;
                         classes[i + pos] = merge_classes( subclasses[i], classes[i + pos] );
                     }
                 }
@@ -281,10 +276,9 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
 bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE )
 {
     enum x86_64_reg_class classes[MAX_CLASSES];
-    int offset = 0;
     int n;
 
-    n = classify_argument( pTypeRef, classes, offset );
+    n = classify_argument( pTypeRef, classes, 0 );
 
     if ( n == 0 )
         return false;
@@ -330,10 +324,9 @@ bool x86_64::return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef
 void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64 *pGPR, const double *pSSE, void *pStruct )
 {
     enum x86_64_reg_class classes[MAX_CLASSES];
-    int offset = 0;
     int n;
 
-    n = classify_argument( pTypeRef, classes, offset );
+    n = classify_argument( pTypeRef, classes, 0 );
 
     sal_uInt64 *pStructAlign = reinterpret_cast<sal_uInt64 *>( pStruct );
     for ( n--; n >= 0; n-- )
@@ -441,10 +434,10 @@ ffi_prep_args (stackLayout *stack, extended_cif *ecif)
       /* All easy cases are eliminated. Now fire the big guns.  */
 
       enum x86_64_reg_class classes[MAX_CLASSES];
-      int offset = 0, j, num;
+      int j, num;
       void *a;
 
-      num = classify_argument (*p_arg, classes, &offset);
+      num = classify_argument (*p_arg, classes, 0);
       for (j=0, a=*p_argv; j<num; j++, a+=8)
         {
           switch (classes[j])
@@ -571,7 +564,7 @@ ffi_fill_return_value (return_value *rv, extended_cif *ecif)
             ;
     }
 
-    num = classify_argument (ecif->cif->rtype, classes, &i);
+    num = classify_argument (ecif->cif->rtype, classes, 0);
 
     if (num == 0)
         /* Return in memory.  */
diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index 96ee48f62889..def12dd53c49 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -43,7 +43,7 @@ SLOFILES = $(SLO)$/testacquire.obj
 SHL1TARGET = testacquire.uno
 SHL1OBJS = $(SLOFILES)
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-SHL1VERSIONMAP = testacquire.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1IMPLIB = itestacquire
 
 JAVAFILES = TestAcquire.java
@@ -52,10 +52,10 @@ JARFILES = OOoRunner.jar juh.jar jurt.jar ridl.jar
 .INCLUDE: target.mk
 
 ALLTAR: \
-    $(BIN)$/testacquire-java-client$(SCRIPTEXT) \
-    $(BIN)$/testacquire-java-server$(SCRIPTEXT) \
-    $(BIN)$/testacquire-native-client$(SCRIPTEXT) \
-    $(BIN)$/testacquire-native-server$(SCRIPTEXT)
+    $(BIN)$/testacquire-java-client \
+    $(BIN)$/testacquire-java-server \
+    $(BIN)$/testacquire-native-client \
+    $(BIN)$/testacquire-native-server
 
 .IF "$(GUI)" == "WNT"
 GIVE_EXEC_RIGHTS = @echo
@@ -86,7 +86,7 @@ $(SLOFILES) $(JAVACLASSFILES): $(BIN)$/$(TARGET).rdb
 TEST_JAVAUNO_ACQUIRE_UNO_URL := \
     \"'uno:socket,host=127.0.0.1,port=2002;urp;test'\"
 
-$(BIN)$/testacquire-java-client$(SCRIPTEXT):
+$(BIN)$/testacquire-java-client:
     echo java -classpath \
         ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
 ..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
@@ -94,7 +94,7 @@ $(BIN)$/testacquire-java-client$(SCRIPTEXT):
         $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(BIN)$/testacquire-java-server$(SCRIPTEXT):
+$(BIN)$/testacquire-java-server:
     echo java -classpath \
         ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
 ..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
@@ -102,14 +102,14 @@ $(BIN)$/testacquire-java-server$(SCRIPTEXT):
         $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(BIN)$/testacquire-native-client$(SCRIPTEXT):
+$(BIN)$/testacquire-native-client:
     echo '$(AUGMENT_LIBRARY_PATH)' uno \
         -c com.sun.star.test.bridges.testacquire.impl \
         -l ../lib/$(SHL1TARGETN:f) -ro $(TARGET).rdb -- \
         $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(BIN)$/testacquire-native-server$(SCRIPTEXT):
+$(BIN)$/testacquire-native-server:
     echo '$(AUGMENT_LIBRARY_PATH)' uno \
         -c com.sun.star.test.bridges.testacquire.impl \
         -l ../lib/$(SHL1TARGETN:f) -ro $(TARGET).rdb \
diff --git a/bridges/test/java_uno/acquire/testacquire.map b/bridges/test/java_uno/acquire/testacquire.map
deleted file mode 100644
index 227274db922d..000000000000
--- a/bridges/test/java_uno/acquire/testacquire.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3.1 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk
index 564ee80c2e80..888fae21d3d2 100644
--- a/bridges/test/java_uno/any/makefile.mk
+++ b/bridges/test/java_uno/any/makefile.mk
@@ -100,16 +100,16 @@ $(SLOFILES) : $(MISC)$/gen_files.flag
 $(JAVACLASSFILES) : $(MISC)$/gen_files.flag
 
 ALLTAR : \
-    $(OUT)$/bin$/TestRemote$(SCRIPTEXT) \
-    $(OUT)$/bin$/TestJni$(SCRIPTEXT)
+    $(OUT)$/bin$/TestRemote \
+    $(OUT)$/bin$/TestJni
 
-$(OUT)$/bin$/TestRemote$(SCRIPTEXT) : $(JAVACLASSFILES)
+$(OUT)$/bin$/TestRemote : $(JAVACLASSFILES)
     -rm -f $@
     echo java -classpath ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
         test.java_uno.anytest.TestRemote > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(OUT)$/bin$/TestJni$(SCRIPTEXT) : $(JAVACLASSFILES)
+$(OUT)$/bin$/TestJni : $(JAVACLASSFILES)
     -rm -f $@
     echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
         .$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
diff --git a/bridges/test/java_uno/any/test_javauno_any.map b/bridges/test/java_uno/any/test_javauno_any.map
index 4959db8fccc8..c50f7b162db7 100644
--- a/bridges/test/java_uno/any/test_javauno_any.map
+++ b/bridges/test/java_uno/any/test_javauno_any.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         Java_test_java_1uno_anytest_TestJni_create_1jni_1transport;
     local:
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index 3b71858498fb..9ac266f80ff5 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -50,7 +50,7 @@ SLOFILES = $(SLO)$/testequals.obj
 SHL1TARGET = testequals.uno
 SHL1OBJS = $(SLOFILES)
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-SHL1VERSIONMAP = testequals.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1IMPLIB = itestequals
 
 JAVAFILES = TestEquals.java
@@ -58,7 +58,7 @@ JARFILES = juh.jar jurt.jar ridl.jar
 
 .INCLUDE: target.mk
 
-ALLTAR: $(BIN)$/testequals$(SCRIPTEXT)
+ALLTAR: $(BIN)$/testequals
 
 .IF "$(GUI)" == "WNT"
 GIVE_EXEC_RIGHTS = @echo
@@ -81,7 +81,7 @@ $(MISC)$/$(TARGET).rdb: types.idl
 
 $(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb
 
-$(BIN)$/testequals$(SCRIPTEXT): $(BIN)$/testequals_services.rdb
+$(BIN)$/testequals: $(BIN)$/testequals_services.rdb
     echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
         ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
 ..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
diff --git a/bridges/test/java_uno/equals/testequals.map b/bridges/test/java_uno/equals/testequals.map
deleted file mode 100644
index 227274db922d..000000000000
--- a/bridges/test/java_uno/equals/testequals.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3.1 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk
index 162c5c225175..d4926e07307b 100644
--- a/bridges/test/java_uno/nativethreadpool/makefile.mk
+++ b/bridges/test/java_uno/nativethreadpool/makefile.mk
@@ -97,7 +97,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
     $(REGCOMP) -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \
         -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
         -c stocservices.uno$(DLLPOST)
-.IF "$(GUI)" == "WNT" || "$(USE_SHELL)" != "bash"
+.IF "$(GUI)" == "WNT"
     ERROR -- missing platform
 .ELSE # GUI, WNT
     + export OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' && \
@@ -107,7 +107,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
 .ENDIF # GUI, WNT
 
 test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb
-.IF "$(GUI)" == "WNT" || "$(USE_SHELL)" != "bash"
+.IF "$(GUI)" == "WNT"
     ERROR -- missing platform
 .ELSE # GUI, WNT
     $(AUGMENT_LIBRARY_PATH) uno -c test.javauno.nativethreadpool.server \