Windows CE specific XPTCALL changes. This should better support SharedStub

Patch by John Wolf.

windows ce only.  not part of normal build.

xpcom/reflect/xptcall/src/md/win32/Makefile.in

@@ -80,6 +80,12 @@ ASFILES		:= xptcinvoke_asm_x86_64.asm xptcstubs_asm_x86_64.asm
 endif
 
 ifeq ($(OS_ARCH),WINCE)
+
+ifeq ($(TARGET_DEVICE),)
+TARGET_DEVICE=device
+endif
+
+ifeq ($(TARGET_DEVICE),device)
 ifeq ($(TARGET_CPU),arm)
 CPPSRCS 	= xptcinvokece.cpp xptcstubsce.cpp 
 ASFILES		= xptc_arm_ceppc.asm
@@ -89,6 +95,15 @@ AS_DASH_C_FLAG =
 endif
 endif
 
+ifeq ($(TARGET_DEVICE),emulator)
+CPPSRCS 	= xptcinvoke.cpp xptcstubs.cpp 
+ASFILES		= 
+AS		= $(CYGWIN_WRAPPER) arm-wince-as
+ASFLAGS		+= -I ../../../public
+AS_DASH_C_FLAG	= 
+endif
+endif
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 

xpcom/reflect/xptcall/src/md/win32/xptcstubsce.cpp

@@ -43,23 +43,20 @@
 
 extern "C" {
 
-nsresult __stdcall
-PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex,
-                   PRUint32* args, PRUint32* stackBytesToPop)
+
+nsresult
+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
 {
 #define PARAM_BUFFER_COUNT     16
 
 	nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
 	nsXPTCMiniVariant* dispatchParams = NULL;
 	nsIInterfaceInfo* iface_info = NULL;
-  const nsXPTMethodInfo* info = NULL;
+	const nsXPTMethodInfo* info;
 	PRUint8 paramCount;
 	PRUint8 i;
 	nsresult result = NS_ERROR_FAILURE;
 
-  // If anything fails before stackBytesToPop can be set then
-  // the failure is completely catastrophic!
-  
 	NS_ASSERTION(self,"no self");
 
 	self->GetInterfaceInfo(&iface_info);
@@ -84,6 +81,33 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex,
 		const nsXPTType& type = param.GetType();
 		nsXPTCMiniVariant* dp = &dispatchParams[i];
 
+#ifndef AARONTEMP
+		if(i==3)
+		{
+			// PrepareAndDispatch makes an assumption that is causing us problems.  It
+			// assumes that all of the parameters that need to go to the method that we
+			// are resolving are contiguous and on the stack.  However, ARM keeps
+			// parameters 1-3 in registers and pushes parameters 4 and above when it
+			// makes function calls.  This is causing us problems.  In our error scenario,
+			// STACK_ENTRY(x) is called.  All parameters EXCEPT 1-3 come into
+			// STACK_ENTRY(x) on the stack.  When SharedStubs is eventually called, it
+			// will do the push of 1-3 on to the stack.  But to get to SharedStubs,
+			// STACK_ENTRY(x) has to make a c++ function call to 
+			// asmXPTCStubBase_Stub##n().  The preparation of which pushes r0, r12, and
+			// the return address onto the stack, as well as making room for two more
+			// double words on the stack.  For a total of 5 double words on the stack
+			// between parameter 3 and parameter 4.  asmXPTCStubBase_Stub##n() will then
+			// call SharedStubs, which will call PrepareAndDispatch.
+			//
+			// NOTE: this is ARM DEPENDENT.  This should not be compiled for other
+			// processors.
+			//
+			// NOTE: this also assumes that this WinCE PrepareAndDispatch can only be 
+			// called in the sequence mentioned above.
+			ap += 5;
+		}
+#endif /* AARONTEMP */
+
 		if(param.IsOut() || !type.IsArithmetic())
 		{
 			dp->val.p = (void*) *ap;
@@ -110,7 +134,6 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex,
 				break;
 		}
 	}
-  *stackBytesToPop = ((PRUint32)ap) - ((PRUint32)args);
 
 	result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
 
@@ -122,6 +145,7 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex,
 	return result;
 }
 
+  
 } // extern "C"