From 7b12e440b3b550ae6ac7d053dae6e079ef6960e9 Mon Sep 17 00:00:00 2001
From: Matthew McGill <mhollismcgill@gmail.com>
Date: Thu, 18 Oct 2018 14:41:18 +0000
Subject: [PATCH] thanos integration
Former-commit-id: 1c79f422d1859bfc3ca019c704460ddb531aed85
---
libIRDB/include/core/fileir.hpp | 2 +-
libIRDB/src/core/fileir.cpp | 6 +++---
libIRDB/src/core/generate_spri.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libIRDB/include/core/fileir.hpp b/libIRDB/include/core/fileir.hpp
index 9cfa4dd2a..7668dabaf 100644
--- a/libIRDB/include/core/fileir.hpp
+++ b/libIRDB/include/core/fileir.hpp
@@ -123,7 +123,7 @@ class FileIR_t : public BaseObj_t
RelocationSet_t relocs;
TypeSet_t types;
DataScoopSet_t scoops;
- VariantID_t* progid; // Not owned by fileIR
+ VariantID_t& progid; // Not owned by fileIR
ICFSSet_t icfs_set;
File_t* fileptr; // Owned by variant, not fileIR
EhProgramSet_t eh_pgms;
diff --git a/libIRDB/src/core/fileir.cpp b/libIRDB/src/core/fileir.cpp
index 9be39c644..a46336a57 100644
--- a/libIRDB/src/core/fileir.cpp
+++ b/libIRDB/src/core/fileir.cpp
@@ -82,18 +82,18 @@ static virtual_offset_t strtovo(std::string s)
}
// Create a Variant from the database
-FileIR_t::FileIR_t(const VariantID_t &newprogid, File_t* fid) : BaseObj_t(NULL)
+FileIR_t::FileIR_t(const VariantID_t &newprogid, File_t* fid)
+ : BaseObj_t(NULL), progid((VariantID_t&) newprogid)
{
orig_variant_ir_p=NULL;
- progid=(VariantID_t*) &newprogid;
if(fid==NULL)
fileptr=newprogid.GetMainFile();
else
fileptr=fid;
- if(progid->IsRegistered())
+ if(progid.IsRegistered())
{
ReadFromDB();
SetArchitecture();
diff --git a/libIRDB/src/core/generate_spri.cpp b/libIRDB/src/core/generate_spri.cpp
index b45d6fd45..c70a73517 100644
--- a/libIRDB/src/core/generate_spri.cpp
+++ b/libIRDB/src/core/generate_spri.cpp
@@ -837,7 +837,7 @@ static void generate_insn_to_insn_maps(FileIR_t *fileIRp, FileIR_t *orig_fileIRp
//
void FileIR_t::GenerateSPRI(ostream &fout, bool with_ilr)
{
- VariantID_t orig_varidp(progid->GetOriginalVariantID());
+ VariantID_t orig_varidp(progid.GetOriginalVariantID());
assert(orig_varidp.IsRegistered()==true);
for(
--
GitLab