File 1162-erts-Remove-unused-functions.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1162-erts-Remove-unused-functions.patch of Package erlang (Revision f55041561f125384b28886aa21e55614)

Currently displaying revision f55041561f125384b28886aa21e55614 , Show latest

From 7dec98def9abba192880e9573700c55a0108efe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Tue, 5 Oct 2021 16:44:16 +0200
Subject: [PATCH 2/3] erts: Remove unused functions

These are unused since PR-5223 that removed support for pre-22
instructions.
---
 erts/emulator/beam/jit/beam_jit_common.cpp | 102 ---------------------
 erts/emulator/beam/jit/beam_jit_common.hpp |   6 --
 2 files changed, 108 deletions(-)

diff --git a/erts/emulator/beam/jit/beam_jit_common.cpp b/erts/emulator/beam/jit/beam_jit_common.cpp
index 9ea3eb5e4f..c372bcea2c 100644
--- a/erts/emulator/beam/jit/beam_jit_common.cpp
+++ b/erts/emulator/beam/jit/beam_jit_common.cpp
@@ -569,79 +569,6 @@ void beam_jit_bs_add_argument_error(Process *c_p, Eterm A, Eterm B) {
     }
 }
 
-static Eterm i_bs_start_match2_gc_test_preserve(Process *c_p,
-                                                Eterm *reg,
-                                                Uint need,
-                                                Uint live,
-                                                Eterm preserve) {
-    Uint words_left = (Uint)(STACK_TOP(c_p) - HEAP_TOP(c_p));
-
-    if (ERTS_UNLIKELY(words_left < need + S_RESERVED)) {
-        reg[live] = preserve;
-        PROCESS_MAIN_CHK_LOCKS(c_p);
-        c_p->fcalls -= erts_garbage_collect_nobump(c_p,
-                                                   need,
-                                                   reg,
-                                                   live + 1,
-                                                   c_p->fcalls);
-        ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
-        PROCESS_MAIN_CHK_LOCKS(c_p);
-        preserve = reg[live];
-    }
-
-    return preserve;
-}
-
-Eterm beam_jit_bs_start_match2(Eterm context,
-                               Uint live,
-                               Uint slots,
-                               Process *c_p,
-                               Eterm *reg) {
-    Eterm header;
-    if (!is_boxed(context)) {
-        return THE_NON_VALUE;
-    }
-    header = *boxed_val(context);
-
-    slots++;
-
-    if (header_is_bin_matchstate(header)) {
-        ErlBinMatchState *ms = (ErlBinMatchState *)boxed_val(context);
-        Uint actual_slots = HEADER_NUM_SLOTS(header);
-
-        /* We're not compatible with contexts created by bs_start_match3. */
-        ASSERT(actual_slots >= 1);
-
-        ms->save_offset[0] = ms->mb.offset;
-        if (ERTS_UNLIKELY(actual_slots < slots)) {
-            ErlBinMatchState *expanded;
-            Uint wordsneeded = ERL_BIN_MATCHSTATE_SIZE(slots);
-            context = i_bs_start_match2_gc_test_preserve(c_p,
-                                                         reg,
-                                                         wordsneeded,
-                                                         live,
-                                                         context);
-            ms = (ErlBinMatchState *)boxed_val(context);
-            expanded = (ErlBinMatchState *)HEAP_TOP(c_p);
-            *expanded = *ms;
-            *HEAP_TOP(c_p) = HEADER_BIN_MATCHSTATE(slots);
-            HEAP_TOP(c_p) += wordsneeded;
-            context = make_matchstate(expanded);
-        }
-        return context;
-    } else if (is_binary_header(header)) {
-        Uint wordsneeded = ERL_BIN_MATCHSTATE_SIZE(slots);
-        context = i_bs_start_match2_gc_test_preserve(c_p,
-                                                     reg,
-                                                     wordsneeded,
-                                                     live,
-                                                     context);
-        return erts_bs_start_match_2(c_p, context, slots);
-    } else {
-        return THE_NON_VALUE;
-    }
-}
-
 Eterm beam_jit_bs_init(Process *c_p,
                        Eterm *reg,
                        ERL_BITS_DECLARE_STATEP,
@@ -815,35 +742,6 @@ Eterm beam_jit_bs_get_integer(Process *c_p,
     return erts_bs_get_integer_2(c_p, size, flags, mb);
 }
 
-void beam_jit_bs_context_to_binary(Eterm context) {
-    if (is_boxed(context) && header_is_bin_matchstate(*boxed_val(context))) {
-        Uint orig, size, offs, hole_size;
-        ErlBinMatchBuffer *mb;
-        ErlBinMatchState *ms;
-        ErlSubBin *sb;
-        ms = (ErlBinMatchState *)boxed_val(context);
-        mb = &ms->mb;
-        offs = ms->save_offset[0];
-        size = mb->size - offs;
-        orig = mb->orig;
-        sb = (ErlSubBin *)boxed_val(context);
-        /* Since we're going to overwrite the match state with the result, an
-         * ErlBinMatchState must be at least as large as an ErlSubBin. */
-        ERTS_CT_ASSERT(sizeof(ErlSubBin) <= sizeof(ErlBinMatchState));
-        hole_size = 1 + header_arity(sb->thing_word) - ERL_SUB_BIN_SIZE;
-        sb->thing_word = HEADER_SUB_BIN;
-        sb->size = BYTE_OFFSET(size);
-        sb->bitsize = BIT_OFFSET(size);
-        sb->offs = BYTE_OFFSET(offs);
-        sb->bitoffs = BIT_OFFSET(offs);
-        sb->is_writable = 0;
-        sb->orig = orig;
-        if (hole_size) {
-            sb[1].thing_word = make_pos_bignum_header(hole_size - 1);
-        }
-    }
-}
-
 ErtsMessage *beam_jit_decode_dist(Process *c_p, ErtsMessage *msgp) {
     if (!erts_proc_sig_decode_dist(c_p, ERTS_PROC_LOCK_MAIN, msgp, 0)) {
         /*
diff --git a/erts/emulator/beam/jit/beam_jit_common.hpp b/erts/emulator/beam/jit/beam_jit_common.hpp
index 019f241a7e..ca73395006 100644
--- a/erts/emulator/beam/jit/beam_jit_common.hpp
+++ b/erts/emulator/beam/jit/beam_jit_common.hpp
@@ -266,11 +266,6 @@ Uint beam_jit_get_map_elements(Eterm map,
 
 void beam_jit_bs_field_size_argument_error(Process *c_p, Eterm size);
 void beam_jit_bs_add_argument_error(Process *c_p, Eterm A, Eterm B);
-Eterm beam_jit_bs_start_match2(Eterm context,
-                               Uint live,
-                               Uint slots,
-                               Process *c_p,
-                               Eterm *reg);
 Eterm beam_jit_bs_init(Process *c_p,
                        Eterm *reg,
                        ERL_BITS_DECLARE_STATEP,
@@ -296,7 +291,6 @@ Sint beam_jit_remove_message(Process *c_p,
                              Eterm *HTOP,
                              Eterm *E,
                              Uint32 active_code_ix);
-void beam_jit_bs_context_to_binary(Eterm context);
 
 void beam_jit_take_receive_lock(Process *c_p);
 void beam_jit_wait_locked(Process *c_p, ErtsCodePtr cp);
-- 
2.31.1

Places

File 1162-erts-Remove-unused-functions.patch of Package erlang (Revision f55041561f125384b28886aa21e55614)

Places