github.com/captain-amygdala.pistorm
1
0
Fork 0
mirror of https://github.com/captain-amygdala/pistorm.git synced 2026-04-15 07:59:59 +00:00
Code Issues Projects Releases Wiki Activity

introducing CPU state parameter 3

Browse Source
This commit is contained in:
Rune Holm
2021-06-20 20:55:25 +02:00
parent 6d74804193
commit d06400230f
6 changed files with 1093 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
m68k.h
View File

@@ -191,13 +191,13 @@ unsigned int m68k_read_memory_16(unsigned int address);
unsigned int m68k_read_memory_32(unsigned int address);
/* Read data immediately following the PC */
unsigned int m68k_read_immediate_16(unsigned int address);
unsigned int m68k_read_immediate_32(unsigned int address);
unsigned int m68k_read_immediate_16(struct m68ki_cpu_core *state, unsigned int address);
unsigned int m68k_read_immediate_32(struct m68ki_cpu_core *state, unsigned int address);
/* Read data relative to the PC */
unsigned int m68k_read_pcrelative_8(unsigned int address);
unsigned int m68k_read_pcrelative_16(unsigned int address);
unsigned int m68k_read_pcrelative_32(unsigned int address);
unsigned int m68k_read_pcrelative_8(struct m68ki_cpu_core *state, unsigned int address);
unsigned int m68k_read_pcrelative_16(struct m68ki_cpu_core *state, unsigned int address);
unsigned int m68k_read_pcrelative_32(struct m68ki_cpu_core *state, unsigned int address);
/* Memory access for the disassembler */
unsigned int m68k_read_disassembler_8 (unsigned int address);
@@ -362,7 +362,7 @@ void m68k_pulse_halt(void);
/* Trigger a bus error exception */
void m68k_pulse_bus_error(void);
void m68k_pulse_bus_error(struct m68ki_cpu_core *state);
/* Context switching to allow multiple CPUs */

1276
m68k_in.c
View File

File diff suppressed because it is too large Load Diff

20
m68kcpu.c
View File

@@ -1115,9 +1115,9 @@ void m68k_init(void)
}
/* Trigger a Bus Error exception */
void m68k_pulse_bus_error(void)
void m68k_pulse_bus_error(m68ki_cpu_core *state)
{
m68ki_exception_bus_error();
m68ki_exception_bus_error(state);
}
/* Pulse the RESET line on the CPU */
@@ -1202,7 +1202,7 @@ void m68k_set_context(void* src)
#if M68K_SEPARATE_READS
/* Read data immediately following the PC */
inline unsigned int m68k_read_immediate_16(unsigned int address) {
inline unsigned int m68k_read_immediate_16(m68ki_cpu_core *state, unsigned int address) {
#if M68K_EMULATE_PREFETCH == OPT_ON
for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
@@ -1213,7 +1213,7 @@ inline unsigned int m68k_read_immediate_16(unsigned int address) {
return m68k_read_memory_16(address);
}
inline unsigned int m68k_read_immediate_32(unsigned int address) {
inline unsigned int m68k_read_immediate_32(m68ki_cpu_core *state, unsigned int address) {
#if M68K_EMULATE_PREFETCH == OPT_ON
for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
@@ -1226,7 +1226,7 @@ inline unsigned int m68k_read_immediate_32(unsigned int address) {
}
/* Read data relative to the PC */
inline unsigned int m68k_read_pcrelative_8(unsigned int address) {
inline unsigned int m68k_read_pcrelative_8(m68ki_cpu_core *state, unsigned int address) {
for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
return m68ki_cpu.read_data[i][address - m68ki_cpu.read_addr[i]];
@@ -1235,7 +1235,7 @@ inline unsigned int m68k_read_pcrelative_8(unsigned int address) {
return m68k_read_memory_8(address);
}
inline unsigned int m68k_read_pcrelative_16(unsigned int address) {
inline unsigned int m68k_read_pcrelative_16(m68ki_cpu_core *state, unsigned int address) {
for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
return be16toh(((unsigned short *)(m68ki_cpu.read_data[i] + (address - m68ki_cpu.read_addr[i])))[0]);
@@ -1244,7 +1244,7 @@ inline unsigned int m68k_read_pcrelative_16(unsigned int address) {
return m68k_read_memory_16(address);
}
inline unsigned int m68k_read_pcrelative_32(unsigned int address) {
inline unsigned int m68k_read_pcrelative_32(m68ki_cpu_core *state, unsigned int address) {
for (int i = 0; i < m68ki_cpu.read_ranges; i++) {
if(address >= m68ki_cpu.read_addr[i] && address < m68ki_cpu.read_upper[i]) {
return be32toh(((unsigned int *)(m68ki_cpu.read_data[i] + (address - m68ki_cpu.read_addr[i])))[0]);
@@ -1256,7 +1256,7 @@ inline unsigned int m68k_read_pcrelative_32(unsigned int address) {
#endif
uint m68ki_read_imm6_addr_slowpath(uint32_t pc, address_translation_cache *cache)
uint m68ki_read_imm16_addr_slowpath(m68ki_cpu_core *state, uint32_t pc, address_translation_cache *cache)
{
uint32_t address = ADDRESS_68K(pc);
uint32_t pc_address_diff = pc - address;
@@ -1281,14 +1281,14 @@ uint m68ki_read_imm6_addr_slowpath(uint32_t pc, address_translation_cache *cache
uint result;
if(REG_PC != CPU_PREF_ADDR)
{
CPU_PREF_DATA = m68ki_ic_readimm16(REG_PC);
CPU_PREF_DATA = m68ki_ic_readimm16(state, REG_PC);
CPU_PREF_ADDR = m68ki_cpu.mmu_tmp_buserror_occurred ? ((uint32)~0) : REG_PC;
}
result = MASK_OUT_ABOVE_16(CPU_PREF_DATA);
REG_PC += 2;
if (!m68ki_cpu.mmu_tmp_buserror_occurred) {
// prefetch only if no bus error occurred in opcode fetch
CPU_PREF_DATA = m68ki_ic_readimm16(REG_PC);
CPU_PREF_DATA = m68ki_ic_readimm16(state, REG_PC);
CPU_PREF_ADDR = m68ki_cpu.mmu_tmp_buserror_occurred ? ((uint32)~0) : REG_PC;
// ignore bus error on prefetch
m68ki_cpu.mmu_tmp_buserror_occurred = 0;

495
m68kcpu.h
View File

File diff suppressed because it is too large Load Diff

373
m68kfpu.c
View File

File diff suppressed because it is too large Load Diff

8
m68kmmu.h
View File

@@ -966,7 +966,7 @@ void m68851_pload(m68ki_cpu_core *state, uint32 ea, uint16 modes)
else
{
MMULOG(("PLOAD with MMU disabled on MC68851\n"));
m68ki_exception_trap(57);
m68ki_exception_trap(state, 57);
return;
}
}
@@ -1095,7 +1095,7 @@ void m68851_pmove_put(m68ki_cpu_core *state, uint32 ea, uint16 modes)
{
logerror("MMU: TC invalid!\n");
m68ki_cpu.mmu_tc &= ~0x80000000;
m68ki_exception_trap(EXCEPTION_MMU_CONFIGURATION);
m68ki_exception_trap(state, EXCEPTION_MMU_CONFIGURATION);
} else {
m68ki_cpu.pmmu_enabled = 1;
}
@@ -1121,7 +1121,7 @@ void m68851_pmove_put(m68ki_cpu_core *state, uint32 ea, uint16 modes)
// SRP type 0 is not allowed
if ((m68ki_cpu.mmu_srp_limit & 3) == 0)
{
m68ki_exception_trap(EXCEPTION_MMU_CONFIGURATION);
m68ki_exception_trap(state, EXCEPTION_MMU_CONFIGURATION);
return;
}
@@ -1139,7 +1139,7 @@ void m68851_pmove_put(m68ki_cpu_core *state, uint32 ea, uint16 modes)
// CRP type 0 is not allowed
if ((m68ki_cpu.mmu_crp_limit & 3) == 0)
{
m68ki_exception_trap(EXCEPTION_MMU_CONFIGURATION);
m68ki_exception_trap(state, EXCEPTION_MMU_CONFIGURATION);
return;
}