Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 3b1cdbb563
Branches Tags
electron
/
patches
/
v8
/
merged_wasm_arm_tail-call_free_scratch_register_earlier.patch

merged_wasm_arm_tail-call_free_scratch_register_earlier.patch 2.7 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Thibaud Michaud <[email protected]>
    3. 

  3. Date: Wed, 18 Dec 2024 12:14:14 +0100
    4. 

  4. Subject: Merged: [wasm][arm][tail-call] Free scratch register earlier
    5. 

  5. 

  6. In Liftoff's PrepareTailCall, we kept the UseScratchRegisterScope open
    7. 

  7. for longer than necessary. Close the scope earlier to ensure that we
    8. 

  8. don't run out of scratch registers in the last "sub" instruction if it
    9. 

  9. needs one.
    10. 

  10. 

  11. [email protected]
    12. 

  12. 

  13. Fixed: 384565015
    14. 

  14. (cherry picked from commit 7c9e628fd07a457635db098483f7a956ecfa385a)
    15. 

  15. 

  16. Change-Id: I0100569d5276aa9188ccbc3c7ee409a9dd49be31
    17. 

  17. Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6148448
    18. 

  18. Reviewed-by: Daniel Lehmann <[email protected]>
    19. 

  19. Commit-Queue: Thibaud Michaud <[email protected]>
    20. 

  20. Cr-Commit-Position: refs/branch-heads/13.0@{#49}
    21. 

  21. Cr-Branched-From: 4be854bd71ea878a25b236a27afcecffa2e29360-refs/heads/13.0.245@{#1}
    22. 

  22. Cr-Branched-From: 1f5183f7ad6cca21029fd60653d075730c644432-refs/heads/main@{#96103}
    23. 

  23. 

  24. diff --git a/src/wasm/baseline/arm/liftoff-assembler-arm-inl.h b/src/wasm/baseline/arm/liftoff-assembler-arm-inl.h
    25. 

  25. index 959dbf3b1c36e32c473b233a95f0bb149ceebaff..cb95a6f03aa4873525da2ff2eab3f9573372e3b8 100644
    26. 

  26. --- a/src/wasm/baseline/arm/liftoff-assembler-arm-inl.h
    27. 

  27. +++ b/src/wasm/baseline/arm/liftoff-assembler-arm-inl.h
    28. 

  28. @@ -486,21 +486,23 @@ void LiftoffAssembler::CallFrameSetupStub(int declared_function_index) {
    29. 

  29.  
    30. 

  30.  void LiftoffAssembler::PrepareTailCall(int num_callee_stack_params,
    31. 

  31.                                         int stack_param_delta) {
    32. 

  32. -  UseScratchRegisterScope temps(this);
    33. 

  33. -  Register scratch = temps.Acquire();
    34. 

  34. +  {
    35. 

  35. +    UseScratchRegisterScope temps(this);
    36. 

  36. +    Register scratch = temps.Acquire();
    37. 

  37.  
    38. 

  38. -  // Push the return address and frame pointer to complete the stack frame.
    39. 

  39. -  sub(sp, sp, Operand(8));
    40. 

  40. -  ldr(scratch, MemOperand(fp, 4));
    41. 

  41. -  str(scratch, MemOperand(sp, 4));
    42. 

  42. -  ldr(scratch, MemOperand(fp, 0));
    43. 

  43. -  str(scratch, MemOperand(sp, 0));
    44. 

  44. -
    45. 

  45. -  // Shift the whole frame upwards.
    46. 

  46. -  int slot_count = num_callee_stack_params + 2;
    47. 

  47. -  for (int i = slot_count - 1; i >= 0; --i) {
    48. 

  48. -    ldr(scratch, MemOperand(sp, i * 4));
    49. 

  49. -    str(scratch, MemOperand(fp, (i - stack_param_delta) * 4));
    50. 

  50. +    // Push the return address and frame pointer to complete the stack frame.
    51. 

  51. +    sub(sp, sp, Operand(8));
    52. 

  52. +    ldr(scratch, MemOperand(fp, 4));
    53. 

  53. +    str(scratch, MemOperand(sp, 4));
    54. 

  54. +    ldr(scratch, MemOperand(fp, 0));
    55. 

  55. +    str(scratch, MemOperand(sp, 0));
    56. 

  56. +
    57. 

  57. +    // Shift the whole frame upwards.
    58. 

  58. +    int slot_count = num_callee_stack_params + 2;
    59. 

  59. +    for (int i = slot_count - 1; i >= 0; --i) {
    60. 

  60. +      ldr(scratch, MemOperand(sp, i * 4));
    61. 

  61. +      str(scratch, MemOperand(fp, (i - stack_param_delta) * 4));
    62. 

  62. +    }
    63. 

  63.    }
    64. 

  64.  
    65. 

  65.    // Set the new stack and frame pointer.
    66.