Fixed and updated GType macros dealing with non-existent interfaces.

4 files changed, 24 insertions, 16 deletions

diff --git a/src/arch/jvm/instruction.h b/src/arch/jvm/instruction.h
index bac55be..8ec9c48 100644
--- a/src/arch/jvm/instruction.h
+++ b/src/arch/jvm/instruction.h
@@ -117,10 +117,12 @@ typedef enum _JvmOpcodes
 } JvmOpcodes;
 
 
-#define G_TYPE_JVM_INSTRUCTION                 g_jvm_instruction_get_type()
-#define G_JVM_INSTRUCTION(obj)                 (G_TYPE_CHECK_INSTANCE_CAST((obj), g_jvm_instruction_get_type(), GJvmInstruction))
-#define G_IS_JVM_INSTRUCTION(obj)              (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_jvm_instruction_get_type()))
-#define G_JVM_INSTRUCTION_GET_IFACE(inst)      (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_jvm_instruction_get_type(), GJvmInstructionIface))
+#define G_TYPE_JVM_INSTRUCTION            g_jvm_instruction_get_type()
+#define G_JVM_INSTRUCTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_JVM_INSTRUCTION, GJvmInstruction))
+#define G_IS_JVM_INSTRUCTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_JVM_INSTRUCTION))
+#define G_JVM_INSTRUCTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_JVM_INSTRUCTION, GJvmInstructionClass))
+#define G_IS_JVM_INSTRUCTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_JVM_INSTRUCTION))
+#define G_JVM_INSTRUCTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_JVM_INSTRUCTION, GJvmInstructionClass))
 
 
 /* Définition générique d'une instruction d'architecture JVM (instance) */
diff --git a/src/arch/jvm/operand.h b/src/arch/jvm/operand.h
index 2845b7a..8f4288d 100644
--- a/src/arch/jvm/operand.h
+++ b/src/arch/jvm/operand.h
@@ -37,10 +37,12 @@ typedef enum _JvmOperandType JvmOperandType;
 /* ---------------------- COQUILLE VIDE POUR LES OPERANDES JVM ---------------------- */
 
 
-#define G_TYPE_JVM_OPERAND                  g_jvm_operand_get_type()
-#define G_JVM_OPERAND(obj)                  (G_TYPE_CHECK_INSTANCE_CAST((obj), g_jvm_operand_get_type(), GJvmOperand))
-#define G_IS_JVM_OPERAND(obj)               (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_jvm_operand_get_type()))
-#define G_JVM_OPERAND_GET_IFACE(inst)       (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_jvm_operand_get_type(), GJvmOperandIface))
+#define G_TYPE_JVM_OPERAND            g_jvm_operand_get_type()
+#define G_JVM_OPERAND(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_JVM_OPERAND, GJvmOperand))
+#define G_IS_JVM_OPERAND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_JVM_OPERAND))
+#define G_JVM_OPERAND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_JVM_OPERAND, GJvmOperandClass))
+#define G_IS_JVM_OPERAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_JVM_OPERAND))
+#define G_JVM_OPERAND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_JVM_OPERAND, GJvmOperandClass))
 
 
 /* Définition d'un opérande de la JVM (instance) */
diff --git a/src/arch/jvm/processor.h b/src/arch/jvm/processor.h
index 05f7cd8..7123d0c 100644
--- a/src/arch/jvm/processor.h
+++ b/src/arch/jvm/processor.h
@@ -29,10 +29,12 @@
 
 
 
-#define G_TYPE_JVM_PROCESSOR                g_jvm_processor_get_type()
-#define G_JVM_PROCESSOR(obj)                (G_TYPE_CHECK_INSTANCE_CAST((obj), g_jvm_processor_get_type(), GJvmProcessor))
-#define G_IS_JVM_PROCESSOR(obj)             (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_jvm_processor_get_type()))
-#define G_JVM_PROCESSOR_GET_IFACE(inst)     (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_jvm_processor_get_type(), GJvmProcessorIface))
+#define G_TYPE_JVM_PROCESSOR            g_jvm_processor_get_type()
+#define G_JVM_PROCESSOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_JVM_PROCESSOR, GJvmProcessor))
+#define G_IS_JVM_PROCESSOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_JVM_PROCESSOR))
+#define G_JVM_PROCESSOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_JVM_PROCESSOR, GJvmProcessorClass))
+#define G_IS_JVM_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_JVM_PROCESSOR))
+#define G_JVM_PROCESSOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_JVM_PROCESSOR, GJvmProcessorClass))
 
 
 /* Définition du processeur de la JVM (instance) */
diff --git a/src/arch/raw.h b/src/arch/raw.h
index 1246d10..aac48ea 100644
--- a/src/arch/raw.h
+++ b/src/arch/raw.h
@@ -36,10 +36,12 @@
 /* ------------------------- INSTRUCTION INCONNUE / DONNEES ------------------------- */
 
 
-#define G_TYPE_RAW_INSTRUCTION                   g_raw_instruction_get_type()
-#define G_RAW_INSTRUCTION(obj)                   (G_TYPE_CHECK_INSTANCE_CAST((obj), g_raw_instruction_get_type(), GRawInstruction))
-#define G_IS_RAW_INSTRUCTION(obj)                (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_raw_instruction_get_type()))
-#define G_RAW_INSTRUCTION_GET_IFACE(inst)        (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_raw_instruction_get_type(), GRawInstructionIface))
+#define G_TYPE_RAW_INSTRUCTION            g_raw_instruction_get_type()
+#define G_RAW_INSTRUCTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_RAW_INSTRUCTION, GRawInstruction))
+#define G_IS_RAW_INSTRUCTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_RAW_INSTRUCTION))
+#define G_RAW_INSTRUCTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_RAW_INSTRUCTION, GRawInstructionClass))
+#define G_IS_RAW_INSTRUCTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_RAW_INSTRUCTION))
+#define G_RAW_INSTRUCTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_RAW_INSTRUCTION, GRawInstructionClass))
 
 
 /* Définition générique d'une instruction brute d'architecture (instance) */