From 6951453afb556559c8b3b1f17783925fd8bdc056 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Sun, 3 Feb 2019 20:23:39 -0500
Subject: [PATCH] update to build libirdb-deep
---
include/interfaces/irdb/STARSInterface.h | 12 +++++++-----
include/stars.h | 6 +++---
src/drivers/library/stars_irdb.cpp | 2 +-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/include/interfaces/irdb/STARSInterface.h b/include/interfaces/irdb/STARSInterface.h
index 466a93eb..09a12540 100644
--- a/include/interfaces/irdb/STARSInterface.h
+++ b/include/interfaces/irdb/STARSInterface.h
@@ -14,7 +14,7 @@
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
-#include <pqxx/pqxx>
+// #include <pqxx/pqxx>
class STARS_IRDB_Function_t;
@@ -37,10 +37,10 @@ class STARS_IRDB_Interface_t: public STARS_Interface_t
public:
// Constructors
- STARS_IRDB_Interface_t(IRDB_SDK::FileIR_t* p_firp, IRDB_SDK::pqxxDB_t &p_pqxx_interface) :
+ STARS_IRDB_Interface_t(IRDB_SDK::FileIR_t* p_firp /*, IRDB_SDK::pqxxDB_t &p_pqxx_interface */) :
CGCBinary(false),
firp(p_firp),
- pqxx_interface(p_pqxx_interface),
+// pqxx_interface(p_pqxx_interface),
instruction_predsp(IRDB_SDK::InstructionPredecessors_t::factory(firp)),
instruction_preds(*instruction_predsp),
IBT_provsp(IRDB_SDK::IBTProvenance_t::factory(firp)),
@@ -243,12 +243,14 @@ private:
void InitSegments()
{
+ /*
int elfoid=firp->getFile()->getELFOID();
pqxx::largeobject lo(elfoid);
lo.to_file(pqxx_interface.getTransaction(),"readeh_tmp_file.exe");
// elfiop.reset(new ELFIO::elfio);
+ */
elfiop=new ELFIO::elfio;
- elfiop->load("readeh_tmp_file.exe");
+ elfiop->load("a.ncexe");
//ELFIO::dump::header(std::cout,*elfiop);
//ELFIO::dump::section_headers(std::cout,*elfiop);
@@ -324,7 +326,7 @@ private:
ELFIO::elfio* elfiop;
IRDB_SDK::FileIR_t *firp;
- IRDB_SDK::pqxxDB_t &pqxx_interface;
+// IRDB_SDK::pqxxDB_t &pqxx_interface;
std::unique_ptr<IRDB_SDK::InstructionPredecessors_t> instruction_predsp;
IRDB_SDK::InstructionPredecessors_t& instruction_preds;
diff --git a/include/stars.h b/include/stars.h
index 8afad36b..57dbb664 100644
--- a/include/stars.h
+++ b/include/stars.h
@@ -50,8 +50,8 @@ namespace STARS
class IRDB_Interface_t
{
public:
- IRDB_Interface_t(IRDB_SDK::pqxxDB_t &p_pqxx_interface)
- : pqxx_interface(p_pqxx_interface)
+ IRDB_Interface_t(/* IRDB_SDK::pqxxDB_t &p_pqxx_interface */)
+// : pqxx_interface(p_pqxx_interface)
{
};
@@ -64,7 +64,7 @@ namespace STARS
const MEDS_Annotation::MEDS_AnnotationParser & getAnnotations() const { return parser; }
private:
- IRDB_SDK::pqxxDB_t &pqxx_interface;
+// IRDB_SDK::pqxxDB_t &pqxx_interface;
MEDS_Annotation::MEDS_AnnotationParser parser;
STARS::Option_t STARSOptions;
};
diff --git a/src/drivers/library/stars_irdb.cpp b/src/drivers/library/stars_irdb.cpp
index 7e0205ad..79ba5676 100644
--- a/src/drivers/library/stars_irdb.cpp
+++ b/src/drivers/library/stars_irdb.cpp
@@ -157,7 +157,7 @@ int STARS::IRDB_Interface_t::do_STARS(FileIR_t* firp)
{
STARS_InstructionID_t::Init();
STARS_IRDB_Program_t* gsp=NULL;
- global_stars_interface = new STARS_IRDB_Interface_t(firp, pqxx_interface);
+ global_stars_interface = new STARS_IRDB_Interface_t(firp);
global_STARS_program = gsp = new STARS_IRDB_Program_t(firp);
// this is initing the global_stars_program (GSP)
--
GitLab