admin/JonathanSalwan-Triton
1
0
Fork 0
mirror of https://github.com/JonathanSalwan/Triton synced 2026-06-21 13:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean #809

Browse Source
This commit is contained in:
Jonathan Salwan
2019-10-21 14:07:12 +02:00
parent 41e743c70f
commit 79133c9c1a
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+1 -1
View File
@@ -3,4 +3,4 @@ root = true
[*.{h,hpp,c,cpp}]
indent_style = space
indent_size = tab
tab_width = 2
tab_width = 2
src/libtriton/CMakeLists.txt
-1
View File
@@ -347,4 +347,3 @@ if(PYTHON_BINDINGS)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES})
endif()
endif()
src/libtriton/arch/x86/x86Semantics.cpp
+2 -2
View File
@@ -12034,7 +12034,7 @@ namespace triton {
this->sfShld_s(inst, expr, dst, op1, op2, op3);
this->zfShl_s(inst, expr, dst, op3); /* Same that shl */
/* Tag undefined flags/registers */
/* Tag undefined flags */
if (op3->evaluate() != 0) {
this->undefined_s(inst, this->architecture->getRegister(ID_REG_X86_AF));
}
@@ -12206,7 +12206,7 @@ namespace triton {
this->sfShrd_s(inst, expr, dst, op1, op2, op3);
this->zfShl_s(inst, expr, dst, op3); /* Same that shl */
/* Tag undefined flags/registers */
/* Tag undefined flags */
if (op3->evaluate() != 0) {
this->undefined_s(inst, this->architecture->getRegister(ID_REG_X86_AF));
}
src/libtriton/ast/ast.cpp
+3
View File
@@ -2213,6 +2213,7 @@ namespace triton {
return triton::ast::rotl(h, deep);
}
/* ====== Reference node */
@@ -2433,6 +2434,8 @@ namespace triton {
template TRITON_EXPORT LandNode::LandNode(const std::vector<SharedAbstractNode>& exprs, const SharedAstContext& ctxt);
template TRITON_EXPORT LorNode::LorNode(const std::list<SharedAbstractNode>& exprs, const SharedAstContext& ctxt);
template TRITON_EXPORT LorNode::LorNode(const std::vector<SharedAbstractNode>& exprs, const SharedAstContext& ctxt);
template TRITON_EXPORT LxorNode::LxorNode(const std::list<SharedAbstractNode>& exprs, const SharedAstContext& ctxt);
template TRITON_EXPORT LxorNode::LxorNode(const std::vector<SharedAbstractNode>& exprs, const SharedAstContext& ctxt);
}; /* ast namespace */
}; /* triton namespace */
src/libtriton/bindings/python/objects/pySymbolicVariable.cpp
+3 -1
View File
@@ -215,10 +215,12 @@ namespace triton {
return type->tp_alloc(type, 0);
}
static long SymbolicVariable_hash(PyObject* self) {
return PySymbolicVariable_AsSymbolicVariable(self)->getId();
}
static PyObject* SymbolicVariable_richcompare(PyObject* self, PyObject* other, int op) {
PyObject* result = nullptr;
triton::usize id1 = 0;
@@ -286,7 +288,7 @@ namespace triton {
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
(hashfunc)SymbolicVariable_hash, /* tp_hash */
(hashfunc)SymbolicVariable_hash, /* tp_hash */
0, /* tp_call */
(reprfunc)SymbolicVariable_str, /* tp_str */
0, /* tp_getattro */
src/libtriton/includes/triton/ast.hpp
+2
View File
@@ -587,6 +587,7 @@ namespace triton {
TRITON_EXPORT triton::uint512 hash(triton::uint32 deep) const;
};
//! `(xor <expr1> <expr2>)`
class LxorNode : public AbstractNode {
public:
@@ -601,6 +602,7 @@ namespace triton {
TRITON_EXPORT triton::uint512 hash(triton::uint32 deep) const;
};
//! Reference node
class ReferenceNode : public AbstractNode {
protected:
src/libtriton/includes/triton/astEnums.hpp
+6 -6
View File
@@ -73,12 +73,12 @@ namespace triton {
LET_NODE = 193, /*!< (let ((x y)) z) */
LNOT_NODE = 197, /*!< (and x y) */
LOR_NODE = 199, /*!< (or x y) */
REFERENCE_NODE = 211, /*!< Reference node */
STRING_NODE = 223, /*!< String node */
SX_NODE = 227, /*!< ((_ sign_extend x) y) */
VARIABLE_NODE = 229, /*!< Variable node */
ZX_NODE = 233, /*!< ((_ zero_extend x) y) */
LXOR_NODE = 239, /*!< (xor x y) */
LXOR_NODE = 211, /*!< (xor x y) */
REFERENCE_NODE = 223, /*!< Reference node */
STRING_NODE = 227, /*!< String node */
SX_NODE = 229, /*!< ((_ sign_extend x) y) */
VARIABLE_NODE = 233, /*!< Variable node */
ZX_NODE = 239, /*!< ((_ zero_extend x) y) */
};
//! The Representations namespace