From 5d0f774334c1bea3935001bf665d614c39a60d0f Mon Sep 17 00:00:00 2001 From: Rusty Wagner Date: Wed, 4 Mar 2015 01:47:13 -0500 Subject: Add architecture to graph edges, and add edge routing data field for layout --- architecture.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'architecture.cpp') diff --git a/architecture.cpp b/architecture.cpp index 576a14e3..f5ef6cc6 100644 --- a/architecture.cpp +++ b/architecture.cpp @@ -11,12 +11,13 @@ InstructionInfo::InstructionInfo() } -void InstructionInfo::AddBranch(BNBranchType type, uint64_t target) +void InstructionInfo::AddBranch(BNBranchType type, uint64_t target, Architecture* arch) { if (branchCount >= BN_MAX_INSTRUCTION_BRANCHES) return; branchType[branchCount] = type; - branchTarget[branchCount++] = target; + branchTarget[branchCount] = target; + branchArch[branchCount++] = arch ? arch->GetArchitectureObject() : nullptr; } @@ -116,9 +117,9 @@ vector> Architecture::GetList() vector> result; for (size_t i = 0; i < count; i++) - result.push_back(new CoreArchitecture(BNNewArchitectureReference(archs[i]))); + result.push_back(new CoreArchitecture(archs[i])); - BNFreeArchitectureList(archs, count); + BNFreeArchitectureList(archs); return result; } -- cgit v1.3.1