See if I can just get the info from taint_api

Author: AndrewQuijano

panda/plugins/pri_taint/pri_taint.cpp

@@ -33,6 +33,7 @@ extern "C" {
 #include "callstack_instr/callstack_instr_ext.h"
 
 // taint
+#include "taint_api.h"
 #include "taint2/taint2_ext.h"
 
 bool init_plugin(void *);
@@ -66,24 +67,6 @@ Panda__SrcInfoPri *pandalog_src_info_pri_create(const char *src_filename, uint64
     si->insertionpoint = 1;
     return si;
 }
-// should just be able to include these from taint2.h or taint_processor.cpp
-Addr make_maddr(uint64_t a) {
-  Addr ma;
-  ma.typ = MADDR;
-  ma.val.ma = a;
-  ma.off = 0;
-  ma.flag = (AddrFlag) 0;
-  return ma;
-}
-Addr make_greg(uint64_t r, uint16_t off) {
-    Addr ra = {
-        .typ = GREG,
-        .val = { .gr = r },
-        .off = off,
-        .flag = (AddrFlag) 0
-    };
-    return ra;
-}
 
 void print_membytes(CPUState *env, target_ulong a, target_ulong len) {
     unsigned char c = (unsigned char) 0;
@@ -145,7 +128,8 @@ void lava_taint_query(target_ulong buf, LocType loc_t, target_ulong buf_len, con
     }
 
     if (debug) {
-        printf("Querying \"%s\": " TARGET_FMT_lu " bytes @ 0x%lx phys 0x%lx, strnlen=%d", astnodename, buf_len, (unsigned long)buf, (unsigned long)phys, is_strnlen);
+        printf("Querying \"%s\": " TARGET_FMT_lu " bytes @ 0x%lx phys 0x%lx, strnlen=%d", 
+                astnodename, buf_len, (unsigned long)buf, (unsigned long)phys, is_strnlen);
         print_membytes(cpu, buf, is_strnlen? 32 : buf_len);
         printf("\n");
     }