commit febb949db406f62d443bed25952ad5f87a7f7e9d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 11 08:25:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 11 08:25:02 2024 +0000
tree f031f3862204fe145fc6b3c94c40f0915d556c99
parent 50c60e52f7420a9c3f78b93b75b2bf21e50ba865
parent 091206500dcc5261e9ad9c51e3a3adc53e2705c4

Merge "Platform BpfLoader: remove dumpIns() and dumpAllCs()" into main

loader/Loader.cpp

diff --git a/loader/Loader.cpp b/loader/Loader.cpp
index 98ddd26..746aca8 100644
--- a/loader/Loader.cpp
+++ b/loader/Loader.cpp
@@ -663,26 +663,6 @@
     return ret;
 }
 
-/* For debugging, dump all instructions */
-static void dumpIns(char* ins, int size) {
-    for (int row = 0; row < size / 8; row++) {
-        ALOGE("%d: ", row);
-        for (int j = 0; j < 8; j++) {
-            ALOGE("%3x ", ins[(row * 8) + j]);
-        }
-        ALOGE("\n");
-    }
-}
-
-/* For debugging, dump all code sections from cs list */
-static void dumpAllCs(vector<codeSection>& cs) {
-    for (int i = 0; i < (int)cs.size(); i++) {
-        ALOGE("Dumping cs %d, name %s", int(i), cs[i].name.c_str());
-        dumpIns((char*)cs[i].data.data(), cs[i].data.size());
-        ALOGE("-----------");
-    }
-}
-
 static void applyRelo(void* insnsPtr, Elf64_Addr offset, int fd) {
     int insnIndex;
     struct bpf_insn *insn, *insns;
@@ -700,9 +680,7 @@
     }
 
     if (insn->code != (BPF_LD | BPF_IMM | BPF_DW)) {
-        ALOGE("Dumping all instructions till ins %d", insnIndex);
         ALOGE("invalid relo for insn %d: code 0x%x", insnIndex, insn->code);
-        dumpIns((char*)insnsPtr, (insnIndex + 3) * 8);
         return;
     }
 
@@ -884,9 +862,6 @@
         return ret;
     }
 
-    /* Just for future debugging */
-    if (0) dumpAllCs(cs);
-
     ret = createMaps(elfPath, elfFile, mapFds, location.prefix);
     if (ret) {
         ALOGE("Failed to create maps: (ret=%d) in %s", ret, elfPath);