[INFER] Fix ARM build break.
authorBrian Hackett <bhackett1024@gmail.com>
Tue, 09 Nov 2010 16:46:48 -0800
changeset 74612 7a17b490c9b530fa76cfd5a6126968e0a0420d59
parent 74611 d20475f3dd6e9413d623366b8b0ec02deae87d63
child 74613 317b940022189c70b3d2d272a69a2ead6064c08b
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone2.0b8pre
[INFER] Fix ARM build break.
js/src/methodjit/MethodJIT.cpp
--- a/js/src/methodjit/MethodJIT.cpp
+++ b/js/src/methodjit/MethodJIT.cpp
@@ -395,17 +395,17 @@ SYMBOL_STRING(InjectJaegerReturn) ":"   
 # elif defined(JS_CPU_ARM)
 
 JS_STATIC_ASSERT(sizeof(VMFrame) == 80);
 JS_STATIC_ASSERT(offsetof(VMFrame, savedLR) ==          (4*19));
 JS_STATIC_ASSERT(offsetof(VMFrame, entryFp) ==          (4*10));
 JS_STATIC_ASSERT(offsetof(VMFrame, stackLimit) ==       (4*9));
 JS_STATIC_ASSERT(offsetof(VMFrame, cx) ==               (4*8));
 JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) ==          (4*7));
-JS_STATIC_ASSERT(offsetof(VMFrame, unused) ==           (4*4));
+JS_STATIC_ASSERT(offsetof(VMFrame, scratch) ==          (4*4));
 JS_STATIC_ASSERT(offsetof(VMFrame, previous) ==         (4*3));
 
 JS_STATIC_ASSERT(JSFrameReg == JSC::ARMRegisters::r11);
 JS_STATIC_ASSERT(JSReturnReg_Data == JSC::ARMRegisters::r1);
 JS_STATIC_ASSERT(JSReturnReg_Type == JSC::ARMRegisters::r2);
 
 #ifdef MOZ_THUMB2
 #define FUNCTION_HEADER_EXTRA \
@@ -452,17 +452,17 @@ SYMBOL_STRING(JaegerTrampoline) ":"     
      *  [ r5        ]   |
      *  [ r4        ]   /
      *  [ entryFp   ]
      *  [ stkLimit  ]
      *  [ cx        ]
      *  [ regs.fp   ]
      *  [ regs.pc   ]
      *  [ regs.sp   ]
-     *  [ unused    ]
+     *  [ scratch   ]
      *  [ previous  ]
      *  [ args.ptr3 ]
      *  [ args.ptr2 ]
      *  [ args.ptr  ]
      */
     
     /* Push callee-saved registers. */
 "   push    {r4-r11,lr}"                        "\n"