Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-13 09:28:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

igs036 seems to be derived from a 946 type core based on using MPU not MMU, change it to be such.

Browse Source
This commit is contained in:
David Haywood 2017-12-11 15:57:21 +00:00
parent 92291b516d
commit 151db37cda
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/devices/cpu/arm7/arm7.cpp
View File

@ -148,8 +148,10 @@ arm920t_cpu_device::arm920t_cpu_device(const machine_config &mconfig, const char
} }
arm946es_cpu_device::arm946es_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: arm9_cpu_device(mconfig, ARM946ES, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E, ENDIANNESS_LITTLE),
arm946es_cpu_device::arm946es_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
: arm9_cpu_device(mconfig, type, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E, ENDIANNESS_LITTLE),
cp15_control(0x78) cp15_control(0x78)
{ {
m_copro_id = ARM9_COPRO_ID_MFR_ARM m_copro_id = ARM9_COPRO_ID_MFR_ARM
@ -169,6 +171,17 @@ arm946es_cpu_device::arm946es_cpu_device(const machine_config &mconfig, const ch
cp15_itcm_reg = cp15_dtcm_reg = 0; cp15_itcm_reg = cp15_dtcm_reg = 0;
} }
arm946es_cpu_device::arm946es_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: arm946es_cpu_device(mconfig, ARM946ES, tag, owner, clock)
{
}
// unknown configuration, but uses MPU not MMU, so closer to ARM946ES
igs036_cpu_device::igs036_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: arm946es_cpu_device(mconfig, IGS036, tag, owner, clock)
{
}
pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: arm7_cpu_device(mconfig, PXA255, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E | ARCHFLAG_XSCALE, ENDIANNESS_LITTLE) : arm7_cpu_device(mconfig, PXA255, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E | ARCHFLAG_XSCALE, ENDIANNESS_LITTLE)
{ {
@ -189,13 +202,6 @@ sa1110_cpu_device::sa1110_cpu_device(const machine_config &mconfig, const char *
| ARM9_COPRO_ID_STEP_SA1110_A0; | ARM9_COPRO_ID_STEP_SA1110_A0;
} }
// unknown configuration
igs036_cpu_device::igs036_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: arm9_cpu_device(mconfig, IGS036, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E, ENDIANNESS_LITTLE)
{
}
device_memory_interface::space_config_vector arm7_cpu_device::memory_space_config() const device_memory_interface::space_config_vector arm7_cpu_device::memory_space_config() const
{ {
return space_config_vector { return space_config_vector {
@ -1459,14 +1465,6 @@ uint8_t arm946es_cpu_device::arm7_cpu_read8(uint32_t addr)
return m_program->read_byte(addr); return m_program->read_byte(addr);
} }
WRITE32_MEMBER(igs036_cpu_device::arm7_rt_w_callback)
{
arm7_cpu_device::arm7_rt_w_callback(space, offset, data, mem_mask);
/* disable the MMU for now, it doesn't seem to set up valid mappings
so could be entirely different here */
COPRO_CTRL &= ~COPRO_CTRL_MMU_EN;
}
void arm7_cpu_device::arm7_dt_r_callback(uint32_t insn, uint32_t *prn) void arm7_cpu_device::arm7_dt_r_callback(uint32_t insn, uint32_t *prn)
{ {
uint8_t cpn = (insn >> 8) & 0xF; uint8_t cpn = (insn >> 8) & 0xF;

16
src/devices/cpu/arm7/arm7.h
View File

@ -614,6 +614,7 @@ class arm946es_cpu_device : public arm9_cpu_device
public: public:
// construction/destruction // construction/destruction
arm946es_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); arm946es_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
arm946es_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
// 946E-S has Protection Unit instead of ARM MMU so CP15 is quite different // 946E-S has Protection Unit instead of ARM MMU so CP15 is quite different
virtual DECLARE_READ32_MEMBER( arm7_rt_r_callback ) override; virtual DECLARE_READ32_MEMBER( arm7_rt_r_callback ) override;
@ -635,6 +636,12 @@ private:
void RefreshDTCM(); void RefreshDTCM();
}; };
class igs036_cpu_device : public arm946es_cpu_device
{
public:
// construction/destruction
igs036_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class pxa255_cpu_device : public arm7_cpu_device class pxa255_cpu_device : public arm7_cpu_device
{ {
@ -651,15 +658,6 @@ public:
sa1110_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); sa1110_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
}; };
class igs036_cpu_device : public arm9_cpu_device
{
public:
// construction/destruction
igs036_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_WRITE32_MEMBER( arm7_rt_w_callback ) override;
};
DECLARE_DEVICE_TYPE(ARM7, arm7_cpu_device) DECLARE_DEVICE_TYPE(ARM7, arm7_cpu_device)
DECLARE_DEVICE_TYPE(ARM7_BE, arm7_be_cpu_device) DECLARE_DEVICE_TYPE(ARM7_BE, arm7_be_cpu_device)
DECLARE_DEVICE_TYPE(ARM7500, arm7500_cpu_device) DECLARE_DEVICE_TYPE(ARM7500, arm7500_cpu_device)