funkey/picodrive-irixxxx
1
0
Fork 0
mirror of https://github.com/FunKey-Project/picodrive-irixxxx.git synced 2026-05-01 18:39:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

core, some type issues

Browse Source 
sh2 drc, fix arm32 ld/st offset for -256
This commit is contained in:
root
2021-11-14 21:28:01 +01:00
parent e5c01e9433
commit 89a7f27bba
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/sh2/compiler.c
View File

@@ -2615,7 +2615,7 @@ static uptr split_address(uptr la, uptr mask, s32 *offs)
// arm32 offset has an add/sub flag and an unsigned 8 bit value, which only
// allows values of [-255...255]. the value -256 thus can't be used.
if (*offs + sign == 0) {
la += sign;
la -= sign;
*offs += sign;
}
#endif

10
pico/memory.c
View File

@@ -20,7 +20,7 @@ uptr m68k_read16_map [0x1000000 >> M68K_MEM_SHIFT];
uptr m68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];
uptr m68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];
static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
static void xmap_set(uptr *map, int shift, u32 start_addr, u32 end_addr,
const void *func_or_mh, int is_func)
{
#ifdef __clang__
@@ -53,7 +53,7 @@ static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
}
}
void z80_map_set(uptr *map, int start_addr, int end_addr,
void z80_map_set(uptr *map, u16 start_addr, u16 end_addr,
const void *func_or_mh, int is_func)
{
xmap_set(map, Z80_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func);
@@ -63,7 +63,7 @@ void z80_map_set(uptr *map, int start_addr, int end_addr,
#endif
}
void cpu68k_map_set(uptr *map, int start_addr, int end_addr,
void cpu68k_map_set(uptr *map, u32 start_addr, u32 end_addr,
const void *func_or_mh, int is_func)
{
xmap_set(map, M68K_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func);
@@ -81,7 +81,7 @@ void cpu68k_map_set(uptr *map, int start_addr, int end_addr,
}
// more specialized/optimized function (does same as above)
void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub)
void cpu68k_map_all_ram(u32 start_addr, u32 end_addr, void *ptr, int is_sub)
{
uptr *r8map, *r16map, *w8map, *w16map;
uptr addr = (uptr)ptr;
@@ -139,7 +139,7 @@ static void m68k_unmapped_write16(u32 a, u32 d)
elprintf(EL_UIO, "m68k unmapped w16 [%06x] %04x @%06x", a, d & 0xffff, SekPc);
}
void m68k_map_unmap(int start_addr, int end_addr)
void m68k_map_unmap(u32 start_addr, u32 end_addr)
{
#ifdef __clang__
// workaround bug (segfault) in

8
pico/memory.h
View File

@@ -44,12 +44,12 @@ extern uptr z80_write_map[0x10000 >> Z80_MEM_SHIFT];
typedef unsigned char (z80_read_f)(unsigned short a);
typedef void (z80_write_f)(unsigned int a, unsigned char data);
void z80_map_set(uptr *map, int start_addr, int end_addr,
void z80_map_set(uptr *map, u16 start_addr, u16 end_addr,
const void *func_or_mh, int is_func);
void cpu68k_map_set(uptr *map, int start_addr, int end_addr,
void cpu68k_map_set(uptr *map, u32 start_addr, u32 end_addr,
const void *func_or_mh, int is_func);
void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub);
void m68k_map_unmap(int start_addr, int end_addr);
void cpu68k_map_all_ram(u32 start_addr, u32 end_addr, void *ptr, int is_sub);
void m68k_map_unmap(u32 start_addr, u32 end_addr);
#define MAP_FLAG ((uptr)1 << (sizeof(uptr) * 8 - 1))
#define map_flag_set(x) ((x) & MAP_FLAG)