File 1142-erts-Support-loading-of-the-LocT-chunk-in-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1142-erts-Support-loading-of-the-LocT-chunk-in-the-beam-f.patch of Package erlang (Revision e6fae69e60dcc1918fd2bc4ae52e9ff8)

Currently displaying revision e6fae69e60dcc1918fd2bc4ae52e9ff8 , Show latest

From 303a728d4550b84a1245ffb89d0369eecc97e4ac Mon Sep 17 00:00:00 2001
From: Frej Drejhammar <frej.drejhammar@gmail.com>
Date: Thu, 17 Jun 2021 11:08:16 +0200
Subject: [PATCH 2/7] erts: Support loading of the LocT chunk in the beam file
 loader

By loading the LocT chunk we can, in a later patch, generate nicer
named labels in the JIT's assembly debug dump. We only spend time
doing the loading if the JIT is enabled and we are running with
`+JDdump true`.
---
 erts/emulator/beam/beam_file.c | 26 ++++++++++++++++++++++++++
 erts/emulator/beam/beam_file.h |  4 ++++
 erts/emulator/beam/beam_load.c |  2 ++
 3 files changed, 32 insertions(+)

diff --git a/erts/emulator/beam/beam_file.c b/erts/emulator/beam/beam_file.c
index e2b496ada2..6c870d594a 100644
--- a/erts/emulator/beam/beam_file.c
+++ b/erts/emulator/beam/beam_file.c
@@ -366,6 +366,12 @@ static int parse_export_chunk(BeamFile *beam, IFF_Chunk *chunk) {
     return parse_export_table(&beam->exports, beam, chunk);
 }
 
+#ifdef BEAMASM
+static int parse_locals_chunk(BeamFile *beam, IFF_Chunk *chunk) {
+    return parse_export_table(&beam->locals, beam, chunk);
+}
+#endif
+
 static int parse_lambda_chunk(BeamFile *beam, IFF_Chunk *chunk) {
     BeamFile_LambdaTable *lambdas;
     BeamFile_AtomTable *atoms;
@@ -743,6 +749,7 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
         MakeIffId('C', 'I', 'n', 'f'), /* 8 */
         MakeIffId('L', 'i', 'n', 'e'), /* 9 */
         MakeIffId('A', 't', 'U', '8'), /* 10 */
+        MakeIffId('L', 'o', 'c', 'T'), /* 11 */
     };
 
     static const int ATOM_CHUNK = 0;
@@ -756,6 +763,9 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
     static const int COMPILE_CHUNK = 8;
     static const int LINE_CHUNK = 9;
     static const int UTF8_ATOM_CHUNK = 10;
+#ifdef BEAMASM
+    static const int LOC_CHUNK = 11;
+#endif
 
     static const int NUM_CHUNKS = sizeof(chunk_iffs) / sizeof(chunk_iffs[0]);
 
@@ -818,6 +828,15 @@ beamfile_read(const byte *data, size_t size, BeamFile *beam) {
         goto error;
     }
 
+#ifdef BEAMASM
+    if (erts_jit_asm_dump && chunks[LOC_CHUNK].size > 0) {
+        if (!parse_locals_chunk(beam, &chunks[LOC_CHUNK])) {
+            error = BEAMFILE_READ_CORRUPT_LOCALS_TABLE;
+            goto error;
+        }
+    }
+#endif
+
     if (chunks[LAMBDA_CHUNK].size > 0) {
         if (!parse_lambda_chunk(beam, &chunks[LAMBDA_CHUNK])) {
             error = BEAMFILE_READ_CORRUPT_LAMBDA_TABLE;
@@ -946,6 +965,13 @@ void beamfile_free(BeamFile *beam) {
         beam->exports.entries = NULL;
     }
 
+#ifdef BEAMASM
+    if (beam->locals.entries) {
+        erts_free(ERTS_ALC_T_PREPARED_CODE, beam->locals.entries);
+        beam->locals.entries = NULL;
+    }
+#endif
+
     if (beam->lambdas.entries) {
         erts_free(ERTS_ALC_T_PREPARED_CODE, beam->lambdas.entries);
         beam->lambdas.entries = NULL;
diff --git a/erts/emulator/beam/beam_file.h b/erts/emulator/beam/beam_file.h
index fe68447b8e..bbd5a22068 100644
--- a/erts/emulator/beam/beam_file.h
+++ b/erts/emulator/beam/beam_file.h
@@ -150,6 +150,9 @@ typedef struct {
     BeamFile_AtomTable atoms;
     BeamFile_ImportTable imports;
     BeamFile_ExportTable exports;
+#ifdef BEAMASM
+    BeamFile_ExportTable locals;
+#endif
     BeamFile_LambdaTable lambdas;
     BeamFile_LineTable lines;
 
@@ -185,6 +188,7 @@ enum beamfile_read_result {
     BEAMFILE_READ_CORRUPT_EXPORT_TABLE,
     BEAMFILE_READ_MISSING_IMPORT_TABLE,
     BEAMFILE_READ_CORRUPT_IMPORT_TABLE,
+    BEAMFILE_READ_CORRUPT_LOCALS_TABLE,
 
     /* Optional chunks */
     BEAMFILE_READ_CORRUPT_LAMBDA_TABLE,
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index 8d1f3822a2..e2de7e751f 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -148,6 +148,8 @@ erts_prepare_loading(Binary* magic, Process *c_p, Eterm group_leader,
         BeamLoadError0(stp, "corrupt line table");
     case BEAMFILE_READ_CORRUPT_LITERAL_TABLE:
         BeamLoadError0(stp, "corrupt literal table");
+    case BEAMFILE_READ_CORRUPT_LOCALS_TABLE:
+        BeamLoadError0(stp, "corrupt locals table");
     case BEAMFILE_READ_SUCCESS:
         break;
     }
-- 
2.26.2

Places

File 1142-erts-Support-loading-of-the-LocT-chunk-in-the-beam-f.patch of Package erlang (Revision e6fae69e60dcc1918fd2bc4ae52e9ff8)

Places