From 1b00d3f89ae5fec59e9b4e61be2d893b08c7db2b Mon Sep 17 00:00:00 2001 From: Ryan Hileman Date: Mon, 1 May 2017 23:56:39 -0700 Subject: [PATCH] remove slow cpu QOM casts (#815) --- qemu/target-arm/cpu-qom.h | 3 +-- qemu/target-i386/cpu-qom.h | 3 +-- qemu/target-m68k/cpu-qom.h | 3 +-- qemu/target-mips/cpu-qom.h | 3 +-- qemu/target-sparc/cpu-qom.h | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/qemu/target-arm/cpu-qom.h b/qemu/target-arm/cpu-qom.h index 96b7427b..fad08eb3 100644 --- a/qemu/target-arm/cpu-qom.h +++ b/qemu/target-arm/cpu-qom.h @@ -26,8 +26,7 @@ #define ARM_CPU_CLASS(uc, klass) \ OBJECT_CLASS_CHECK(uc, ARMCPUClass, (klass), TYPE_ARM_CPU) -#define ARM_CPU(uc, obj) \ - OBJECT_CHECK(uc, ARMCPU, (obj), TYPE_ARM_CPU) +#define ARM_CPU(uc, obj) ((ARMCPU *)obj) #define ARM_CPU_GET_CLASS(uc, obj) \ OBJECT_GET_CLASS(uc, ARMCPUClass, (obj), TYPE_ARM_CPU) diff --git a/qemu/target-i386/cpu-qom.h b/qemu/target-i386/cpu-qom.h index 1da46746..5d19fc44 100644 --- a/qemu/target-i386/cpu-qom.h +++ b/qemu/target-i386/cpu-qom.h @@ -32,8 +32,7 @@ #define X86_CPU_CLASS(uc, klass) \ OBJECT_CLASS_CHECK(uc, X86CPUClass, (klass), TYPE_X86_CPU) -#define X86_CPU(uc, obj) \ - OBJECT_CHECK(uc, X86CPU, (obj), TYPE_X86_CPU) +#define X86_CPU(uc, obj) ((X86CPU *)obj) #define X86_CPU_GET_CLASS(uc, obj) \ OBJECT_GET_CLASS(uc, X86CPUClass, (obj), TYPE_X86_CPU) diff --git a/qemu/target-m68k/cpu-qom.h b/qemu/target-m68k/cpu-qom.h index f6277855..d8a49179 100644 --- a/qemu/target-m68k/cpu-qom.h +++ b/qemu/target-m68k/cpu-qom.h @@ -26,8 +26,7 @@ #define M68K_CPU_CLASS(uc, klass) \ OBJECT_CLASS_CHECK(uc, M68kCPUClass, (klass), TYPE_M68K_CPU) -#define M68K_CPU(uc, obj) \ - OBJECT_CHECK(uc, M68kCPU, (obj), TYPE_M68K_CPU) +#define M68K_CPU(uc, obj) ((M68kCPU *)obj) #define M68K_CPU_GET_CLASS(uc, obj) \ OBJECT_GET_CLASS(uc, M68kCPUClass, (obj), TYPE_M68K_CPU) diff --git a/qemu/target-mips/cpu-qom.h b/qemu/target-mips/cpu-qom.h index cbf25627..89581d45 100644 --- a/qemu/target-mips/cpu-qom.h +++ b/qemu/target-mips/cpu-qom.h @@ -30,8 +30,7 @@ #define MIPS_CPU_CLASS(uc, klass) \ OBJECT_CLASS_CHECK(uc, MIPSCPUClass, (klass), TYPE_MIPS_CPU) -#define MIPS_CPU(uc, obj) \ - OBJECT_CHECK(uc, MIPSCPU, (obj), TYPE_MIPS_CPU) +#define MIPS_CPU(uc, obj) ((MIPSCPU *)obj) #define MIPS_CPU_GET_CLASS(uc, obj) \ OBJECT_GET_CLASS(uc, MIPSCPUClass, (obj), TYPE_MIPS_CPU) diff --git a/qemu/target-sparc/cpu-qom.h b/qemu/target-sparc/cpu-qom.h index 5f478f30..6374fe85 100644 --- a/qemu/target-sparc/cpu-qom.h +++ b/qemu/target-sparc/cpu-qom.h @@ -31,8 +31,7 @@ #define SPARC_CPU_CLASS(uc, klass) \ OBJECT_CLASS_CHECK(uc, SPARCCPUClass, (klass), TYPE_SPARC_CPU) -#define SPARC_CPU(uc, obj) \ - OBJECT_CHECK(uc, SPARCCPU, (obj), TYPE_SPARC_CPU) +#define SPARC_CPU(uc, obj) ((SPARCCPU *)obj) #define SPARC_CPU_GET_CLASS(uc, obj) \ OBJECT_GET_CLASS(uc, SPARCCPUClass, (obj), TYPE_SPARC_CPU)