Add more debugs to confirm why ARM-32 hypercalls are failing for LAVA

Author: AndrewQuijano

panda/plugins/dwarf2/dwarf2.cpp

@@ -2321,7 +2321,7 @@ void dwarf_get_vma_symbol (CPUState *cpu, target_ulong pc, target_ulong vma, cha
 // This is the function called by 'pri_get_pc_source_info' in pri_taint.cpp
 void dwarf_get_pc_source_info(CPUState *cpu, target_ulong pc, SrcInfo *info, int *rc) {
     if (!correct_asid(cpu)) {
-        dprintf("Not in a correct asid in dwarf_get_pc_source_info\n");
+        dprintf("[dwarf2] Not in a correct asid in dwarf_get_pc_source_info\n");
         *rc = -1;
         return;
     }
@@ -2344,23 +2344,35 @@ void dwarf_get_pc_source_info(CPUState *cpu, target_ulong pc, SrcInfo *info, int
             *rc = 1;
         }
         else {
-            dprintf("Error found in plt function\n");
+            dprintf("[dwarf2] Error found in plt function\n");
             *rc = -1;
         }
         return;
     }
 
     if (it->lowpc == it->highpc) {
-        dprintf("In a a plt function\n");
+        dprintf("[dwarf2] In a a plt function\n");
         *rc = 1;
         return;
     }
     // we are in dwarf-land, so populate info struct
     target_ulong call_site_fn = it->function_addr;
-    info->filename = it->filename.c_str();
+    if (it->filename.empty()) {
+        info->filename = "unknown_file";
+    } else {
+        info->filename = it->filename.c_str(); 
+    }
     info->line_number = it->line_number;
-    std::string funct_name = funcaddrs[call_site_fn];
-    info->funct_name = funct_name.c_str();
+
+    auto func_it = funcaddrs.find(call_site_fn);
+    if (func_it != funcaddrs.end()) {
+        // CRITICAL: Point directly to the string inside the global map.
+        // This memory persists long after this function returns!
+        info->funct_name = func_it->second.c_str();
+    } else {
+        dprintf("[dwarf2] Warning: function address 0x%lx not found in funcaddrs map\n", call_site_fn);
+        info->funct_name = "unknown_function";
+    }
     *rc = 0;
     return;
 }

panda/plugins/pri_taint/pri_taint.cpp

@@ -449,7 +449,7 @@ void lava_hypercall(CPUState *cpu) {
             #endif
         }
         else if (pandalog) {
-            dprintf("[pri_taint] Hypercall is OK and Panda Log is set\n");  
+            dprintf("[pri_taint] Hypercall is OK and Panda Log is set\n");
             PandaHypercallStruct phs;
             #if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
                 panda_virtual_memory_read(cpu, env->regs[0], (uint8_t *) &phs, sizeof(phs));
@@ -461,23 +461,31 @@ void lava_hypercall(CPUState *cpu) {
                 panda_virtual_memory_read(cpu, env->regs[R_EDI], (uint8_t *) &phs, sizeof(phs));
             #endif
 
+            dprintf("[pri_taint] Completed memory read of PANDA Hypercall Struct\n");
+
             // To be used for chaff bugs?
             uint64_t funcaddr = 0;
             panda_virtual_memory_read(cpu, phs.info, (uint8_t*)&funcaddr, sizeof(target_ulong));
+            dprintf("[pri_taint] Completed memory read of the phs.info for Chaff Bugs\n");
             // if the phs action is a pri_query point, see
             // lava/include/pirate_mark_lava.h
             if (phs.action == 13) {
                 target_ulong pc = panda_current_pc(cpu);
+                dprintf("[pri_taint] ABOUT TO CALL pri_get_pc_source_info for PC: 0x%lx\n", (uint64_t) pc);
                 // Calls 'pri_get_pc_source_info' in pri.c, which calls 'on_get_pc_source_info'
                 // In Dwarf2, the function 'on_get_pc_source_info' is mapped to 'dwarf_get_pc_source_info'
                 SrcInfo info;
                 int rc = pri_get_pc_source_info(cpu, pc, &info);
+                dprintf("[pri_taint] SURVIVED pri_get_pc_source_info! rc = %d\n", rc);
                 if (!rc) {
                     struct args args = {cpu, info.filename, info.line_number, phs.src_filename, funcaddr};
-                    dprintf("[pri_taint] panda hypercall: [%s], "
-                            "ln: %4ld, pc @ 0x" TARGET_FMT_lx "\n",
-                            info.filename,
-                            info.line_number, pc);
+                    if (info.filename == NULL) {
+                        dprintf("[pri_taint] CRITICAL: info.filename is NULL! Cannot print.\n");
+                    } else {
+                        dprintf("[pri_taint] panda hypercall: [%s], ln: %4ld, pc @ 0x" TARGET_FMT_lx "\n",
+                            info.filename, info.line_number, pc);
+                    }
+
                     // Calls 'pri_funct_livevar_iter' in pri.c, which calls 'on_funct_livevar_iter'
                     // In Dwarf2, the function 'on_funct_livevar_iter' is mapped to 'dwarf_funct_livevar_iter'
                     // This is passing the function 'pfun' to 'pri_funct_livevar_iter', which is called at the end