Bug 1050258 - ARM hard-float XPCOM: correct argument passing. r=dougc
authorJacob Bramley <Jacob.Bramley@arm.com>
Fri, 07 Nov 2014 19:44:08 +1100
changeset 214597 96e78a235b14223e130a5fe085fc32d5887009f8
parent 214596 18aee2cd999e53a0365f195854ca3d86807ba147
child 214598 133c7c11ec7fa955c29719719277dde29dae12a7
push id27788
push userryanvm@gmail.com
push dateFri, 07 Nov 2014 18:23:58 +0000
treeherdermozilla-central@c39ff12ad6eb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougc
bugs1050258
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1050258 - ARM hard-float XPCOM: correct argument passing. r=dougc
xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
+++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
@@ -219,16 +219,17 @@ static inline void copy_dword(uint32_t* 
 {
   if (ireg_args + 1 < end) {
     if ((uint32_t)ireg_args & 4) {
       ireg_args++;
     }
     *(uint64_t *)ireg_args = data;
     ireg_args += 2;
   } else {
+    ireg_args = end;
     if ((uint32_t)stack_args & 4) {
       stack_args++;
     }
     *(uint64_t *)stack_args = data;
     stack_args += 2;
   }
 }