github.com/captain-amygdala.pistorm
1
0
Fork 0
mirror of https://github.com/captain-amygdala/pistorm.git synced 2026-02-11 02:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix the Musashi write translation cache

Browse Source 
Many thanks to Sesse for noticing this hiccup. Probably requires a `make clean` and then `make`.
This commit is contained in:
beeanyew
2021-07-31 22:49:22 +02:00
parent 50f2b0a902
commit bfd906f216
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
m68kcpu.h
View File

@@ -1252,6 +1252,11 @@ static inline uint m68ki_read_imm_32(m68ki_cpu_core *state)
cache->upper = state->read_upper[i]; \
cache->offset = state->read_data[i];
#define SET_FC_WRITE_TRANSLATION_CACHE_VALUES \
cache->lower = state->write_addr[i]; \
cache->upper = state->write_upper[i]; \
cache->offset = state->write_data[i];
// M68KI_READ_8_FC
static inline uint m68ki_read_8_fc(m68ki_cpu_core *state, uint address, uint fc)
{
@@ -1358,12 +1363,12 @@ static inline void m68ki_write_8_fc(m68ki_cpu_core *state, uint address, uint fc
address_translation_cache *cache = &state->fc_write_translation_cache;
if(cache->offset && address >= cache->lower && address < cache->upper)
{
cache->offset[address - cache->lower] = value;
cache->offset[address - cache->lower] = (unsigned char)value;
}
for (int i = 0; i < state->write_ranges; i++) {
if(address >= state->write_addr[i] && address < state->write_upper[i]) {
SET_FC_TRANSLATION_CACHE_VALUES
SET_FC_WRITE_TRANSLATION_CACHE_VALUES
state->write_data[i][address - state->write_addr[i]] = (unsigned char)value;
return;
}
@@ -1389,12 +1394,12 @@ static inline void m68ki_write_16_fc(m68ki_cpu_core *state, uint address, uint f
address_translation_cache *cache = &state->fc_write_translation_cache;
if(cache->offset && address >= cache->lower && address < cache->upper)
{
((short *)(cache->offset + (address - cache->lower)))[0] = value;
((short *)(cache->offset + (address - cache->lower)))[0] = htobe16(value);
}
for (int i = 0; i < state->write_ranges; i++) {
if(address >= state->write_addr[i] && address < state->write_upper[i]) {
SET_FC_TRANSLATION_CACHE_VALUES
SET_FC_WRITE_TRANSLATION_CACHE_VALUES
((short *)(state->write_data[i] + (address - state->write_addr[i])))[0] = htobe16(value);
return;
}
@@ -1420,12 +1425,12 @@ static inline void m68ki_write_32_fc(m68ki_cpu_core *state, uint address, uint f
address_translation_cache *cache = &state->fc_write_translation_cache;
if(cache->offset && address >= cache->lower && address < cache->upper)
{
((int *)(cache->offset + (address - cache->lower)))[0] = value;
((int *)(cache->offset + (address - cache->lower)))[0] = htobe32(value);
}
for (int i = 0; i < state->write_ranges; i++) {
if(address >= state->write_addr[i] && address < state->write_upper[i]) {
SET_FC_TRANSLATION_CACHE_VALUES
SET_FC_WRITE_TRANSLATION_CACHE_VALUES
((int *)(state->write_data[i] + (address - state->write_addr[i])))[0] = htobe32(value);
return;
}