RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply some cleanups to the abicall macros

Browse source
This commit is contained in:
OsirizX 2023-01-12 11:39:55 -08:00 • committed by irixxxx
parent 08be5f1dab
commit 1ef527e93b
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
cpu/drc/emit_ppc.c
View file

@ -1507,29 +1507,20 @@ static int emith_cond_check(int cond)
#define emith_call_cond(cond, target) \ #define emith_call_cond(cond, target) \
emith_call(target) emith_call(target)
#ifdef __PS3__
#define emith_call_reg(r) do { \
emith_read_r_r_offs_ptr(TOC_REG, r, 8); \
emith_read_r_r_offs_ptr(r, r, 0); \
EMIT(PPC_MTSP_REG(r, CTR)); \
EMIT(PPC_BLCTRCOND(BXX)); \
} while(0)
#else
#define emith_call_reg(r) do { \ #define emith_call_reg(r) do { \
EMIT(PPC_MTSP_REG(r, CTR)); \ EMIT(PPC_MTSP_REG(r, CTR)); \
EMIT(PPC_BLCTRCOND(BXX)); \ EMIT(PPC_BLCTRCOND(BXX)); \
} while(0) } while(0)
#endif
#define emith_abicall_ctx(offs) do { \ #define emith_abicall_ctx(offs) do { \
emith_ctx_read_ptr(CR, offs); \ emith_ctx_read_ptr(CR, offs); \
emith_call_reg(CR); \ emith_abicall_reg(CR); \
} while (0) } while (0)
#ifdef __PS3__ #ifdef __PS3__
#define emith_abijump_reg(r) \ #define emith_abijump_reg(r) \
if ((r) != CR) emith_move_r_r(CR, r); \ if ((r) != CR) emith_move_r_r(CR, r); \
emith_read_r_r_offs_ptr(TOC_REG, CR, 8); \ emith_read_r_r_offs_ptr(TOC_REG, CR, PTR_SIZE); \
emith_read_r_r_offs_ptr(CR, CR, 0); \ emith_read_r_r_offs_ptr(CR, CR, 0); \
emith_jump_reg(CR) emith_jump_reg(CR)
#else #else
@ -1541,12 +1532,22 @@ static int emith_cond_check(int cond)
emith_abijump_reg(r) emith_abijump_reg(r)
#define emith_abicall(target) \ #define emith_abicall(target) \
emith_move_r_ptr_imm(CR, target); \ emith_move_r_ptr_imm(CR, target); \
emith_call_reg(CR); emith_abicall_reg(CR);
#define emith_abicall_cond(cond, target) \ #define emith_abicall_cond(cond, target) \
emith_abicall(target) emith_abicall(target)
#define emith_abicall_reg(r) \ #ifdef __PS3__
#define emith_abicall_reg(r) do { \
if ((r) != CR) emith_move_r_r(CR, r); \ if ((r) != CR) emith_move_r_r(CR, r); \
emith_call_reg(CR) emith_read_r_r_offs_ptr(TOC_REG, r, PTR_SIZE); \
emith_read_r_r_offs_ptr(r, r, 0); \
emith_call_reg(CR); \
} while(0)
#else
#define emith_abicall_reg(r) do { \
if ((r) != CR) emith_move_r_r(CR, r); \
emith_call_reg(CR); \
} while(0)
#endif
#define emith_call_cleanup() /**/ #define emith_call_cleanup() /**/

2
cpu/drc/emit_x86.c
View file

@ -1043,7 +1043,7 @@ enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI, // x86-64,i386 common
#define emith_rw_offs_max() 0xffffffffU #define emith_rw_offs_max() 0xffffffffU
#define host_call(addr, args) #define host_call(addr, args) \
addr addr
#ifdef __x86_64__ #ifdef __x86_64__