From: Andreas Färber <afaerber@suse.de>
Date: Fri, 10 Aug 2012 06:42:24 +0000 (+0800)
Subject: target-unicore32: Drop UC32_CPUID macros
X-Git-Tag: v1.2.0-rc0~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=889c134a82ac30f9beafa214b3920b2b39687832;p=thirdparty%2Fqemu.git

target-unicore32: Drop UC32_CPUID macros

Any code that depends on a particular CPU type can now go through
callbacks on the QOM UniCore32CPUClass.

Signed-off-by: Andreas Färber <afaerber@suse.de
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h
index d14fde51613..06508a12782 100644
--- a/target-unicore32/cpu.h
+++ b/target-unicore32/cpu.h
@@ -122,10 +122,6 @@ void cpu_asr_write(CPUUniCore32State *env1, target_ulong val, target_ulong mask)
 #define UC32_HWCAP_CMOV                 4 /* 1 << 2 */
 #define UC32_HWCAP_UCF64                8 /* 1 << 3 */
 
-#define UC32_CPUID(env)                 (env->cp0.c0_cpuid)
-#define UC32_CPUID_UCV2                 0x40010863
-#define UC32_CPUID_ANY                  0xffffffff
-
 #define cpu_init                        uc32_cpu_init
 #define cpu_exec                        uc32_cpu_exec
 #define cpu_signal_handler              uc32_cpu_signal_handler