Stored instruction hooks in the data section rather than in the heap.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/arch/instruction.c b/src/arch/instruction.c
index 8264f5b..4c0fdb9 100644
--- a/src/arch/instruction.c
+++ b/src/arch/instruction.c
@@ -281,11 +281,9 @@ ArchInstrFlag g_arch_instruction_get_flags(const GArchInstruction *instr)
 *                                                                             *
 ******************************************************************************/
 
-void g_arch_instruction_set_hook(GArchInstruction *instr, InstrProcessHook type, instr_hook_fc hook)
+void g_arch_instruction_set_hooks(GArchInstruction *instr, const instr_hook_fc hooks[IPH_COUNT])
 {
-    assert(type < IPH_COUNT);
-
-    instr->hooks[type] = hook;
+    instr->hooks = hooks;
 
 }
 
@@ -310,7 +308,7 @@ void g_arch_instruction_call_hook(GArchInstruction *instr, InstrProcessHook type
 {
     assert(type < IPH_COUNT);
 
-    if (instr->hooks[type] != NULL)
+    if (instr->hooks != NULL && instr->hooks[type] != NULL)
         instr->hooks[type](instr, proc, context, format);
 
 }