summaryrefslogtreecommitdiff
path: root/plugins/arm
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/arm')
-rw-r--r--plugins/arm/core.c6
-rw-r--r--plugins/arm/v7/core.c6
2 files changed, 7 insertions, 5 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;