Skip to content

Commit

Permalink
WIP(Note)
Browse files Browse the repository at this point in the history
  • Loading branch information
@romainthomas
romainthomas committed Nov 9, 2023
1 parent 267bab4 commit dbaba2f
Show file tree
Hide file tree
Showing 84 changed files with 3,925 additions and 4,026 deletions.
5 changes: 2 additions & 3 deletions api/python/CMakeLists.txt
View file
Expand Up @@ -39,11 +39,10 @@ message(STATUS "Python interpreter: ${Python_EXECUTABLE}")
nanobind_add_module(
pyLIEF
NB_STATIC

${CMAKE_CURRENT_SOURCE_DIR}/src/pyLIEF.cpp

# Do not default to -Os
NOMINSIZE

${CMAKE_CURRENT_SOURCE_DIR}/src/pyLIEF.cpp
)

add_subdirectory(src)
Expand Down
627 changes: 359 additions & 268 deletions api/python/lief/ELF.pyi
View file

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions api/python/lief/__init__.pyi
View file
Expand Up @@ -261,6 +261,18 @@ class lief_errors:
__name__: Any
def __init__(self, *args, **kwargs) -> None: ...

class ok_error_t:
def __init__(self, *args, **kwargs) -> None: ...
def __bool__(self) -> bool: ...
@property
def error(self) -> lief_errors: ...
@property
def is_error(self) -> bool: ...
@property
def is_value(self) -> bool: ...
@property
def value(self) -> lief.ok_t: ...

class ok_t:
def __init__(self, *args, **kwargs) -> None: ...
def __bool__(self) -> bool: ...
Expand Down
2 changes: 1 addition & 1 deletion api/python/pyproject.toml
View file
Expand Up @@ -30,5 +30,5 @@ homepage = "https://lief-project.github.io/"
documentation = "https://lief-project.github.io/doc/latest/"
repository = "https://github.com/lief-project/LIEF"
changelog = "https://lief-project.github.io/doc/latest/changelog.html"
Funding = "https://lief-project.github.io/about"
Funding = "https://github.com/sponsors/lief-project"
Tracker = "https://github.com/lief-project/LIEF/issues"
44 changes: 0 additions & 44 deletions api/python/src/ELF/enums.cpp
View file
Expand Up @@ -1177,50 +1177,6 @@ void init_enums(nb::module_& m) {
.value(PY_ENUM(DYNSYM_COUNT_METHODS::COUNT_RELOCATIONS));


enum_<NOTE_TYPES>(m, "NOTE_TYPES")
.value(PY_ENUM(NOTE_TYPES::NT_UNKNOWN))
.value(PY_ENUM(NOTE_TYPES::NT_GNU_ABI_TAG))
.value(PY_ENUM(NOTE_TYPES::NT_GNU_HWCAP))
.value(PY_ENUM(NOTE_TYPES::NT_GNU_BUILD_ID))
.value(PY_ENUM(NOTE_TYPES::NT_GNU_GOLD_VERSION))
.value(PY_ENUM(NOTE_TYPES::NT_GNU_PROPERTY_TYPE_0))
.value(PY_ENUM(NOTE_TYPES::NT_GNU_BUILD_ATTRIBUTE_OPEN))
.value(PY_ENUM(NOTE_TYPES::NT_GNU_BUILD_ATTRIBUTE_FUNC))
.value(PY_ENUM(NOTE_TYPES::NT_CRASHPAD));


enum_<NOTE_TYPES_CORE>(m, "NOTE_TYPES_CORE")
.value(PY_ENUM(NOTE_TYPES_CORE::NT_CORE_UNKNOWN))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_PRSTATUS))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_PRFPREG))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_PRPSINFO))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_TASKSTRUCT))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_AUXV))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_SIGINFO))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_FILE))

.value(PY_ENUM(NOTE_TYPES_CORE::NT_ARM_VFP))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_ARM_TLS))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_ARM_HW_BREAK))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_ARM_HW_WATCH))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_ARM_SYSTEM_CALL))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_ARM_SVE))

.value(PY_ENUM(NOTE_TYPES_CORE::NT_386_TLS))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_386_IOPERM))
.value(PY_ENUM(NOTE_TYPES_CORE::NT_386_XSTATE));


enum_<NOTE_ABIS>(m, "NOTE_ABIS")
.value(PY_ENUM(NOTE_ABIS::ELF_NOTE_UNKNOWN))
.value(PY_ENUM(NOTE_ABIS::ELF_NOTE_OS_LINUX))
.value(PY_ENUM(NOTE_ABIS::ELF_NOTE_OS_GNU))
.value(PY_ENUM(NOTE_ABIS::ELF_NOTE_OS_SOLARIS2))
.value(PY_ENUM(NOTE_ABIS::ELF_NOTE_OS_FREEBSD))
.value(PY_ENUM(NOTE_ABIS::ELF_NOTE_OS_NETBSD))
.value(PY_ENUM(NOTE_ABIS::ELF_NOTE_OS_SYLLABLE));


enum_<RELOCATION_PURPOSES>(m, "RELOCATION_PURPOSES")
.value(PY_ENUM(RELOCATION_PURPOSES::RELOC_PURPOSE_NONE))
.value(PY_ENUM(RELOCATION_PURPOSES::RELOC_PURPOSE_PLTGOT))
Expand Down
41 changes: 22 additions & 19 deletions api/python/src/ELF/init.cpp
View file
Expand Up @@ -30,15 +30,6 @@
#include "LIEF/ELF/DynamicSharedObject.hpp"
#include "LIEF/ELF/GnuHash.hpp"
#include "LIEF/ELF/Header.hpp"
#include "LIEF/ELF/Note.hpp"
#include "LIEF/ELF/NoteDetails.hpp"
#include "LIEF/ELF/NoteDetails/AndroidNote.hpp"
#include "LIEF/ELF/NoteDetails/NoteAbi.hpp"
#include "LIEF/ELF/NoteDetails/core/CoreAuxv.hpp"
#include "LIEF/ELF/NoteDetails/core/CoreFile.hpp"
#include "LIEF/ELF/NoteDetails/core/CorePrPsInfo.hpp"
#include "LIEF/ELF/NoteDetails/core/CorePrStatus.hpp"
#include "LIEF/ELF/NoteDetails/core/CoreSigInfo.hpp"
#include "LIEF/ELF/Parser.hpp"
#include "LIEF/ELF/Relocation.hpp"
#include "LIEF/ELF/Section.hpp"
Expand All @@ -51,10 +42,30 @@
#include "LIEF/ELF/SysvHash.hpp"
#include "LIEF/ELF/utils.hpp"

#include "LIEF/ELF/Note.hpp"
#include "LIEF/ELF/NoteDetails/AndroidIdent.hpp"
#include "LIEF/ELF/NoteDetails/NoteAbi.hpp"
#include "LIEF/ELF/NoteDetails/core/CoreAuxv.hpp"
#include "LIEF/ELF/NoteDetails/core/CoreFile.hpp"
#include "LIEF/ELF/NoteDetails/core/CorePrPsInfo.hpp"
#include "LIEF/ELF/NoteDetails/core/CoreSigInfo.hpp"
#include "LIEF/ELF/NoteDetails/core/CorePrStatus.hpp"

#define CREATE(X,Y) create<X>(Y)

namespace LIEF::ELF::py {

void init_notes(nb::module_& m) {
CREATE(Note, m);
CREATE(AndroidIdent, m);
CREATE(NoteAbi, m);
CREATE(CoreAuxv, m);
CREATE(CoreFile, m);
CREATE(CorePrPsInfo, m);
CREATE(CoreSigInfo, m);
CREATE(CorePrStatus, m);
}

void init_objects(nb::module_& m) {
CREATE(ParserConfig, m);
CREATE(Parser, m);
Expand All @@ -79,16 +90,8 @@ void init_objects(nb::module_& m) {
CREATE(GnuHash, m);
CREATE(SysvHash, m);
CREATE(Builder, m);
CREATE(Note, m);
CREATE(NoteDetails, m);
CREATE(AndroidNote, m);
CREATE(NoteAbi, m);
CREATE(CorePrPsInfo, m);
CREATE(CoreFile, m);
CREATE(CoreFileEntry, m);
CREATE(CorePrStatus, m);
CREATE(CoreAuxv, m);
CREATE(CoreSigInfo, m);

init_notes(m);
}

inline void init_utils(nb::module_&) {
Expand Down
54 changes: 25 additions & 29 deletions api/python/src/ELF/objects/CMakeLists.txt
View file
@@ -1,32 +1,28 @@
set(LIEF_PYTHON_ELF_OBJECT_SRC
"${CMAKE_CURRENT_SOURCE_DIR}/pyParser.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyBinary.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyBuilder.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyDynamicEntry.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyDynamicEntryArray.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyDynamicEntryFlags.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyDynamicEntryLibrary.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyDynamicEntryRpath.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyDynamicEntryRunPath.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyDynamicSharedObject.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyGnuHash.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyHeader.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyParserConfig.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyNote.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyNoteDetails.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyRelocation.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pySection.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pySegment.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pySymbol.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pySymbolVersion.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pySymbolVersionAux.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pySymbolVersionAuxRequirement.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pySymbolVersionRequirement.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pySymbolVersionDefinition.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pySysvHash.cpp"
target_sources(pyLIEF PRIVATE
pyParser.cpp
pyBinary.cpp
pyBuilder.cpp
pyDynamicEntry.cpp
pyDynamicEntryArray.cpp
pyDynamicEntryFlags.cpp
pyDynamicEntryLibrary.cpp
pyDynamicEntryRpath.cpp
pyDynamicEntryRunPath.cpp
pyDynamicSharedObject.cpp
pyGnuHash.cpp
pyHeader.cpp
pyParserConfig.cpp
pyNote.cpp
pyRelocation.cpp
pySection.cpp
pySegment.cpp
pySymbol.cpp
pySymbolVersion.cpp
pySymbolVersionAux.cpp
pySymbolVersionAuxRequirement.cpp
pySymbolVersionRequirement.cpp
pySymbolVersionDefinition.cpp
pySysvHash.cpp
)

target_sources(pyLIEF PRIVATE ${LIEF_PYTHON_ELF_OBJECT_SRC})

add_subdirectory(NoteDetails)

8 changes: 3 additions & 5 deletions api/python/src/ELF/objects/NoteDetails/CMakeLists.txt
View file
@@ -1,9 +1,7 @@
set(LIEF_PYTHON_ELF_NOTE_DETAILS_SRC
"${CMAKE_CURRENT_SOURCE_DIR}/pyAndroidNote.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyNoteAbi.cpp"
target_sources(pyLIEF PRIVATE
pyAndroidIdent.cpp
pyNoteAbi.cpp
)

target_sources(pyLIEF PRIVATE "${LIEF_PYTHON_ELF_NOTE_DETAILS_SRC}")

add_subdirectory(core)

17 changes: 6 additions & 11 deletions api/python/src/ELF/objects/NoteDetails/core/CMakeLists.txt
View file
@@ -1,12 +1,7 @@
set(LIEF_PYTHON_ELF_NOTE_DETAILS_CORE
"${CMAKE_CURRENT_SOURCE_DIR}/pyCorePrPsInfo.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyCoreFile.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyCoreFileEntry.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyCorePrStatus.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyCoreAuxv.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/pyCoreSigInfo.cpp"
target_sources(pyLIEF PRIVATE
pyCorePrPsInfo.cpp
pyCoreFile.cpp
pyCorePrStatus.cpp
pyCoreAuxv.cpp
pyCoreSigInfo.cpp
)
target_sources(pyLIEF PRIVATE "${LIEF_PYTHON_ELF_NOTE_DETAILS_CORE}")



116 changes: 49 additions & 67 deletions api/python/src/ELF/objects/NoteDetails/core/pyCoreAuxv.cpp
View file
Expand Up @@ -21,90 +21,72 @@
#include "ELF/pyELF.hpp"

#include "LIEF/ELF/NoteDetails/core/CoreAuxv.hpp"
#include "LIEF/ELF/EnumToString.hpp"

#include "pyErr.hpp"
#include "enums_wrapper.hpp"

#define PY_ENUM(x) LIEF::ELF::to_string(x), x

namespace LIEF::ELF::py {

template<>
void create<CoreAuxv>(nb::module_& m) {

nb::class_<CoreAuxv, NoteDetails> cls(m, "CoreAuxv");
LIEF::enum_<AUX_TYPE>(cls, "TYPES")
.value(PY_ENUM(AUX_TYPE::AT_NULL))
.value(PY_ENUM(AUX_TYPE::AT_IGNORE))
.value(PY_ENUM(AUX_TYPE::AT_EXECFD))
.value(PY_ENUM(AUX_TYPE::AT_PHDR))
.value(PY_ENUM(AUX_TYPE::AT_PHENT))
.value(PY_ENUM(AUX_TYPE::AT_PHNUM))
.value(PY_ENUM(AUX_TYPE::AT_PAGESZ))
.value(PY_ENUM(AUX_TYPE::AT_BASE))
.value(PY_ENUM(AUX_TYPE::AT_FLAGS))
.value(PY_ENUM(AUX_TYPE::AT_ENTRY))
.value(PY_ENUM(AUX_TYPE::AT_NOTELF))
.value(PY_ENUM(AUX_TYPE::AT_UID))
.value(PY_ENUM(AUX_TYPE::AT_EUID))
.value(PY_ENUM(AUX_TYPE::AT_GID))
.value(PY_ENUM(AUX_TYPE::AT_EGID))
.value(PY_ENUM(AUX_TYPE::AT_CLKTCK))
.value(PY_ENUM(AUX_TYPE::AT_PLATFORM))
.value(PY_ENUM(AUX_TYPE::AT_HWCAP))
.value(PY_ENUM(AUX_TYPE::AT_HWCAP2))
.value(PY_ENUM(AUX_TYPE::AT_FPUCW))
.value(PY_ENUM(AUX_TYPE::AT_DCACHEBSIZE))
.value(PY_ENUM(AUX_TYPE::AT_ICACHEBSIZE))
.value(PY_ENUM(AUX_TYPE::AT_UCACHEBSIZE))
.value(PY_ENUM(AUX_TYPE::AT_IGNOREPPC))
.value(PY_ENUM(AUX_TYPE::AT_SECURE))
.value(PY_ENUM(AUX_TYPE::AT_BASE_PLATFORM))
.value(PY_ENUM(AUX_TYPE::AT_RANDOM))
.value(PY_ENUM(AUX_TYPE::AT_EXECFN))
.value(PY_ENUM(AUX_TYPE::AT_SYSINFO))
.value(PY_ENUM(AUX_TYPE::AT_SYSINFO_EHDR))
.value(PY_ENUM(AUX_TYPE::AT_L1I_CACHESHAPE))
.value(PY_ENUM(AUX_TYPE::AT_L1D_CACHESHAPE));
nb::class_<CoreAuxv, Note> cls(m, "CoreAuxv");
#define PY_ENUM(X) .value(LIEF::ELF::to_string(CoreAuxv::TYPE::X), CoreAuxv::TYPE::X)
LIEF::enum_<CoreAuxv::TYPE>(cls, "TYPE")
PY_ENUM(END)
PY_ENUM(IGNORE)
PY_ENUM(EXECFD)
PY_ENUM(PHDR)
PY_ENUM(PHENT)
PY_ENUM(PHNUM)
PY_ENUM(PAGESZ)
PY_ENUM(BASE)
PY_ENUM(FLAGS)
PY_ENUM(ENTRY)
PY_ENUM(NOTELF)
PY_ENUM(UID)
PY_ENUM(EUID)
PY_ENUM(GID)
PY_ENUM(EGID)
PY_ENUM(TGT_PLATFORM)
PY_ENUM(HWCAP)
PY_ENUM(CLKTCK)
PY_ENUM(FPUCW)
PY_ENUM(DCACHEBSIZE)
PY_ENUM(ICACHEBSIZE)
PY_ENUM(UCACHEBSIZE)
PY_ENUM(IGNOREPPC)
PY_ENUM(SECURE)
PY_ENUM(BASE_PLATFORM)
PY_ENUM(RANDOM)
PY_ENUM(HWCAP2)
PY_ENUM(EXECFN)
PY_ENUM(SYSINFO)
PY_ENUM(SYSINFO_EHDR)
;
#undef PY_ENUM

cls
.def_prop_rw("values",
nb::overload_cast<>(&CoreAuxv::values, nb::const_),
nb::overload_cast<const CoreAuxv::val_context_t&>(&CoreAuxv::values),
"Current values as a dictionary for which keys are AUXV types"_doc)
.def_prop_ro("values", &CoreAuxv::values)

.def("get",
[] (const CoreAuxv& status, AUX_TYPE atype) -> nb::object {
bool error;
const uint64_t val = status.get(atype, &error);
if (error) {
return nb::none();
}
return nb::int_(val);
},
"Return the type value"_doc,
"type"_a)

.def("set",
&CoreAuxv::set,
"Set type value"_doc,
"type"_a, "value"_a)

.def("has",
&CoreAuxv::has,
"Check if a value is associated with the given type"_doc,
"type"_a)
[] (const CoreAuxv& self, CoreAuxv::TYPE type) {
return LIEF::py::value_or_none(&CoreAuxv::get, self, type);
}
)

.def("__getitem__",
&CoreAuxv::operator[],
nb::rv_policy::copy)
[] (const CoreAuxv& self, CoreAuxv::TYPE type) {
return LIEF::py::value_or_none(&CoreAuxv::get, self, type);
}
)

.def("__setitem__",
[] (CoreAuxv& status, AUX_TYPE atype, uint64_t val) {
status.set(atype, val);
})
.def("set", nb::overload_cast<CoreAuxv::TYPE, uint64_t>(&CoreAuxv::set))
.def("set", nb::overload_cast<std::map<CoreAuxv::TYPE, uint64_t>>(&CoreAuxv::set))

.def("__contains__", &CoreAuxv::has)
.def("__setitem__", nb::overload_cast<CoreAuxv::TYPE, uint64_t>(&CoreAuxv::set))
.def("__setitem__", nb::overload_cast<std::map<CoreAuxv::TYPE, uint64_t>>(&CoreAuxv::set))

LIEF_DEFAULT_STR(CoreAuxv);
}
Expand Down

0 comments on commit dbaba2f

Please sign in to comment.