File 1151-Simplify-emit_try_case-similar-to-how-it-w... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1151-Simplify-emit_try_case-similar-to-how-it-was-done-fo.patch of Package erlang (Revision e347808e4911fc349bf725ab1944c053)

Currently displaying revision e347808e4911fc349bf725ab1944c053 , Show latest

From d7f19868551b10d6f0be48ff1d76626676a4a2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 2 Jul 2021 13:23:08 +0200
Subject: [PATCH] Simplify emit_try_case() similar to how it was done for x86

The improvements for x86 was introduced in a65d0d571c13d6.
---
 erts/emulator/beam/jit/arm/instr_common.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/erts/emulator/beam/jit/arm/instr_common.cpp b/erts/emulator/beam/jit/arm/instr_common.cpp
index 44c4e1fc21..212eaaacb4 100644
--- a/erts/emulator/beam/jit/arm/instr_common.cpp
+++ b/erts/emulator/beam/jit/arm/instr_common.cpp
@@ -1381,9 +1381,6 @@ void BeamGlobalAssembler::emit_catch_end_shared() {
      * XREG2 = error reason/thrown value
      * XREG3 = raw stacktrace. */
 
-    mov_imm(TMP1, NIL);
-    a.str(TMP1, arm::Mem(c_p, offsetof(Process, fvalue)));
-
     a.mov(XREG0, XREG2);
     a.cmp(XREG1, imm(am_throw));
 
@@ -1484,7 +1481,22 @@ void BeamModuleAssembler::emit_try_case(const ArgVal &Y) {
     a.str(TMP1, arm::Mem(c_p, offsetof(Process, catches)));
     mov_imm(TMP1, NIL);
     mov_arg(Y, TMP1);
-    a.str(TMP1, arm::Mem(c_p, offsetof(Process, fvalue)));
+
+#ifdef DEBUG
+    Label ok = a.newLabel();
+    comment("Start of assertion code");
+    a.ldr(TMP1, arm::Mem(c_p, offsetof(Process, fvalue)));
+    a.ldr(TMP2, arm::Mem(c_p, offsetof(Process, ftrace)));
+    mov_imm(TMP3, NIL);
+    a.cmp(TMP1, TMP3);
+    a.ccmp(TMP2, TMP3, 0, arm::Cond::kEQ);
+    a.cond_eq().b(ok);
+
+    comment("Assertion c_p->fvalue == NIL && c_p->ftrace == NIL failed");
+    a.udf(0x42);
+
+    a.bind(ok);
+#endif
 }
 
 void BeamModuleAssembler::emit_try_case_end(const ArgVal &Src) {
-- 
2.26.2

Places

File 1151-Simplify-emit_try_case-similar-to-how-it-was-done-fo.patch of Package erlang (Revision e347808e4911fc349bf725ab1944c053)

Places