svf-tools 1.0.549 → 1.0.550

package/SVF-doxygen/html/html/search/functions_f.js

@@ -13,7 +13,7 @@ var searchData=
   ['parse_5fstring',['parse_string',['../cJSON_8cpp.html#adf47b520af96d1bbefa2390016fbdb51',1,'cJSON.cpp']]],
   ['parse_5fvalue',['parse_value',['../cJSON_8cpp.html#afd5c0b7089e4de2fc9b2af599d4b596f',1,'cJSON.cpp']]],
   ['parsejson',['parseJson',['../ExtAPI_8cpp.html#a3957468a4d85cef02d8be1f82bcdfc69',1,'ExtAPI.cpp']]],
-  ['parsenode',['parseNode',['../classSVF_1_1SVFIRBuilder.html#a1ad4f6ac06c1f3523661e7b2a0be09b5',1,'SVF::SVFIRBuilder']]],
+  ['parseoperations',['parseOperations',['../classSVF_1_1SVFIRBuilder.html#a8f4716f34bc0738ed9dec756113f0a37',1,'SVF::SVFIRBuilder']]],
   ['parseproductionsstring',['parseProductionsString',['../classSVF_1_1GrammarBuilder.html#a5a34166b4b1ce1dcc985f4619f4a2bbc',1,'SVF::GrammarBuilder']]],
   ['parseselfcyclehandleoption',['parseSelfCycleHandleOption',['../classSVF_1_1SVFGOPT.html#ac3b14bf191cadb832e3a34affd7e569d',1,'SVF::SVFGOPT']]],
   ['partitionmrs',['partitionMRs',['../classSVF_1_1DistinctMRG.html#a4512ef21fa83988ad4d588831bfba482',1,'SVF::DistinctMRG::partitionMRs()'],['../classSVF_1_1IntraDisjointMRG.html#a6d2434f0e3a318b89b7b9fa4f5613b64',1,'SVF::IntraDisjointMRG::partitionMRs()'],['../classSVF_1_1InterDisjointMRG.html#a807cf159e53c2fb2903296207185dda0',1,'SVF::InterDisjointMRG::partitionMRs()'],['../classSVF_1_1MRGenerator.html#ac0b966ee2065607a24920dd9067b40e9',1,'SVF::MRGenerator::partitionMRs()']]],
@@ -41,7 +41,7 @@ var searchData=
   ['phivfgnode',['PHIVFGNode',['../classSVF_1_1PHIVFGNode.html#add1ed5dfc7fbb095e2bdb7ff1e2658ef',1,'SVF::PHIVFGNode']]],
   ['plainmap',['plainMap',['../classSVF_1_1FlowSensitive.html#a5a8688102f3675cf414b01dc2ae51c6b',1,'SVF::FlowSensitive']]],
   ['pointeranalysis',['PointerAnalysis',['../classSVF_1_1PointerAnalysis.html#a14e2a209cb594f91a24ef09b12f82f3f',1,'SVF::PointerAnalysis']]],
-  ['pointsto',['PointsTo',['../classSVF_1_1PointsTo.html#a05aa807f21f311eb50ff11dde98b8d22',1,'SVF::PointsTo::PointsTo(void)'],['../classSVF_1_1PointsTo.html#acef2d3e41263aef641c3411e28ad445c',1,'SVF::PointsTo::PointsTo(const PointsTo &pt)'],['../classSVF_1_1PointsTo.html#a5ecef616428a70e8e7726406dfb43544',1,'SVF::PointsTo::PointsTo(PointsTo &&pt)'],['../classSVF_1_1CondPointsToSet.html#a63f09ca69e00b317de29af6a6a12daac',1,'SVF::CondPointsToSet::pointsTo(void)'],['../classSVF_1_1CondPointsToSet.html#ada240bc77570174a1d17ac097583fa78',1,'SVF::CondPointsToSet::pointsTo(void) const'],['../classSVF_1_1CondPointsToSet.html#a03311162626acf16ad05b7b93248a92b',1,'SVF::CondPointsToSet::pointsTo(Cond cond) const'],['../classSVF_1_1CondPointsToSet.html#a8775ef2c073af6c8055c3f5b0035288f',1,'SVF::CondPointsToSet::pointsTo(Cond cond)']]],
+  ['pointsto',['pointsTo',['../classSVF_1_1CondPointsToSet.html#a63f09ca69e00b317de29af6a6a12daac',1,'SVF::CondPointsToSet::pointsTo(void)'],['../classSVF_1_1CondPointsToSet.html#ada240bc77570174a1d17ac097583fa78',1,'SVF::CondPointsToSet::pointsTo(void) const'],['../classSVF_1_1CondPointsToSet.html#a03311162626acf16ad05b7b93248a92b',1,'SVF::CondPointsToSet::pointsTo(Cond cond) const'],['../classSVF_1_1CondPointsToSet.html#a8775ef2c073af6c8055c3f5b0035288f',1,'SVF::CondPointsToSet::pointsTo(Cond cond)'],['../classSVF_1_1PointsTo.html#a05aa807f21f311eb50ff11dde98b8d22',1,'SVF::PointsTo::PointsTo(void)'],['../classSVF_1_1PointsTo.html#acef2d3e41263aef641c3411e28ad445c',1,'SVF::PointsTo::PointsTo(const PointsTo &pt)'],['../classSVF_1_1PointsTo.html#a5ecef616428a70e8e7726406dfb43544',1,'SVF::PointsTo::PointsTo(PointsTo &&pt)']]],
   ['pointstoiterator',['PointsToIterator',['../classSVF_1_1PointsTo_1_1PointsToIterator.html#a3974dee7680da3a43b58932766e77a16',1,'SVF::PointsTo::PointsToIterator::PointsToIterator(void)=delete'],['../classSVF_1_1PointsTo_1_1PointsToIterator.html#a19f371ccb5b1c84fb4adfd5b0c8a3eec',1,'SVF::PointsTo::PointsToIterator::PointsToIterator(const PointsToIterator &pt)'],['../classSVF_1_1PointsTo_1_1PointsToIterator.html#abe128c47fb16093756195f789e5f68d5',1,'SVF::PointsTo::PointsToIterator::PointsToIterator(PointsToIterator &&pt)'],['../classSVF_1_1PointsTo_1_1PointsToIterator.html#ad9efcd9fb0c8201b9166a1560d06a71b',1,'SVF::PointsTo::PointsToIterator::PointsToIterator(const PointsTo *pt, bool end=false)']]],
   ['pop',['pop',['../classSVF_1_1CFLFIFOWorkList.html#a8ccf884ed6bc0d172f3c2999717f9cff',1,'SVF::CFLFIFOWorkList::pop()'],['../classSVF_1_1List.html#a6e85bd3d8b23ccc7752a72e2a5b171ab',1,'SVF::List::pop()'],['../classSVF_1_1FIFOWorkList.html#a8fa72918fce7e9c0b2dc34b683a797c6',1,'SVF::FIFOWorkList::pop()'],['../classSVF_1_1FILOWorkList.html#a3fd9acb6d09fd142bfd402fdf8cac93b',1,'SVF::FILOWorkList::pop()']]],
   ['popfromctpworklist',['popFromCTPWorkList',['../classSVF_1_1LockAnalysis.html#ac3de5acfb887c17ebf1213a1c2c38b58',1,'SVF::LockAnalysis::popFromCTPWorkList()'],['../classSVF_1_1TCT.html#ad84cdb0d192312f96d006f7b9e660da3',1,'SVF::TCT::popFromCTPWorkList()']]],

package/SVF-doxygen/html/html/search/variables_1.js

@@ -53,7 +53,6 @@ var searchData=
   ['annoflag',['AnnoFlag',['../classSVF_1_1Options.html#ae1dadbd4c213f1bd5b8957b5c747bebd',1,'SVF::Options']]],
   ['annotationtime',['AnnotationTime',['../classSVF_1_1MTAStat.html#a51e1ba35f81d89e210a937942f516839',1,'SVF::MTAStat']]],
   ['apnodes',['APNodes',['../classSVF_1_1CallICFGNode.html#a07615cb6245a9dccbba2cc70bde9bf22',1,'SVF::CallICFGNode']]],
-  ['args',['args',['../classSVF_1_1ExtAPI_1_1Operation.html#a826ff720a0038118e8e27e2a36d05cd5',1,'SVF::ExtAPI::Operation']]],
   ['argsofuncalledfunction',['argsOfUncalledFunction',['../classSVF_1_1SVFModule.html#a90bd61848ffbbb0bc30b33bf65d1cb6e',1,'SVF::SVFModule']]],
   ['atend',['AtEnd',['../classSVF_1_1SparseBitVector_1_1SparseBitVectorIterator.html#aa28c3c88d66d8bc3dbf96e2f4bd84fab',1,'SVF::SparseBitVector::SparseBitVectorIterator::AtEnd()'],['../classSVF_1_1CondPointsToSet_1_1CondPtsSetIterator.html#ad22614f30570619802e23715d1d5eaf0',1,'SVF::CondPointsToSet::CondPtsSetIterator::atEnd()']]],
   ['atptdata',['atPTData',['../classSVF_1_1MutableVersionedPTData.html#a3e5337d4189e98f11305491a9ef3c439',1,'SVF::MutableVersionedPTData::atPTData()'],['../classSVF_1_1PersistentVersionedPTData.html#a61b44f6d63cca013da2b278f47298473',1,'SVF::PersistentVersionedPTData::atPTData()']]],

package/SVF-doxygen/html/html/search/variables_13.js

@@ -28,7 +28,7 @@ var searchData=
   ['timeofprocessloadstore',['timeOfProcessLoadStore',['../classSVF_1_1AndersenBase.html#a9fe738f1e11c80006d540f246a80bfdf',1,'SVF::AndersenBase']]],
   ['timeofsccdetection',['timeOfSCCDetection',['../classSVF_1_1AndersenBase.html#a6b7d0e57f741c446d0bf178939960143',1,'SVF::AndersenBase']]],
   ['timeofsccmerges',['timeOfSCCMerges',['../classSVF_1_1AndersenBase.html#a02c5a50b214d36921e1404784e76704d',1,'SVF::AndersenBase']]],
-  ['timeofssarenaming',['TimeOfSSARenaming',['../classSVF_1_1MemSSAStat.html#a887ff23a7ea1a18f08b1744ff30da773',1,'SVF::MemSSAStat::TimeOfSSARenaming()'],['../classSVF_1_1MemSSA.html#a97ccd5e0b9ab6144415e26bdf95cbabd',1,'SVF::MemSSA::timeOfSSARenaming()']]],
+  ['timeofssarenaming',['timeOfSSARenaming',['../classSVF_1_1MemSSA.html#a97ccd5e0b9ab6144415e26bdf95cbabd',1,'SVF::MemSSA::timeOfSSARenaming()'],['../classSVF_1_1MemSSAStat.html#a887ff23a7ea1a18f08b1744ff30da773',1,'SVF::MemSSAStat::TimeOfSSARenaming()']]],
   ['timeofupdatecallgraph',['timeOfUpdateCallGraph',['../classSVF_1_1AndersenBase.html#a2afb49f513c9534fd051117b59dc056b',1,'SVF::AndersenBase']]],
   ['timestatmap',['timeStatMap',['../classSVF_1_1PTAStat.html#a3724756ac0527ba3d199be32e38c6337',1,'SVF::PTAStat']]],
   ['tlptdata',['tlPTData',['../classSVF_1_1MutableVersionedPTData.html#a01974968b7cf60a4231cc83c93b26d7f',1,'SVF::MutableVersionedPTData::tlPTData()'],['../classSVF_1_1PersistentVersionedPTData.html#a29104a2d53d94805e142f778d3d21ad5',1,'SVF::PersistentVersionedPTData::tlPTData()']]],

package/SVF-doxygen/html/html/search/variables_14.js

@@ -5,7 +5,7 @@ var searchData=
   ['uniqueintersections',['uniqueIntersections',['../classSVF_1_1PersistentPointsToCache.html#a474023fe293b080fbda7da06ef380531',1,'SVF::PersistentPointsToCache']]],
   ['uniqueunions',['uniqueUnions',['../classSVF_1_1PersistentPointsToCache.html#aacebdd87b1dd45250391d035b032f9d4',1,'SVF::PersistentPointsToCache']]],
   ['unlocksites',['unlocksites',['../classSVF_1_1LockAnalysis.html#aec459af1d1624df55ffc95cd75655780',1,'SVF::LockAnalysis']]],
-  ['updatecallgraphtime',['UpdateCallGraphTime',['../classSVF_1_1PTAStat.html#a8aedfeb35f76e6d33135637156468894',1,'SVF::PTAStat::UpdateCallGraphTime()'],['../classSVF_1_1FlowSensitive.html#afc140b6c8e78dc2d962f64fdf53b1e07',1,'SVF::FlowSensitive::updateCallGraphTime()']]],
+  ['updatecallgraphtime',['updateCallGraphTime',['../classSVF_1_1FlowSensitive.html#afc140b6c8e78dc2d962f64fdf53b1e07',1,'SVF::FlowSensitive::updateCallGraphTime()'],['../classSVF_1_1PTAStat.html#a8aedfeb35f76e6d33135637156468894',1,'SVF::PTAStat::UpdateCallGraphTime()']]],
   ['updatetime',['updateTime',['../classSVF_1_1FlowSensitive.html#af5a94d14096ae2bbc47b3b3b9f723226',1,'SVF::FlowSensitive']]],
   ['usedregs',['usedRegs',['../classSVF_1_1MemSSA.html#acf840b71b67cabe831f01f2d358f27fa',1,'SVF::MemSSA']]],
   ['usepcg',['UsePCG',['../classSVF_1_1Options.html#af2f66307e1d51947676f622c98ef0762',1,'SVF::Options']]],

package/SVF-doxygen/html/html/search/variables_e.js

@@ -35,7 +35,7 @@ var searchData=
   ['numgtintregions',['NumGtIntRegions',['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#ad7cb36a1f0f67864fb8290e9dfd7b639',1,'SVF::NodeIDAllocator::Clusterer']]],
   ['numnodes',['numNodes',['../classSVF_1_1NodeIDAllocator.html#a8e76e0da58f0a5bdbd8118ac419cfa62',1,'SVF::NodeIDAllocator']]],
   ['numnontrivialregionobjects',['NumNonTrivialRegionObjects',['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#a1bf9461c717e8dabaee6a57f3d76d61f',1,'SVF::NodeIDAllocator::Clusterer']]],
-  ['numobjects',['numObjects',['../classSVF_1_1NodeIDAllocator.html#a190c729a3f3f622f82cee4917946b50f',1,'SVF::NodeIDAllocator::numObjects()'],['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#afa74c5ccd22bebe0b76db33066d8b498',1,'SVF::NodeIDAllocator::Clusterer::NumObjects()']]],
+  ['numobjects',['NumObjects',['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#afa74c5ccd22bebe0b76db33066d8b498',1,'SVF::NodeIDAllocator::Clusterer::NumObjects()'],['../classSVF_1_1NodeIDAllocator.html#a190c729a3f3f622f82cee4917946b50f',1,'SVF::NodeIDAllocator::numObjects()']]],
   ['numofactualin',['numOfActualIn',['../classSVF_1_1SVFGStat.html#a5365744d2ec3594e2255d274f7256569',1,'SVF::SVFGStat']]],
   ['numofactualout',['numOfActualOut',['../classSVF_1_1SVFGStat.html#a122555f5c4b9746cc2b7f38c7cd6b505',1,'SVF::SVFGStat']]],
   ['numofactualparam',['numOfActualParam',['../classSVF_1_1SVFGStat.html#a0494c59483520b57acdca95952c93d76',1,'SVF::SVFGStat']]],
@@ -98,7 +98,7 @@ var searchData=
   ['numofmhpld',['numOfMHPLd',['../classSVF_1_1MTAAnnotator.html#a29e0123620ab072fddc45331c6aa46e8',1,'SVF::MTAAnnotator']]],
   ['numofmhpqueries',['numOfMHPQueries',['../classSVF_1_1MHP.html#ab8bd382e0c70b0feb2a291ecc4043106',1,'SVF::MHP']]],
   ['numofmhpst',['numOfMHPSt',['../classSVF_1_1MTAAnnotator.html#a3a53e90b4f361d1298983bc89795b3d2',1,'SVF::MTAAnnotator']]],
-  ['numofmssaphi',['NumOfMSSAPhi',['../classSVF_1_1MemSSAStat.html#a4b598cb1d06c4c0963787036862b1c3d',1,'SVF::MemSSAStat::NumOfMSSAPhi()'],['../classSVF_1_1SVFGStat.html#a9fc87025af3b7e54442e78f46ebe0360',1,'SVF::SVFGStat::numOfMSSAPhi()']]],
+  ['numofmssaphi',['numOfMSSAPhi',['../classSVF_1_1SVFGStat.html#a9fc87025af3b7e54442e78f46ebe0360',1,'SVF::SVFGStat::numOfMSSAPhi()'],['../classSVF_1_1MemSSAStat.html#a4b598cb1d06c4c0963787036862b1c3d',1,'SVF::MemSSAStat::NumOfMSSAPhi()']]],
   ['numofnewsvfgedges',['numOfNewSVFGEdges',['../classSVF_1_1MTASVFGBuilder.html#a019a4597074fdad6e51d936ed4ead0d9',1,'SVF::MTASVFGBuilder']]],
   ['numofnodes',['numOfNodes',['../classSVF_1_1ICFGStat.html#a8e71a19c266aacd7acb1fee6bb339788',1,'SVF::ICFGStat::numOfNodes()'],['../classSVF_1_1SVFGStat.html#ab499c24856a990dd4adb366107eb3302',1,'SVF::SVFGStat::numOfNodes()']]],
   ['numofnodesincycles',['NumOfNodesInCycles',['../classSVF_1_1PTAStat.html#aea3e95097b3b9d326bef0d36f17e51a5',1,'SVF::PTAStat']]],
@@ -136,7 +136,7 @@ var searchData=
   ['numofretnodes',['numOfRetNodes',['../classSVF_1_1ICFGStat.html#ac9bfce40c058ed7ab178fe1f1818e9de',1,'SVF::ICFGStat']]],
   ['numofreturns',['NumOfReturns',['../classSVF_1_1PTAStat.html#a0a552611fcd20e1310290bdae404a514',1,'SVF::PTAStat']]],
   ['numofscc',['numOfSCC',['../classSVF_1_1FlowSensitive.html#a0ac955bf06261eec1c6bb78ec99652e3',1,'SVF::FlowSensitive']]],
-  ['numofsccdetection',['NumOfSCCDetection',['../classSVF_1_1PTAStat.html#ad1731b88c24bb79728f62cd3e9c55699',1,'SVF::PTAStat::NumOfSCCDetection()'],['../classSVF_1_1AndersenBase.html#a0d7298cbf83568f24fd2bd1926a32968',1,'SVF::AndersenBase::numOfSCCDetection()']]],
+  ['numofsccdetection',['numOfSCCDetection',['../classSVF_1_1AndersenBase.html#a0d7298cbf83568f24fd2bd1926a32968',1,'SVF::AndersenBase::numOfSCCDetection()'],['../classSVF_1_1PTAStat.html#ad1731b88c24bb79728f62cd3e9c55699',1,'SVF::PTAStat::NumOfSCCDetection()']]],
   ['numofsfr',['NumOfSfr',['../classSVF_1_1PTAStat.html#a07a1db62ddba50bda787b2985ef8d135',1,'SVF::PTAStat']]],
   ['numofsfrs',['numOfSfrs',['../classSVF_1_1AndersenBase.html#a25b00d9ca71cbdd27530fc5d0dc84ee5',1,'SVF::AndersenBase']]],
   ['numofstackobjs',['NumOfStackObjs',['../classSVF_1_1PTAStat.html#ae05503909688a17dc1f282d1d029d24e',1,'SVF::PTAStat']]],

package/SVF-doxygen/html/html/search/variables_f.js

@@ -9,9 +9,10 @@ var searchData=
   ['offsetvalues',['offsetValues',['../classSVF_1_1LocationSet.html#a5a2792b8b914557a9ccf0e57d0ed8b30',1,'SVF::LocationSet']]],
   ['onstack',['onStack',['../structSVF_1_1VersionedFlowSensitive_1_1SCC_1_1NodeData.html#a0eb5f6b9985b9b512a76537d55b092b5',1,'SVF::VersionedFlowSensitive::SCC::NodeData']]],
   ['ontheflyiterbudgetforstat',['OnTheFlyIterBudgetForStat',['../classSVF_1_1PointerAnalysis.html#afc320fbf269404fe128e69c98e6f9cac',1,'SVF::PointerAnalysis']]],
-  ['op_5fpair',['op_pair',['../classSVF_1_1ExtAPI.html#a495b6db60a6266b83cf511965a57f6a3',1,'SVF::ExtAPI']]],
+  ['op',['op',['../classSVF_1_1ExtAPI_1_1Operation.html#a1e8979a53cf1edb5df00a5f28b6c19e9',1,'SVF::ExtAPI::Operation']]],
   ['opcode',['opcode',['../classSVF_1_1BinaryOPStmt.html#a0c4f900cf7321e8385b4f45e5cba3d1a',1,'SVF::BinaryOPStmt::opcode()'],['../classSVF_1_1UnaryOPStmt.html#a099df135a83d28a2e6f344e008fe1cc6',1,'SVF::UnaryOPStmt::opcode()']]],
-  ['operation',['operation',['../classSVF_1_1ExtAPI_1_1Operation.html#ad5b7fd4408d5d33e2963008d30dcbdc9',1,'SVF::ExtAPI::Operation']]],
+  ['operands',['operands',['../classSVF_1_1ExtAPI_1_1Operation.html#ae3539c507b6284b849c136418507e72b',1,'SVF::ExtAPI::Operation']]],
+  ['operandstr',['operandStr',['../classSVF_1_1ExtAPI_1_1Operation.html#a56d03123021f1f628361a4080fa573ce',1,'SVF::ExtAPI::Operation']]],
   ['opicfgnodes',['opICFGNodes',['../classSVF_1_1PhiStmt.html#a4c75a8f8430621aaec62a5189db136b5',1,'SVF::PhiStmt']]],
   ['opincomingbbs',['opIncomingBBs',['../classSVF_1_1IntraPHIVFGNode.html#a73f39a488ad82300010abd18afe247a4',1,'SVF::IntraPHIVFGNode']]],
   ['opit',['OpIt',['../classllvm_1_1generic__bridge__gep__type__iterator.html#aa3fd4dca27e09df9ee726879624ae47e',1,'llvm::generic_bridge_gep_type_iterator']]],

package/include/SVF-FE/SVFIRBuilder.h

@@ -240,7 +240,7 @@ protected:
 
     /// Handle external call
     //@{
-    virtual NodeID parseNode(std::string s, CallSite cs, const Instruction *inst);
+    virtual void parseOperations(std::vector<ExtAPI::Operation>  &operations, CallSite cs);
     virtual void handleExtCall(CallSite cs, const SVFFunction *F);
     void addComplexConsForExt(Value *D, Value *S, const Value* sz);
     //@}

package/include/Util/ExtAPI.h

@@ -102,19 +102,6 @@ Here we use regular expressions "(AN)(R|RN)^*" to represent parameters, for exam
 class ExtAPI
 {
 public:
-    enum extf_t
-    {
-        EXT_ADDR = 0,  // Handle addr edge
-        EXT_COPY,      // Handle copy edge
-        EXT_LOAD,      // Handle load edge
-        EXT_STORE,     // Handle store edge
-        EXT_GEP,      // Handle gep edge
-        EXT_COPY_N,    // Copy the character c (an unsigned char) to the first n characters of the string pointed to, by the argument str
-        EXT_COPY_MN,   // Copies n characters from memory area src to memory area dest.
-        EXT_FUNPTR,    // Handle function void *dlsym(void *handle, const char *symbol)
-        EXT_COMPLEX,   // Handle function _ZSt29_Rb_tree_insert_and_rebalancebPSt18_Rb_tree_node_baseS0_RS_
-        EXT_OTHER
-    };
 
     // External Function types
     // Assume a call in the form LHS= F(arg0, arg1, arg2, arg3).
@@ -163,18 +150,6 @@ public:
     };
 
 private:
-    std::map<std::string, extf_t> op_pair =
-    {
-        {"addr", EXT_ADDR},
-        {"copy", EXT_COPY},
-        {"load", EXT_LOAD},
-        {"store", EXT_STORE},
-        {"gep", EXT_GEP},
-        {"copy_n", EXT_COPY_N},
-        {"copy_mn", EXT_COPY_MN},
-        {"complex", EXT_COMPLEX},
-        {"funptr", EXT_FUNPTR}
-    };
 
     std::map<std::string, extType> type_pair =
     {
@@ -226,38 +201,36 @@ public:
 
     class Operation
     {
-    public:
-
     public:
         Operation() {};
 
-        Operation(std::string op, std::vector<std::string> args) : operation(op), args(args) {};
+        Operation(std::string opn, std::vector<std::string> varstr) : op(opn), operandStr(varstr) {};
 
-        std::string getOperation()
+        std::string getOperator()
         {
-            return operation;
+            return op;
         }
 
-        std::vector<std::string> getArgs()
+        std::vector<std::string> getOperandStr()
         {
-            return args;
+            return operandStr;
         }
 
-        void setOperation(std::string op)
+        std::vector<NodeID> getOperands()
         {
-            operation = op;
+            return operands;
         }
 
-        void setArgs(std::vector<std::string> ags)
+        void setOperands(std::vector<NodeID> vars)
         {
-            args = ags;
+            operands = vars;
         }
 
     private:
-        std::string operation;
-        std::vector<std::string> args;
+        std::string op;
+        std::vector<std::string> operandStr;
+        std::vector<NodeID> operands;
     };
-
     static ExtAPI *getExtAPI(const std::string & = "");
 
     static void destory();
@@ -271,11 +244,13 @@ public:
     // return value >= 0 is an argument node
     // return value = -1 is an inst node
     // return value = -2 is a Dummy node
-    // return value = -2 is an illegal operand format
+    // return value = -3 is an object node
+    // return value = -4 is an offset
+    // return value = -5 is an illegal operand format
     int getNodeIDType(std::string s);
 
     // Get the corresponding name in ext_t, e.g. "EXT_ADDR" in {"addr", EXT_ADDR},
-    extf_t get_opName(const std::string& s);
+    std::string get_opName(const std::string& s);
     // opposite for extType
     const std::string& extType_toString(extType type);
 
@@ -289,7 +264,7 @@ public:
     cJSON *get_FunJson(const std::string &funName);
 
     // Get all operations of an extern function
-    std::vector<std::vector<ExtAPI::Operation *>> getAllOperations(std::string funName);
+    std::vector<Operation> getAllOperations(std::string funName);
 
     // Get property of the operation, e.g. "EFT_A1R_A0R"
     extType get_type(const SVF::SVFFunction *callee);