diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2018-05-11 13:44:46 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2018-05-11 13:44:46 (GMT) |
| commit | b24aca86f0a096730fa8df440f7493556b39ae46 (patch) | |
| tree | 9489087f296eab281ac2d621f345866efb1e57f1 /plugins | |
| parent | f208df5b7b960f1ec89247dda2b34b5d99959201 (diff) | |
Reorganized processor registrations.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/arm/core.c | 6 | ||||
| -rw-r--r-- | plugins/arm/v7/core.c | 6 | ||||
| -rw-r--r-- | plugins/dalvik/core.c | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/plugins/arm/core.c b/plugins/arm/core.c index a23a96e..43e82e4 100644 --- a/plugins/arm/core.c +++ b/plugins/arm/core.c @@ -24,13 +24,11 @@ #include "core.h" -#include <core/processors.h> #include <plugins/plugin-def.h> #include "python/module.h" #include "v7/core.h" -#include "v7/processor.h" @@ -55,8 +53,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) { bool result; /* Bilan à retourner */ - result = register_processor_type("armv7", "ARM v7", G_TYPE_ARMV7_PROCESSOR, - init_armv7_core, exit_armv7_core); + result = init_armv7_core(); if (result) result = add_arch_arm_module_to_python_module(); @@ -79,5 +76,6 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) G_MODULE_EXPORT void chrysalide_plugin_exit(GPluginModule *plugin) { + exit_armv7_core(); } diff --git a/plugins/arm/v7/core.c b/plugins/arm/v7/core.c index 06b8d23..a2ed090 100644 --- a/plugins/arm/v7/core.c +++ b/plugins/arm/v7/core.c @@ -24,6 +24,10 @@ #include "core.h" +#include <core/processors.h> +#include "processor.h" + + /****************************************************************************** * * @@ -41,7 +45,7 @@ bool init_armv7_core(void) { bool result; /* Bilan à renvoyer */ - result = true; + result = register_processor_type("armv7", "ARM v7", G_TYPE_ARMV7_PROCESSOR); return result; diff --git a/plugins/dalvik/core.c b/plugins/dalvik/core.c index 7a32112..f945c18 100644 --- a/plugins/dalvik/core.c +++ b/plugins/dalvik/core.c @@ -54,8 +54,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) { bool result; /* Bilan à retourner */ - result = register_processor_type("dalvik35", "Dalvik Virtual Machine v35", G_TYPE_DALVIK35_PROCESSOR, - NULL, NULL); + result = register_processor_type("dalvik35", "Dalvik Virtual Machine v35", G_TYPE_DALVIK35_PROCESSOR); return result; |