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

Make Chip RAM fastpath optional

Browse Source 
Use `make ACFLAGS=-DCHIP_FASTPATH` to compile it into your build.
This commit is contained in:
beeanyew
2021-08-01 19:02:55 +02:00
parent f8ed521b88
commit f12b0f0488
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -44,9 +44,9 @@ CXX = g++
WARNINGS = -Wall -Wextra -pedantic
# Pi3 CFLAGS
CFLAGS = $(WARNINGS) -I. -I./raylib -I./raylib/external -I/opt/vc/include/ -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -lstdc++
CFLAGS = $(WARNINGS) -I. -I./raylib -I./raylib/external -I/opt/vc/include/ -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -lstdc++ $(ACFLAGS)
# Pi4 CFLAGS
#CFLAGS = $(WARNINGS) -I. -I./raylib_pi4_test -I./raylib_pi4_test/external -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
#CFLAGS = $(WARNINGS) -I. -I./raylib_pi4_test -I./raylib_pi4_test/external -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -lstdc++ $(ACFLAGS)
# Old SDL2 stuff
#LFLAGS = $(WARNINGS) `sdl2-config --libs`

14
m68kcpu.h
View File

@@ -1185,10 +1185,12 @@ static inline uint m68ki_read_imm_16(m68ki_cpu_core *state)
return be16toh(((unsigned short *)(cache->offset + pc))[0]);
}
#ifdef CHIP_FASTPATH
if (!state->ovl && pc < 0x200000) {
REG_PC += 2;
return ps_read_16(pc);
}
#endif
return m68ki_read_imm16_addr_slowpath(state, pc, cache);
}
@@ -1293,9 +1295,11 @@ static inline uint m68ki_read_8_fc(m68ki_cpu_core *state, uint address, uint fc)
}
}
#ifdef CHIP_FASTPATH
if (!state->ovl && address < 0x200000) {
return ps_read_8(address);
}
#endif
return m68k_read_memory_8(ADDRESS_68K(address));
}
@@ -1327,9 +1331,11 @@ static inline uint m68ki_read_16_fc(m68ki_cpu_core *state, uint address, uint fc
}
}
#ifdef CHIP_FASTPATH
if (!state->ovl && address < 0x200000) {
return ps_read_16(address);
}
#endif
return m68k_read_memory_16(ADDRESS_68K(address));
}
@@ -1361,9 +1367,11 @@ static inline uint m68ki_read_32_fc(m68ki_cpu_core *state, uint address, uint fc
}
}
#ifdef CHIP_FASTPATH
if (!state->ovl && address < 0x200000) {
return ps_read_32(address);
}
#endif
return m68k_read_memory_32(ADDRESS_68K(address));
}
@@ -1396,10 +1404,12 @@ static inline void m68ki_write_8_fc(m68ki_cpu_core *state, uint address, uint fc
}
}
#ifdef CHIP_FASTPATH
if (!state->ovl && address < 0x200000) {
ps_write_8(address, value);
return;
}
#endif
m68k_write_memory_8(ADDRESS_68K(address), value);
}
@@ -1433,10 +1443,12 @@ static inline void m68ki_write_16_fc(m68ki_cpu_core *state, uint address, uint f
}
}
#ifdef CHIP_FASTPATH
if (!state->ovl && address < 0x200000) {
ps_write_16(address, value);
return;
}
#endif
m68k_write_memory_16(ADDRESS_68K(address), value);
}
@@ -1470,10 +1482,12 @@ static inline void m68ki_write_32_fc(m68ki_cpu_core *state, uint address, uint f
}
}
#ifdef CHIP_FASTPATH
if (!state->ovl && address < 0x200000) {
ps_write_32(address, value);
return;
}
#endif
m68k_write_memory_32(ADDRESS_68K(address), value);
}