patch-js_src_methodjit_MethodJIT_cpp 1.3 KB

12345678910111213141516171819202122
  1. --- mozjs17.0.0.orig/js/src/methodjit/MethodJIT.cpp 2013-02-11 23:33:23.000000000 +0100
  2. +++ mozjs17.0.0/js/src/methodjit/MethodJIT.cpp 2014-01-09 18:10:13.000000000 +0100
  3. @@ -702,7 +702,8 @@ asm (
  4. FUNCTION_HEADER_EXTRA
  5. ".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n"
  6. SYMBOL_STRING(JaegerTrampolineReturn) ":" "\n"
  7. -" strd r4, r5, [r10, #24]" "\n" /* fp->rval type,data */
  8. +" str r4, [r10, #24]" "\n" /* fp->rval type,data */
  9. +" str r5, [r10, #28]" "\n" /* fp->rval type,data */
  10. /* Tidy up. */
  11. " mov r0, sp" "\n"
  12. @@ -762,7 +763,8 @@ SYMBOL_STRING(JaegerInterpoline) ":"
  13. " blx " SYMBOL_STRING_RELOC(js_InternalInterpret) "\n"
  14. " cmp r0, #0" "\n"
  15. " ldr r10, [sp, #(4*7)]" "\n" /* Load (StackFrame*)f->regs->fp_ */
  16. -" ldrd r4, r5, [r10, #(4*6)]" "\n" /* Load rval payload and type. */
  17. +" ldr r4, [r10, #(4*6)]" "\n" /* Load rval payload and type. */
  18. +" ldr r5, [r10, #((4*6)+4)]" "\n" /* Load rval payload and type. */
  19. " ldr r1, [sp, #(4*3)]" "\n" /* Load scratch. */
  20. " it ne" "\n"
  21. " bxne r0" "\n"