ppc: Changed cap flags to UINT32 for future additions. (nw)

This commit is contained in:
Ville Linde 2012-07-25 19:39:33 +00:00
parent 031ca39e0d
commit 43cab64548
3 changed files with 6 additions and 5 deletions

View File

@ -302,7 +302,7 @@ INLINE int sign_double(double x)
structure based on the configured type structure based on the configured type
-------------------------------------------------*/ -------------------------------------------------*/
void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT8 cap, int tb_divisor, legacy_cpu_device *device, device_irq_acknowledge_callback irqcallback) void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT32 cap, int tb_divisor, legacy_cpu_device *device, device_irq_acknowledge_callback irqcallback)
{ {
const powerpc_config *config = (const powerpc_config *)device->static_config(); const powerpc_config *config = (const powerpc_config *)device->static_config();

View File

@ -41,6 +41,7 @@
#define PPCCAP_603_MMU 0x20 /* TRUE if we have 603-class MMU features */ #define PPCCAP_603_MMU 0x20 /* TRUE if we have 603-class MMU features */
#define PPCCAP_MFIOC 0x40 /* TRUE if we have memory-forced I/O controller interface accesses */ #define PPCCAP_MFIOC 0x40 /* TRUE if we have memory-forced I/O controller interface accesses */
#define PPCCAP_601BAT 0x80 /* TRUE if we're doing 601-style BATs (unified I/D, different bit layout) */ #define PPCCAP_601BAT 0x80 /* TRUE if we're doing 601-style BATs (unified I/D, different bit layout) */
#define PPCCAP_604_MMU 0x100 /* TRUE if we have 604-class MMU features */
/* PowerPC flavors */ /* PowerPC flavors */
enum _powerpc_flavor enum _powerpc_flavor
@ -533,7 +534,7 @@ struct _powerpc_state
/* architectural distinctions */ /* architectural distinctions */
powerpc_flavor flavor; powerpc_flavor flavor;
UINT8 cap; UINT32 cap;
UINT8 cache_line_size; UINT8 cache_line_size;
UINT32 tb_divisor; UINT32 tb_divisor;
@ -578,7 +579,7 @@ struct _powerpc_state
FUNCTION PROTOTYPES FUNCTION PROTOTYPES
***************************************************************************/ ***************************************************************************/
void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT8 cap, int tb_divisor, legacy_cpu_device *device, device_irq_acknowledge_callback irqcallback); void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT32 cap, int tb_divisor, legacy_cpu_device *device, device_irq_acknowledge_callback irqcallback);
void ppccom_exit(powerpc_state *ppc); void ppccom_exit(powerpc_state *ppc);
void ppccom_reset(powerpc_state *ppc); void ppccom_reset(powerpc_state *ppc);

View File

@ -548,7 +548,7 @@ INLINE UINT32 compute_spr(UINT32 spr)
ppcdrc_init - initialize the processor ppcdrc_init - initialize the processor
-------------------------------------------------*/ -------------------------------------------------*/
static void ppcdrc_init(powerpc_flavor flavor, UINT8 cap, int tb_divisor, legacy_cpu_device *device, device_irq_acknowledge_callback irqcallback) static void ppcdrc_init(powerpc_flavor flavor, UINT32 cap, int tb_divisor, legacy_cpu_device *device, device_irq_acknowledge_callback irqcallback)
{ {
powerpc_state *ppc; powerpc_state *ppc;
drcbe_info beinfo; drcbe_info beinfo;
@ -4674,7 +4674,7 @@ CPU_GET_INFO( ppc603r )
static CPU_INIT( ppc604 ) static CPU_INIT( ppc604 )
{ {
ppcdrc_init(PPC_MODEL_604, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED, 4, device, irqcallback); ppcdrc_init(PPC_MODEL_604, PPCCAP_OEA | PPCCAP_VEA | PPCCAP_FPU | PPCCAP_MISALIGNED | PPCCAP_604_MMU, 4, device, irqcallback);
} }