File 1201-jit-Clean-up-module-constructor.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1201-jit-Clean-up-module-constructor.patch of Package erlang (Revision ec1c7b677b97434a36bbda872e0ed27c)

Currently displaying revision ec1c7b677b97434a36bbda872e0ed27c , Show latest

From 6ed0807690da50e7529a0ae9629498eb0691d070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Tue, 12 Oct 2021 12:11:55 +0200
Subject: [PATCH 1/9] jit: Clean up module constructor

---
 .../emulator/beam/jit/arm/beam_asm_module.cpp | 56 +++++++++----------
 .../emulator/beam/jit/x86/beam_asm_module.cpp | 55 +++++++++---------
 2 files changed, 50 insertions(+), 61 deletions(-)

diff --git a/erts/emulator/beam/jit/arm/beam_asm_module.cpp b/erts/emulator/beam/jit/arm/beam_asm_module.cpp
index 17a1385fca..d4cb0172f2 100644
--- a/erts/emulator/beam/jit/arm/beam_asm_module.cpp
+++ b/erts/emulator/beam/jit/arm/beam_asm_module.cpp
@@ -78,55 +78,49 @@ ErtsCodePtr BeamModuleAssembler::getLambda(unsigned index) {
     return (ErtsCodePtr)getCode(lambda.trampoline);
 }
 
-BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *ga,
-                                         Eterm mod,
+BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *_ga,
+                                         Eterm _mod,
                                          unsigned num_labels,
                                          BeamFile_ExportTable *named_labels)
-        : BeamAssembler(getAtom(mod)) {
-    this->ga = ga;
-    this->mod = mod;
-
+        : BeamAssembler(getAtom(_mod)), ga(_ga), mod(_mod) {
     _veneers.reserve(num_labels + 1);
     rawLabels.reserve(num_labels + 1);
 
     if (erts_jit_asm_dump && named_labels) {
         BeamFile_ExportEntry *e = &named_labels->entries[0];
-        for (unsigned i = 1; i < num_labels; i++) {
+        for (unsigned int i = 1; i < num_labels; i++) {
+            /* Large enough to hold most realistic function names. We will
+             * truncate too long names, but as the label name is not important
+             * for the functioning of asmjit and this functionality is
+             * probably only used by developers, we don't bother with dynamic
+             * allocation. */
+            char tmp[MAX_ATOM_SZ_LIMIT];
             Label lbl;
-            char tmp[512]; // Large enough to hold most realistic
-                           // function names. We will truncate too
-                           // long names, but as the label name is not
-                           // important for the functioning of asmjit
-                           // and this functionality is probably only
-                           // used by developers, we don't bother with
-                           // dynamic allocation.
-            // The named_labels are sorted, so no need for a search.
-            if ((unsigned)e->label == i) {
+
+            /* The named_labels are sorted, so no need for a search. */
+            if ((unsigned int)e->label == i) {
                 erts_snprintf(tmp, sizeof(tmp), "%T/%d", e->function, e->arity);
-                lbl = a.newNamedLabel(tmp);
-                labelNames[i] = tmp;
+                rawLabels[i] = a.newNamedLabel(tmp);
                 e++;
             } else {
                 std::string lblName = "label_" + std::to_string(i);
-                lbl = a.newNamedLabel(lblName.data());
+                rawLabels[i] = a.newNamedLabel(lblName.data());
             }
-            rawLabels[i] = lbl;
         }
-        return;
-    }
-    if (erts_jit_asm_dump) {
-        // There is no naming info, but dumping of the assembly code
-        // has been requested, so do the best we can and number the
-        // labels.
-        for (unsigned i = 1; i < num_labels; i++) {
+    } else if (erts_jit_asm_dump) {
+        /* There is no naming info, but dumping of the assembly code
+         * has been requested, so do the best we can and number the
+         * labels. */
+        for (unsigned int i = 1; i < num_labels; i++) {
             std::string lblName = "label_" + std::to_string(i);
             rawLabels[i] = a.newNamedLabel(lblName.data());
         }
-        return;
+    } else {
+        /* No output is requested, go with unnamed labels */
+        for (unsigned int i = 1; i < num_labels; i++) {
+            rawLabels[i] = a.newLabel();
+        }
     }
-    // No output is requested, go with unnamed labels
-    for (unsigned i = 1; i < num_labels; i++)
-        rawLabels[i] = a.newLabel();
 }
 
 BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *ga,
diff --git a/erts/emulator/beam/jit/x86/beam_asm_module.cpp b/erts/emulator/beam/jit/x86/beam_asm_module.cpp
index 5627b44603..ab0009441c 100644
--- a/erts/emulator/beam/jit/x86/beam_asm_module.cpp
+++ b/erts/emulator/beam/jit/x86/beam_asm_module.cpp
@@ -77,53 +77,48 @@ ErtsCodePtr BeamModuleAssembler::getLambda(unsigned index) {
     return (ErtsCodePtr)getCode(lambda.trampoline);
 }
 
-BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *ga,
-                                         Eterm mod,
+BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *_ga,
+                                         Eterm _mod,
                                          unsigned num_labels,
                                          BeamFile_ExportTable *named_labels)
-        : BeamAssembler(getAtom(mod)) {
-    this->ga = ga;
-    this->mod = mod;
-
+        : BeamAssembler(getAtom(_mod)), ga(_ga), mod(_mod) {
     labels.reserve(num_labels + 1);
 
     if (erts_jit_asm_dump && named_labels) {
         BeamFile_ExportEntry *e = &named_labels->entries[0];
-        for (unsigned i = 1; i < num_labels; i++) {
+        for (unsigned int i = 1; i < num_labels; i++) {
+            /* Large enough to hold most realistic function names. We will
+             * truncate too long names, but as the label name is not important
+             * for the functioning of asmjit and this functionality is
+             * probably only used by developers, we don't bother with dynamic
+             * allocation. */
+            char tmp[MAX_ATOM_SZ_LIMIT];
             Label lbl;
-            char tmp[512]; // Large enough to hold most realistic
-                           // function names. We will truncate too
-                           // long names, but as the label name is not
-                           // important for the functioning of asmjit
-                           // and this functionality is probably only
-                           // used by developers, we don't bother with
-                           // dynamic allocation.
-            // The named_labels are sorted, so no need for a search.
-            if ((unsigned)e->label == i) {
+
+            /* The named_labels are sorted, so no need for a search. */
+            if ((unsigned int)e->label == i) {
                 erts_snprintf(tmp, sizeof(tmp), "%T/%d", e->function, e->arity);
-                lbl = a.newNamedLabel(tmp);
+                labels[i] = a.newNamedLabel(tmp);
                 e++;
             } else {
                 std::string lblName = "label_" + std::to_string(i);
-                lbl = a.newNamedLabel(lblName.data());
+                labels[i] = a.newNamedLabel(lblName.data());
             }
-            labels[i] = lbl;
         }
-        return;
-    }
-    if (erts_jit_asm_dump) {
-        // There is no naming info, but dumping of the assembly code
-        // has been requested, so do the best we can and number the
-        // labels.
-        for (unsigned i = 1; i < num_labels; i++) {
+    } else if (erts_jit_asm_dump) {
+        /* There is no naming info, but dumping of the assembly code
+         * has been requested, so do the best we can and number the
+         * labels. */
+        for (unsigned int i = 1; i < num_labels; i++) {
             std::string lblName = "label_" + std::to_string(i);
             labels[i] = a.newNamedLabel(lblName.data());
         }
-        return;
+    } else {
+        /* No output is requested, go with unnamed labels */
+        for (unsigned int i = 1; i < num_labels; i++) {
+            labels[i] = a.newLabel();
+        }
     }
-    // No output is requested, go with unnamed labels
-    for (unsigned i = 1; i < num_labels; i++)
-        labels[i] = a.newLabel();
 }
 
 BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *ga,
-- 
2.31.1

Places

File 1201-jit-Clean-up-module-constructor.patch of Package erlang (Revision ec1c7b677b97434a36bbda872e0ed27c)

Places