X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Fassem_arm.c;h=36a3e45ac9606540eca8b611f3c373d014ee9f8d;hp=b336bcca127d49296f3b51ef0cbd576d0c7d82b3;hb=643aeae3222be00a799ca1e96e795ff846f81fee;hpb=16c8be170aef16720d553992f69f5244550a9415 diff --git a/libpcsxcore/new_dynarec/assem_arm.c b/libpcsxcore/new_dynarec/assem_arm.c index b336bcca..36a3e45a 100644 --- a/libpcsxcore/new_dynarec/assem_arm.c +++ b/libpcsxcore/new_dynarec/assem_arm.c @@ -30,9 +30,9 @@ #if defined(BASE_ADDR_FIXED) #elif defined(BASE_ADDR_DYNAMIC) -char *translation_cache; +u_char *translation_cache; #else -char translation_cache[1 << TARGET_SIZE_2] __attribute__((aligned(4096))); +u_char translation_cache[1 << TARGET_SIZE_2] __attribute__((aligned(4096))); #endif #ifndef __MACH__ @@ -43,6 +43,12 @@ char translation_cache[1 << TARGET_SIZE_2] __attribute__((aligned(4096))); #define unused __attribute__((unused)) +#ifdef DRC_DBG +#pragma GCC diagnostic ignored "-Wunused-function" +#pragma GCC diagnostic ignored "-Wunused-variable" +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" +#endif + extern int cycle_count; extern int last_count; extern int pcaddr; @@ -68,23 +74,24 @@ void jump_vaddr_r9(); void jump_vaddr_r10(); void jump_vaddr_r12(); -const u_int jump_vaddr_reg[16] = { - (int)jump_vaddr_r0, - (int)jump_vaddr_r1, - (int)jump_vaddr_r2, - (int)jump_vaddr_r3, - (int)jump_vaddr_r4, - (int)jump_vaddr_r5, - (int)jump_vaddr_r6, - (int)jump_vaddr_r7, - (int)jump_vaddr_r8, - (int)jump_vaddr_r9, - (int)jump_vaddr_r10, +void * const jump_vaddr_reg[16] = { + jump_vaddr_r0, + jump_vaddr_r1, + jump_vaddr_r2, + jump_vaddr_r3, + jump_vaddr_r4, + jump_vaddr_r5, + jump_vaddr_r6, + jump_vaddr_r7, + jump_vaddr_r8, + jump_vaddr_r9, + jump_vaddr_r10, 0, - (int)jump_vaddr_r12, + jump_vaddr_r12, 0, 0, - 0}; + 0 +}; void invalidate_addr_r0(); void invalidate_addr_r1(); @@ -121,26 +128,27 @@ static u_int needs_clear_cache[1<<(TARGET_SIZE_2-17)]; /* Linker */ -static void set_jump_target(int addr,u_int target) +static void set_jump_target(void *addr, void *target_) { - u_char *ptr=(u_char *)addr; + u_int target = (u_int)target_; + u_char *ptr = addr; u_int *ptr2=(u_int *)ptr; if(ptr[3]==0xe2) { assert((target-(u_int)ptr2-8)<1024); - assert((addr&3)==0); + assert(((uintptr_t)addr&3)==0); assert((target&3)==0); *ptr2=(*ptr2&0xFFFFF000)|((target-(u_int)ptr2-8)>>2)|0xF00; - //printf("target=%x addr=%x insn=%x\n",target,addr,*ptr2); + //printf("target=%x addr=%p insn=%x\n",target,addr,*ptr2); } else if(ptr[3]==0x72) { // generated by emit_jno_unlikely if((target-(u_int)ptr2-8)<1024) { - assert((addr&3)==0); + assert(((uintptr_t)addr&3)==0); assert((target&3)==0); *ptr2=(*ptr2&0xFFFFF000)|((target-(u_int)ptr2-8)>>2)|0xF00; } else if((target-(u_int)ptr2-8)<4096&&!((target-(u_int)ptr2-8)&15)) { - assert((addr&3)==0); + assert(((uintptr_t)addr&3)==0); assert((target&3)==0); *ptr2=(*ptr2&0xFFFFF000)|((target-(u_int)ptr2-8)>>4)|0xE00; } @@ -211,19 +219,19 @@ static void *find_extjump_insn(void *stub) // get address that insn one after stub loads (dyna_linker arg1), // treat it as a pointer to branch insn, // return addr where that branch jumps to -static int get_pointer(void *stub) +static void *get_pointer(void *stub) { //printf("get_pointer(%x)\n",(int)stub); int *i_ptr=find_extjump_insn(stub); assert((*i_ptr&0x0f000000)==0x0a000000); - return (int)i_ptr+((*i_ptr<<8)>>6)+8; + return (u_char *)i_ptr+((*i_ptr<<8)>>6)+8; } // Find the "clean" entry point from a "dirty" entry point // by skipping past the call to verify_code -static u_int get_clean_addr(int addr) +static void *get_clean_addr(void *addr) { - int *ptr=(int *)addr; + signed int *ptr = addr; #ifndef HAVE_ARMV7 ptr+=4; #else @@ -233,9 +241,9 @@ static u_int get_clean_addr(int addr) assert((*ptr&0xFF000000)==0xeb000000); // bl instruction ptr++; if((*ptr&0xFF000000)==0xea000000) { - return (int)ptr+((*ptr<<8)>>6)+8; // follow jump + return (char *)ptr+((*ptr<<8)>>6)+8; // follow jump } - return (u_int)ptr; + return ptr; } static int verify_dirty(u_int *ptr) @@ -272,7 +280,7 @@ static int verify_dirty(u_int *ptr) // This doesn't necessarily find all clean entry points, just // guarantees that it's not dirty -static int isclean(int addr) +static int isclean(void *addr) { #ifndef HAVE_ARMV7 u_int *ptr=((u_int *)addr)+4; @@ -288,9 +296,9 @@ static int isclean(int addr) } // get source that block at addr was compiled from (host pointers) -static void get_bounds(int addr,u_int *start,u_int *end) +static void get_bounds(void *addr,u_int *start,u_int *end) { - u_int *ptr=(u_int *)addr; + u_int *ptr = addr; #ifndef HAVE_ARMV7 u_int offset; // get from literal pool @@ -1651,22 +1659,66 @@ static void emit_set_if_carry64_32(int u1, int l1, int u2, int l2, int rt) emit_cmovb_imm(1,rt); } -static void emit_call(int a) +#ifdef DRC_DBG +extern void gen_interupt(); +extern void do_insn_cmp(); +#define FUNCNAME(f) { (intptr_t)f, " " #f } +static const struct { + intptr_t addr; + const char *name; +} function_names[] = { + FUNCNAME(cc_interrupt), + FUNCNAME(gen_interupt), + FUNCNAME(get_addr_ht), + FUNCNAME(get_addr), + FUNCNAME(jump_handler_read8), + FUNCNAME(jump_handler_read16), + FUNCNAME(jump_handler_read32), + FUNCNAME(jump_handler_write8), + FUNCNAME(jump_handler_write16), + FUNCNAME(jump_handler_write32), + FUNCNAME(invalidate_addr), + FUNCNAME(verify_code_vm), + FUNCNAME(verify_code), + FUNCNAME(jump_hlecall), + FUNCNAME(jump_syscall_hle), + FUNCNAME(new_dyna_leave), + FUNCNAME(pcsx_mtc0), + FUNCNAME(pcsx_mtc0_ds), + FUNCNAME(do_insn_cmp), +}; + +static const char *func_name(intptr_t a) +{ + int i; + for (i = 0; i < sizeof(function_names)/sizeof(function_names[0]); i++) + if (function_names[i].addr == a) + return function_names[i].name; + return ""; +} +#else +#define func_name(x) "" +#endif + +static void emit_call(const void *a_) { - assem_debug("bl %x (%x+%x)\n",a,(int)out,a-(int)out-8); + int a = (int)a_; + assem_debug("bl %x (%x+%x)%s\n",a,(int)out,a-(int)out-8,func_name(a)); u_int offset=genjmp(a); output_w32(0xeb000000|offset); } -static void emit_jmp(int a) +static void emit_jmp(const void *a_) { - assem_debug("b %x (%x+%x)\n",a,(int)out,a-(int)out-8); + int a = (int)a_; + assem_debug("b %x (%x+%x)%s\n",a,(int)out,a-(int)out-8,func_name(a)); u_int offset=genjmp(a); output_w32(0xea000000|offset); } -static void emit_jne(int a) +static void emit_jne(const void *a_) { + int a = (int)a_; assem_debug("bne %x\n",a); u_int offset=genjmp(a); output_w32(0x1a000000|offset); @@ -1721,8 +1773,9 @@ static void emit_jc(int a) output_w32(0x2a000000|offset); } -static void emit_jcc(int a) +static void emit_jcc(void *a_) { + int a = (int)a_; assem_debug("bcc %x\n",a); u_int offset=genjmp(a); output_w32(0x3a000000|offset); @@ -1862,6 +1915,7 @@ static void emit_movzbl_indexed(int offset, int rs, int rt) static void emit_movzbl_dualindexedx4(int rs1, int rs2, int rt) { + assert(rs2>=0); assem_debug("ldrb %s,%s,%s lsl #2\n",regname[rt],regname[rs1],regname[rs2]); output_w32(0xe7d00000|rd_rn_rm(rt,rs1,rs2)|0x100); } @@ -1901,9 +1955,9 @@ static void emit_ldrd(int offset, int rs, int rt) } } -static void emit_readword(int addr, int rt) +static void emit_readword(void *addr, int rt) { - u_int offset = addr-(u_int)&dynarec_local; + uintptr_t offset = (u_char *)addr - (u_char *)&dynarec_local; assert(offset<4096); assem_debug("ldr %s,fp+%d\n",regname[rt],offset); output_w32(0xe5900000|rd_rn_rm(rt,FP,0)|offset); @@ -2008,6 +2062,7 @@ static void emit_writebyte_indexed(int rt, int offset, int rs) static void emit_writebyte_dualindexedx4(int rt, int rs1, int rs2) { + assert(rs2>=0); assem_debug("strb %s,%s,%s lsl #2\n",regname[rt],regname[rs1],regname[rs2]); output_w32(0xe7c00000|rd_rn_rm(rt,rs1,rs2)|0x100); } @@ -2043,25 +2098,25 @@ static void emit_strcch_dualindexed(int rs1, int rs2, int rt) output_w32(0x318000b0|rd_rn_rm(rt,rs1,rs2)); } -static void emit_writeword(int rt, int addr) +static void emit_writeword(int rt, void *addr) { - u_int offset = addr-(u_int)&dynarec_local; + uintptr_t offset = (u_char *)addr - (u_char *)&dynarec_local; assert(offset<4096); assem_debug("str %s,fp+%d\n",regname[rt],offset); output_w32(0xe5800000|rd_rn_rm(rt,FP,0)|offset); } -static unused void emit_writehword(int rt, int addr) +static unused void emit_writehword(int rt, void *addr) { - u_int offset = addr-(u_int)&dynarec_local; + uintptr_t offset = (u_char *)addr - (u_char *)&dynarec_local; assert(offset<256); assem_debug("strh %s,fp+%d\n",regname[rt],offset); output_w32(0xe1c000b0|rd_rn_rm(rt,FP,0)|((offset<<4)&0xf00)|(offset&0xf)); } -static unused void emit_writebyte(int rt, int addr) +static unused void emit_writebyte(int rt, void *addr) { - u_int offset = addr-(u_int)&dynarec_local; + uintptr_t offset = (u_char *)addr - (u_char *)&dynarec_local; assert(offset<4096); assem_debug("strb %s,fp+%d\n",regname[rt],offset); output_w32(0xe5c00000|rd_rn_rm(rt,FP,0)|offset); @@ -2420,43 +2475,43 @@ static void literal_pool_jumpover(int n) if(n) { if((int)out-literals[0][0]<4096-n) return; } - int jaddr=(int)out; + void *jaddr = out; emit_jmp(0); literal_pool(0); - set_jump_target(jaddr,(int)out); + set_jump_target(jaddr, out); } -static void emit_extjump2(u_int addr, int target, int linker) +static void emit_extjump2(u_char *addr, int target, void *linker) { u_char *ptr=(u_char *)addr; assert((ptr[3]&0x0e)==0xa); (void)ptr; emit_loadlp(target,0); - emit_loadlp(addr,1); - assert(addr>=BASE_ADDR&&addr<(BASE_ADDR+(1<=translation_cache&&addr<(translation_cache+(1<=0x80000000&&target<0x80800000)||(target>0xA4000000&&target<0xA4001000)); //DEBUG > #ifdef DEBUG_CYCLE_COUNT - emit_readword((int)&last_count,ECX); + emit_readword(&last_count,ECX); emit_add(HOST_CCREG,ECX,HOST_CCREG); - emit_readword((int)&next_interupt,ECX); - emit_writeword(HOST_CCREG,(int)&Count); + emit_readword(&next_interupt,ECX); + emit_writeword(HOST_CCREG,&Count); emit_sub(HOST_CCREG,ECX,HOST_CCREG); - emit_writeword(ECX,(int)&last_count); + emit_writeword(ECX,&last_count); #endif //DEBUG < emit_jmp(linker); } -static void emit_extjump(int addr, int target) +static void emit_extjump(void *addr, int target) { - emit_extjump2(addr, target, (int)dyna_linker); + emit_extjump2(addr, target, dyna_linker); } -static void emit_extjump_ds(int addr, int target) +static void emit_extjump_ds(void *addr, int target) { - emit_extjump2(addr, target, (int)dyna_linker_ds); + emit_extjump2(addr, target, dyna_linker_ds); } // put rt_val into rt, potentially making use of rs with value rs_val @@ -2520,7 +2575,7 @@ static void pass_args(int a0, int a1) } } -static void mov_loadtype_adj(int type,int rs,int rt) +static void mov_loadtype_adj(enum stub_type type,int rs,int rt) { switch(type) { case LOADB_STUB: emit_signextend8(rs,rt); break; @@ -2537,14 +2592,14 @@ static void mov_loadtype_adj(int type,int rs,int rt) static void do_readstub(int n) { - assem_debug("do_readstub %x\n",start+stubs[n][3]*4); + assem_debug("do_readstub %x\n",start+stubs[n].a*4); literal_pool(256); - set_jump_target(stubs[n][1],(int)out); - int type=stubs[n][0]; - int i=stubs[n][3]; - int rs=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - u_int reglist=stubs[n][7]; + set_jump_target(stubs[n].addr, out); + enum stub_type type=stubs[n].type; + int i=stubs[n].a; + int rs=stubs[n].b; + struct regstat *i_regs=(struct regstat *)stubs[n].c; + u_int reglist=stubs[n].e; signed char *i_regmap=i_regs->regmap; int rt; if(itype[i]==C1LS||itype[i]==C2LS||itype[i]==LOADLR) { @@ -2553,7 +2608,8 @@ static void do_readstub(int n) rt=get_reg(i_regmap,rt1[i]); } assert(rs>=0); - int r,temp=-1,temp2=HOST_TEMPREG,regs_saved=0,restore_jump=0; + int r,temp=-1,temp2=HOST_TEMPREG,regs_saved=0; + void *restore_jump = NULL; reglist|=(1<=0&&rt1[i]!=0)) { mov_loadtype_adj(type,0,rt); } if(restore_jump) - set_jump_target(restore_jump,(int)out); + set_jump_target(restore_jump, out); restore_regs(reglist); - emit_jmp(stubs[n][2]); // return address + emit_jmp(stubs[n].retaddr); // return address } // return memhandler, or get directly accessable address and return 0 -static u_int get_direct_memhandler(void *table,u_int addr,int type,u_int *addr_host) +static void *get_direct_memhandler(void *table,u_int addr,enum stub_type type,u_int *addr_host) { u_int l1,l2=0; l1=((u_int *)table)[addr>>12]; if((l1&(1<<31))==0) { u_int v=l1<<1; *addr_host=v+addr; - return 0; + return NULL; } else { l1<<=1; @@ -2635,24 +2692,25 @@ static u_int get_direct_memhandler(void *table,u_int addr,int type,u_int *addr_h if((l2&(1<<31))==0) { u_int v=l2<<1; *addr_host=v+(addr&0xfff); - return 0; + return NULL; } - return l2<<1; + return (void *)(l2<<1); } } -static void inline_readstub(int type, int i, u_int addr, signed char regmap[], int target, int adj, u_int reglist) +static void inline_readstub(enum stub_type type, int i, u_int addr, signed char regmap[], int target, int adj, u_int reglist) { int rs=get_reg(regmap,target); int rt=get_reg(regmap,target); if(rs<0) rs=get_reg(regmap,-1); assert(rs>=0); - u_int handler,host_addr=0,is_dynamic,far_call=0; + u_int host_addr=0,is_dynamic,far_call=0; + void *handler; int cc=get_reg(regmap,CCREG); if(pcsx_direct_read(type,addr,CLOCK_ADJUST(adj+1),cc,target?rs:-1,rt)) return; - handler=get_direct_memhandler(mem_rtab,addr,type,&host_addr); - if (handler==0) { + handler = get_direct_memhandler(mem_rtab, addr, type, &host_addr); + if (handler == NULL) { if(rt<0||rt1[i]==0) return; if(addr!=host_addr) @@ -2670,11 +2728,11 @@ static void inline_readstub(int type, int i, u_int addr, signed char regmap[], i is_dynamic=pcsxmem_is_handler_dynamic(addr); if(is_dynamic) { if(type==LOADB_STUB||type==LOADBU_STUB) - handler=(int)jump_handler_read8; + handler=jump_handler_read8; if(type==LOADH_STUB||type==LOADHU_STUB) - handler=(int)jump_handler_read16; + handler=jump_handler_read16; if(type==LOADW_STUB) - handler=(int)jump_handler_read32; + handler=jump_handler_read32; } // call a memhandler @@ -2685,10 +2743,10 @@ static void inline_readstub(int type, int i, u_int addr, signed char regmap[], i emit_movimm(addr,0); else if(rs!=0) emit_mov(rs,0); - int offset=(int)handler-(int)out-8; + int offset=(u_char *)handler-out-8; if(offset<-33554432||offset>=33554432) { // unreachable memhandler, a plugin func perhaps - emit_movimm(handler,12); + emit_movimm((u_int)handler,12); far_call=1; } if(cc<0) @@ -2698,10 +2756,10 @@ static void inline_readstub(int type, int i, u_int addr, signed char regmap[], i emit_addimm(cc<0?2:cc,CLOCK_ADJUST(adj+1),2); } else { - emit_readword((int)&last_count,3); + emit_readword(&last_count,3); emit_addimm(cc<0?2:cc,CLOCK_ADJUST(adj+1),2); emit_add(2,3,2); - emit_writeword(2,(int)&Count); + emit_writeword(2,&Count); } if(far_call) @@ -2724,14 +2782,14 @@ static void inline_readstub(int type, int i, u_int addr, signed char regmap[], i static void do_writestub(int n) { - assem_debug("do_writestub %x\n",start+stubs[n][3]*4); + assem_debug("do_writestub %x\n",start+stubs[n].a*4); literal_pool(256); - set_jump_target(stubs[n][1],(int)out); - int type=stubs[n][0]; - int i=stubs[n][3]; - int rs=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - u_int reglist=stubs[n][7]; + set_jump_target(stubs[n].addr, out); + enum stub_type type=stubs[n].type; + int i=stubs[n].a; + int rs=stubs[n].b; + struct regstat *i_regs=(struct regstat *)stubs[n].c; + u_int reglist=stubs[n].e; signed char *i_regmap=i_regs->regmap; int rt,r; if(itype[i]==C1LS||itype[i]==C2LS) { @@ -2741,7 +2799,8 @@ static void do_writestub(int n) } assert(rs>=0); assert(rt>=0); - int rtmp,temp=-1,temp2=HOST_TEMPREG,regs_saved=0,restore_jump=0,ra; + int rtmp,temp=-1,temp2=HOST_TEMPREG,regs_saved=0; + void *restore_jump = NULL; int reglist2=reglist|(1<=0); assert(rt>=0); - u_int handler,host_addr=0; - handler=get_direct_memhandler(mem_wtab,addr,type,&host_addr); - if (handler==0) { + u_int host_addr=0; + void *handler = get_direct_memhandler(mem_wtab, addr, type, &host_addr); + if (handler == NULL) { if(addr!=host_addr) emit_movimm_from(addr,rs,host_addr,rs); switch(type) { @@ -2829,9 +2888,9 @@ static void inline_writestub(int type, int i, u_int addr, signed char regmap[], if(cc<0) emit_loadreg(CCREG,2); emit_addimm(cc<0?2:cc,CLOCK_ADJUST(adj+1),2); - emit_movimm(handler,3); + emit_movimm((u_int)handler,3); // returns new cycle_count - emit_call((int)jump_handler_write_h); + emit_call(jump_handler_write_h); emit_addimm(0,-CLOCK_ADJUST(adj+1),cc<0?2:cc); if(cc<0) emit_storereg(CCREG,2); @@ -2840,14 +2899,14 @@ static void inline_writestub(int type, int i, u_int addr, signed char regmap[], static void do_unalignedwritestub(int n) { - assem_debug("do_unalignedwritestub %x\n",start+stubs[n][3]*4); + assem_debug("do_unalignedwritestub %x\n",start+stubs[n].a*4); literal_pool(256); - set_jump_target(stubs[n][1],(int)out); + set_jump_target(stubs[n].addr, out); - int i=stubs[n][3]; - struct regstat *i_regs=(struct regstat *)stubs[n][4]; - int addr=stubs[n][5]; - u_int reglist=stubs[n][7]; + int i=stubs[n].a; + struct regstat *i_regs=(struct regstat *)stubs[n].c; + int addr=stubs[n].b; + u_int reglist=stubs[n].e; signed char *i_regmap=i_regs->regmap; int temp2=get_reg(i_regmap,FTEMP); int rt; @@ -2865,16 +2924,16 @@ static void do_unalignedwritestub(int n) int cc=get_reg(i_regmap,CCREG); if(cc<0) emit_loadreg(CCREG,2); - emit_addimm(cc<0?2:cc,CLOCK_ADJUST((int)stubs[n][6]+1),2); - emit_call((int)(opcode[i]==0x2a?jump_handle_swl:jump_handle_swr)); - emit_addimm(0,-CLOCK_ADJUST((int)stubs[n][6]+1),cc<0?2:cc); + emit_addimm(cc<0?2:cc,CLOCK_ADJUST((int)stubs[n].d+1),2); + emit_call((opcode[i]==0x2a?jump_handle_swl:jump_handle_swr)); + emit_addimm(0,-CLOCK_ADJUST((int)stubs[n].d+1),cc<0?2:cc); if(cc<0) emit_storereg(CCREG,2); restore_regs(reglist); - emit_jmp(stubs[n][2]); // return address + emit_jmp(stubs[n].retaddr); // return address #else emit_andimm(addr,0xfffffffc,temp2); - emit_writeword(temp2,(int)&address); + emit_writeword(temp2,&address); save_regs(reglist); emit_shrimm(addr,16,1); @@ -2883,11 +2942,11 @@ static void do_unalignedwritestub(int n) emit_loadreg(CCREG,2); } emit_movimm((u_int)readmem,0); - emit_addimm(cc<0?2:cc,2*stubs[n][6]+2,2); + emit_addimm(cc<0?2:cc,2*stubs[n].d+2,2); emit_call((int)&indirect_jump_indexed); restore_regs(reglist); - emit_readword((int)&readmem_dword,temp2); + emit_readword(&readmem_dword,temp2); int temp=addr; //hmh emit_shlimm(addr,3,temp); emit_andimm(temp,24,temp); @@ -2905,40 +2964,40 @@ static void do_unalignedwritestub(int n) emit_bic_lsl(temp2,HOST_TEMPREG,temp,temp2); emit_orrshl(rt,temp,temp2); } - emit_readword((int)&address,addr); - emit_writeword(temp2,(int)&word); + emit_readword(&address,addr); + emit_writeword(temp2,&word); //save_regs(reglist); // don't need to, no state changes emit_shrimm(addr,16,1); emit_movimm((u_int)writemem,0); //emit_call((int)&indirect_jump_indexed); emit_mov(15,14); emit_readword_dualindexedx4(0,1,15); - emit_readword((int)&Count,HOST_TEMPREG); - emit_readword((int)&next_interupt,2); - emit_addimm(HOST_TEMPREG,-2*stubs[n][6]-2,HOST_TEMPREG); - emit_writeword(2,(int)&last_count); + emit_readword(&Count,HOST_TEMPREG); + emit_readword(&next_interupt,2); + emit_addimm(HOST_TEMPREG,-2*stubs[n].d-2,HOST_TEMPREG); + emit_writeword(2,&last_count); emit_sub(HOST_TEMPREG,2,cc<0?HOST_TEMPREG:cc); if(cc<0) { emit_storereg(CCREG,HOST_TEMPREG); } restore_regs(reglist); - emit_jmp(stubs[n][2]); // return address + emit_jmp(stubs[n].retaddr); // return address #endif } static void do_invstub(int n) { literal_pool(20); - u_int reglist=stubs[n][3]; - set_jump_target(stubs[n][1],(int)out); + u_int reglist=stubs[n].a; + set_jump_target(stubs[n].addr, out); save_regs(reglist); - if(stubs[n][4]!=0) emit_mov(stubs[n][4],0); - emit_call((int)&invalidate_addr); + if(stubs[n].b!=0) emit_mov(stubs[n].b,0); + emit_call(&invalidate_addr); restore_regs(reglist); - emit_jmp(stubs[n][2]); // return address + emit_jmp(stubs[n].retaddr); // return address } -int do_dirty_stub(int i) +void *do_dirty_stub(int i) { assem_debug("do_dirty_stub %x\n",start+i*4); u_int addr=(u_int)source; @@ -2955,10 +3014,11 @@ int do_dirty_stub(int i) emit_movw(slen*4,3); #endif emit_movimm(start+i*4,0); - emit_call((int)start<(int)0xC0000000?(int)&verify_code:(int)&verify_code_vm); - int entry=(int)out; + emit_call((int)start<(int)0xC0000000?&verify_code:&verify_code_vm); + void *entry = out; load_regs_entry(i); - if(entry==(int)out) entry=instr_addr[i]; + if (entry == out) + entry = instr_addr[i]; emit_jmp(instr_addr[i]); return entry; } @@ -2978,18 +3038,18 @@ static void do_dirty_stub_ds() emit_movw(slen*4,3); #endif emit_movimm(start+1,0); - emit_call((int)&verify_code_ds); + emit_call(&verify_code_ds); } static void do_cop1stub(int n) { literal_pool(256); - assem_debug("do_cop1stub %x\n",start+stubs[n][3]*4); - set_jump_target(stubs[n][1],(int)out); - int i=stubs[n][3]; -// int rs=stubs[n][4]; - struct regstat *i_regs=(struct regstat *)stubs[n][5]; - int ds=stubs[n][6]; + assem_debug("do_cop1stub %x\n",start+stubs[n].a*4); + set_jump_target(stubs[n].addr, out); + int i=stubs[n].a; +// int rs=stubs[n].b; + struct regstat *i_regs=(struct regstat *)stubs[n].c; + int ds=stubs[n].d; if(!ds) { load_all_consts(regs[i].regmap_entry,regs[i].was32,regs[i].wasdirty,i); //if(i_regs!=®s[i]) printf("oops: regs[i]=%x i_regs=%x",(int)®s[i],(int)i_regs); @@ -2999,7 +3059,7 @@ static void do_cop1stub(int n) if(regs[i].regmap_entry[HOST_CCREG]!=CCREG) emit_loadreg(CCREG,HOST_CCREG); emit_movimm(start+(i-ds)*4,EAX); // Get PC emit_addimm(HOST_CCREG,CLOCK_ADJUST(ccadj[i]),HOST_CCREG); // CHECK: is this right? There should probably be an extra cycle... - emit_jmp(ds?(int)fp_exception_ds:(int)fp_exception); + emit_jmp(ds?fp_exception_ds:fp_exception); } /* Special assem */ @@ -3232,9 +3292,10 @@ static int get_ptr_mem_type(u_int a) return MTYPE_8000; } -static int emit_fastpath_cmp_jump(int i,int addr,int *addr_reg_override) +static void *emit_fastpath_cmp_jump(int i,int addr,int *addr_reg_override) { - int jaddr=0,type=0; + void *jaddr = NULL; + int type=0; int mr=rs1[i]; if(((smrv_strong|smrv_weak)>>mr)&1) { type=get_ptr_mem_type(smrv[mr]); @@ -3265,7 +3326,7 @@ static int emit_fastpath_cmp_jump(int i,int addr,int *addr_reg_override) if (psxH == (void *)0x1f800000) { emit_addimm(addr,-0x1f800000,HOST_TEMPREG); emit_cmpimm(HOST_TEMPREG,0x1000); - jaddr=(int)out; + jaddr=out; emit_jc(0); } else { @@ -3277,7 +3338,7 @@ static int emit_fastpath_cmp_jump(int i,int addr,int *addr_reg_override) if(type==0) { emit_cmpimm(addr,RAM_SIZE); - jaddr=(int)out; + jaddr=out; #ifdef CORTEX_A8_BRANCH_PREDICTION_HACK // Hint to branch predictor that the branch is unlikely to be taken if(rs1[i]>=28) @@ -3300,7 +3361,7 @@ static void loadlr_assemble_arm(int i,struct regstat *i_regs) { int s,th,tl,temp,temp2,addr,map=-1; int offset; - int jaddr=0; + void *jaddr=0; int memtarget=0,c=0; int fastload_reg_override=0; u_int hr,reglist=0; @@ -3354,7 +3415,7 @@ static void loadlr_assemble_arm(int i,struct regstat *i_regs) if(fastload_reg_override) a=fastload_reg_override; //emit_readword_indexed((int)rdram-0x80000000,temp2,temp2); emit_readword_indexed_tlb(0,a,map,temp2); - if(jaddr) add_stub(LOADW_STUB,jaddr,(int)out,i,temp2,(int)i_regs,ccadj[i],reglist); + if(jaddr) add_stub_r(LOADW_STUB,jaddr,out,i,temp2,i_regs,ccadj[i],reglist); } else inline_readstub(LOADW_STUB,i,(constmap[i][s]+offset)&0xFFFFFFFC,i_regs->regmap,FTEMP,ccadj[i],reglist); @@ -3386,7 +3447,7 @@ static void loadlr_assemble_arm(int i,struct regstat *i_regs) //if(th>=0) emit_readword_indexed((int)rdram-0x80000000,temp2,temp2h); //emit_readword_indexed((int)rdram-0x7FFFFFFC,temp2,temp2); emit_readdword_indexed_tlb(0,temp2,map,temp2h,temp2); - if(jaddr) add_stub(LOADD_STUB,jaddr,(int)out,i,temp2,(int)i_regs,ccadj[i],reglist); + if(jaddr) add_stub_r(LOADD_STUB,jaddr,out,i,temp2,i_regs,ccadj[i],reglist); } else inline_readstub(LOADD_STUB,i,(constmap[i][s]+offset)&0xFFFFFFF8,i_regs->regmap,FTEMP,ccadj[i],reglist); @@ -3430,10 +3491,10 @@ static void cop0_assemble(int i,struct regstat *i_regs) if(opcode2[i]==0) // MFC0 { signed char t=get_reg(i_regs->regmap,rt1[i]); - char copr=(source[i]>>11)&0x1f; + u_int copr=(source[i]>>11)&0x1f; //assert(t>=0); // Why does this happen? OOT is weird if(t>=0&&rt1[i]!=0) { - emit_readword((int)®_cop0+copr*4,t); + emit_readword(®_cop0[copr],t); } } else if(opcode2[i]==4) // MTC0 @@ -3443,11 +3504,11 @@ static void cop0_assemble(int i,struct regstat *i_regs) assert(s>=0); wb_register(rs1[i],i_regs->regmap,i_regs->dirty,i_regs->is32); if(copr==9||copr==11||copr==12||copr==13) { - emit_readword((int)&last_count,HOST_TEMPREG); + emit_readword(&last_count,HOST_TEMPREG); emit_loadreg(CCREG,HOST_CCREG); // TODO: do proper reg alloc emit_add(HOST_CCREG,HOST_TEMPREG,HOST_CCREG); emit_addimm(HOST_CCREG,CLOCK_ADJUST(ccadj[i]),HOST_CCREG); - emit_writeword(HOST_CCREG,(int)&Count); + emit_writeword(HOST_CCREG,&Count); } // What a mess. The status register (12) can enable interrupts, // so needs a special case to handle a pending interrupt. @@ -3458,19 +3519,19 @@ static void cop0_assemble(int i,struct regstat *i_regs) // burn cycles to cause cc_interrupt, which will // reschedule next_interupt. Relies on CCREG from above. assem_debug("MTC0 DS %d\n", copr); - emit_writeword(HOST_CCREG,(int)&last_count); + emit_writeword(HOST_CCREG,&last_count); emit_movimm(0,HOST_CCREG); emit_storereg(CCREG,HOST_CCREG); emit_loadreg(rs1[i],1); emit_movimm(copr,0); - emit_call((int)pcsx_mtc0_ds); + emit_call(pcsx_mtc0_ds); emit_loadreg(rs1[i],s); return; } emit_movimm(start+i*4+4,HOST_TEMPREG); - emit_writeword(HOST_TEMPREG,(int)&pcaddr); + emit_writeword(HOST_TEMPREG,&pcaddr); emit_movimm(0,HOST_TEMPREG); - emit_writeword(HOST_TEMPREG,(int)&pending_exception); + emit_writeword(HOST_TEMPREG,&pending_exception); } //else if(copr==12&&is_delayslot) emit_call((int)MTC0_R12); //else @@ -3479,20 +3540,20 @@ static void cop0_assemble(int i,struct regstat *i_regs) else if(s!=1) emit_mov(s,1); emit_movimm(copr,0); - emit_call((int)pcsx_mtc0); + emit_call(pcsx_mtc0); if(copr==9||copr==11||copr==12||copr==13) { - emit_readword((int)&Count,HOST_CCREG); - emit_readword((int)&next_interupt,HOST_TEMPREG); + emit_readword(&Count,HOST_CCREG); + emit_readword(&next_interupt,HOST_TEMPREG); emit_addimm(HOST_CCREG,-CLOCK_ADJUST(ccadj[i]),HOST_CCREG); emit_sub(HOST_CCREG,HOST_TEMPREG,HOST_CCREG); - emit_writeword(HOST_TEMPREG,(int)&last_count); + emit_writeword(HOST_TEMPREG,&last_count); emit_storereg(CCREG,HOST_CCREG); } if(copr==12||copr==13) { assert(!is_delayslot); - emit_readword((int)&pending_exception,14); + emit_readword(&pending_exception,14); emit_test(14,14); - emit_jne((int)&do_interrupt); + emit_jne(&do_interrupt); } emit_loadreg(rs1[i],s); if(get_reg(i_regs->regmap,rs1[i]|64)>=0) @@ -3504,11 +3565,11 @@ static void cop0_assemble(int i,struct regstat *i_regs) assert(opcode2[i]==0x10); if((source[i]&0x3f)==0x10) // RFE { - emit_readword((int)&Status,0); + emit_readword(&Status,0); emit_andimm(0,0x3c,1); emit_andimm(0,~0xf,0); emit_orrshr_imm(1,2,0); - emit_writeword(0,(int)&Status); + emit_writeword(0,&Status); } } } @@ -3523,44 +3584,44 @@ static void cop2_get_dreg(u_int copr,signed char tl,signed char temp) case 9: case 10: case 11: - emit_readword((int)®_cop2d[copr],tl); + emit_readword(®_cop2d[copr],tl); emit_signextend16(tl,tl); - emit_writeword(tl,(int)®_cop2d[copr]); // hmh + emit_writeword(tl,®_cop2d[copr]); // hmh break; case 7: case 16: case 17: case 18: case 19: - emit_readword((int)®_cop2d[copr],tl); + emit_readword(®_cop2d[copr],tl); emit_andimm(tl,0xffff,tl); - emit_writeword(tl,(int)®_cop2d[copr]); + emit_writeword(tl,®_cop2d[copr]); break; case 15: - emit_readword((int)®_cop2d[14],tl); // SXY2 - emit_writeword(tl,(int)®_cop2d[copr]); + emit_readword(®_cop2d[14],tl); // SXY2 + emit_writeword(tl,®_cop2d[copr]); break; case 28: case 29: - emit_readword((int)®_cop2d[9],temp); + emit_readword(®_cop2d[9],temp); emit_testimm(temp,0x8000); // do we need this? emit_andimm(temp,0xf80,temp); emit_andne_imm(temp,0,temp); emit_shrimm(temp,7,tl); - emit_readword((int)®_cop2d[10],temp); + emit_readword(®_cop2d[10],temp); emit_testimm(temp,0x8000); emit_andimm(temp,0xf80,temp); emit_andne_imm(temp,0,temp); emit_orrshr_imm(temp,2,tl); - emit_readword((int)®_cop2d[11],temp); + emit_readword(®_cop2d[11],temp); emit_testimm(temp,0x8000); emit_andimm(temp,0xf80,temp); emit_andne_imm(temp,0,temp); emit_orrshl_imm(temp,3,tl); - emit_writeword(tl,(int)®_cop2d[copr]); + emit_writeword(tl,®_cop2d[copr]); break; default: - emit_readword((int)®_cop2d[copr],tl); + emit_readword(®_cop2d[copr],tl); break; } } @@ -3569,24 +3630,24 @@ static void cop2_put_dreg(u_int copr,signed char sl,signed char temp) { switch (copr) { case 15: - emit_readword((int)®_cop2d[13],temp); // SXY1 - emit_writeword(sl,(int)®_cop2d[copr]); - emit_writeword(temp,(int)®_cop2d[12]); // SXY0 - emit_readword((int)®_cop2d[14],temp); // SXY2 - emit_writeword(sl,(int)®_cop2d[14]); - emit_writeword(temp,(int)®_cop2d[13]); // SXY1 + emit_readword(®_cop2d[13],temp); // SXY1 + emit_writeword(sl,®_cop2d[copr]); + emit_writeword(temp,®_cop2d[12]); // SXY0 + emit_readword(®_cop2d[14],temp); // SXY2 + emit_writeword(sl,®_cop2d[14]); + emit_writeword(temp,®_cop2d[13]); // SXY1 break; case 28: emit_andimm(sl,0x001f,temp); emit_shlimm(temp,7,temp); - emit_writeword(temp,(int)®_cop2d[9]); + emit_writeword(temp,®_cop2d[9]); emit_andimm(sl,0x03e0,temp); emit_shlimm(temp,2,temp); - emit_writeword(temp,(int)®_cop2d[10]); + emit_writeword(temp,®_cop2d[10]); emit_andimm(sl,0x7c00,temp); emit_shrimm(temp,3,temp); - emit_writeword(temp,(int)®_cop2d[11]); - emit_writeword(sl,(int)®_cop2d[28]); + emit_writeword(temp,®_cop2d[11]); + emit_writeword(sl,®_cop2d[28]); break; case 30: emit_movs(sl,temp); @@ -3601,13 +3662,13 @@ static void cop2_put_dreg(u_int copr,signed char sl,signed char temp) emit_lslpls_imm(HOST_TEMPREG,1,HOST_TEMPREG); emit_jns((int)out-2*4); #endif - emit_writeword(sl,(int)®_cop2d[30]); - emit_writeword(temp,(int)®_cop2d[31]); + emit_writeword(sl,®_cop2d[30]); + emit_writeword(temp,®_cop2d[31]); break; case 31: break; default: - emit_writeword(sl,(int)®_cop2d[copr]); + emit_writeword(sl,®_cop2d[copr]); break; } } @@ -3629,7 +3690,7 @@ static void cop2_assemble(int i,struct regstat *i_regs) { signed char tl=get_reg(i_regs->regmap,rt1[i]); if(tl>=0&&rt1[i]!=0) - emit_readword((int)®_cop2c[copr],tl); + emit_readword(®_cop2c[copr],tl); } else if (opcode2[i]==6) // CTC2 { @@ -3658,7 +3719,7 @@ static void cop2_assemble(int i,struct regstat *i_regs) temp=sl; break; } - emit_writeword(temp,(int)®_cop2c[copr]); + emit_writeword(temp,®_cop2c[copr]); assert(sl>=0); } } @@ -3685,19 +3746,19 @@ static void c2op_epilogue(u_int op,u_int reglist) static void c2op_call_MACtoIR(int lm,int need_flags) { if(need_flags) - emit_call((int)(lm?gteMACtoIR_lm1:gteMACtoIR_lm0)); + emit_call(lm?gteMACtoIR_lm1:gteMACtoIR_lm0); else - emit_call((int)(lm?gteMACtoIR_lm1_nf:gteMACtoIR_lm0_nf)); + emit_call(lm?gteMACtoIR_lm1_nf:gteMACtoIR_lm0_nf); } static void c2op_call_rgb_func(void *func,int lm,int need_ir,int need_flags) { - emit_call((int)func); + emit_call(func); // func is C code and trashes r0 emit_addimm(FP,(int)&psxRegs.CP2D.r[0]-(int)&dynarec_local,0); if(need_flags||need_ir) c2op_call_MACtoIR(lm,need_flags); - emit_call((int)(need_flags?gteMACtoRGB:gteMACtoRGB_nf)); + emit_call(need_flags?gteMACtoRGB:gteMACtoRGB_nf); } static void c2op_assemble(int i,struct regstat *i_regs) @@ -3740,17 +3801,17 @@ static void c2op_assemble(int i,struct regstat *i_regs) if(mx<3) emit_addimm(0,32*4+mx*8*4,6); else - emit_readword((int)&zeromem_ptr,6); + emit_readword(&zeromem_ptr,6); if(cv<3) emit_addimm(0,32*4+(cv*8+5)*4,7); else - emit_readword((int)&zeromem_ptr,7); + emit_readword(&zeromem_ptr,7); #ifdef __ARM_NEON__ emit_movimm(source[i],1); // opcode - emit_call((int)gteMVMVA_part_neon); + emit_call(gteMVMVA_part_neon); if(need_flags) { emit_movimm(lm,1); - emit_call((int)gteMACtoIR_flags_neon); + emit_call(gteMACtoIR_flags_neon); } #else if(cv==3&&shift) @@ -3765,14 +3826,14 @@ static void c2op_assemble(int i,struct regstat *i_regs) #else /* if not HAVE_ARMV5 */ c2op_prologue(c2op,reglist); emit_movimm(source[i],1); // opcode - emit_writeword(1,(int)&psxRegs.code); + emit_writeword(1,&psxRegs.code); emit_call((int)(need_flags?gte_handlers[c2op]:gte_handlers_nf[c2op])); #endif break; } case GTE_OP: c2op_prologue(c2op,reglist); - emit_call((int)(shift?gteOP_part_shift:gteOP_part_noshift)); + emit_call(shift?gteOP_part_shift:gteOP_part_noshift); if(need_flags||need_ir) { emit_addimm(FP,(int)&psxRegs.CP2D.r[0]-(int)&dynarec_local,0); c2op_call_MACtoIR(lm,need_flags); @@ -3788,7 +3849,7 @@ static void c2op_assemble(int i,struct regstat *i_regs) break; case GTE_SQR: c2op_prologue(c2op,reglist); - emit_call((int)(shift?gteSQR_part_shift:gteSQR_part_noshift)); + emit_call(shift?gteSQR_part_shift:gteSQR_part_noshift); if(need_flags||need_ir) { emit_addimm(FP,(int)&psxRegs.CP2D.r[0]-(int)&dynarec_local,0); c2op_call_MACtoIR(lm,need_flags); @@ -3811,9 +3872,9 @@ static void c2op_assemble(int i,struct regstat *i_regs) c2op_prologue(c2op,reglist); #ifdef DRC_DBG emit_movimm(source[i],1); // opcode - emit_writeword(1,(int)&psxRegs.code); + emit_writeword(1,&psxRegs.code); #endif - emit_call((int)(need_flags?gte_handlers[c2op]:gte_handlers_nf[c2op])); + emit_call(need_flags?gte_handlers[c2op]:gte_handlers_nf[c2op]); break; } c2op_epilogue(c2op,reglist); @@ -3824,9 +3885,9 @@ static void cop1_unusable(int i,struct regstat *i_regs) { // XXX: should just just do the exception instead if(!cop1_usable) { - int jaddr=(int)out; + void *jaddr=out; emit_jmp(0); - add_stub(FP_STUB,jaddr,(int)out,i,0,(int)i_regs,is_delayslot,0); + add_stub_r(FP_STUB,jaddr,out,i,0,i_regs,is_delayslot,0); cop1_usable=1; } } @@ -3922,7 +3983,7 @@ static void multdiv_assemble_arm(int i,struct regstat *i_regs) emit_subcs(remainder,HOST_TEMPREG,remainder); emit_adcs(quotient,quotient,quotient); emit_shrimm(HOST_TEMPREG,1,HOST_TEMPREG); - emit_jcc((int)out-16); // -4 + emit_jcc(out-16); // -4 emit_teq(d1,d2); emit_negmi(quotient,quotient); emit_test(d1,d1); @@ -3958,7 +4019,7 @@ static void multdiv_assemble_arm(int i,struct regstat *i_regs) emit_subcs(remainder,d2,remainder); emit_adcs(quotient,quotient,quotient); emit_shrcc_imm(d2,1,d2); - emit_jcc((int)out-16); // -4 + emit_jcc(out-16); // -4 } } else // 64-bit @@ -4009,17 +4070,17 @@ static void do_miniht_jump(int rs,int rh,int ht) { static void do_miniht_insert(u_int return_address,int rt,int temp) { #ifndef HAVE_ARMV7 emit_movimm(return_address,rt); // PC into link register - add_to_linker((int)out,return_address,1); + add_to_linker(out,return_address,1); emit_pcreladdr(temp); - emit_writeword(rt,(int)&mini_ht[(return_address&0xFF)>>3][0]); - emit_writeword(temp,(int)&mini_ht[(return_address&0xFF)>>3][1]); + emit_writeword(rt,&mini_ht[(return_address&0xFF)>>3][0]); + emit_writeword(temp,&mini_ht[(return_address&0xFF)>>3][1]); #else emit_movw(return_address&0x0000FFFF,rt); - add_to_linker((int)out,return_address,1); + add_to_linker(out,return_address,1); emit_pcreladdr(temp); - emit_writeword(temp,(int)&mini_ht[(return_address&0xFF)>>3][1]); + emit_writeword(temp,&mini_ht[(return_address&0xFF)>>3][1]); emit_movt(return_address&0xFFFF0000,rt); - emit_writeword(rt,(int)&mini_ht[(return_address&0xFF)>>3][0]); + emit_writeword(rt,&mini_ht[(return_address&0xFF)>>3][0]); #endif } @@ -4109,7 +4170,7 @@ static void wb_invalidate_arm(signed char pre[],signed char entry[],uint64_t dir static void mark_clear_cache(void *target) { - u_long offset = (char *)target - (char *)BASE_ADDR; + u_long offset = (u_char *)target - translation_cache; u_int mask = 1u << ((offset >> 12) & 31); if (!(needs_clear_cache[offset >> 17] & mask)) { char *start = (char *)((u_long)target & ~4095ul); @@ -4127,11 +4188,11 @@ static void do_clear_cache() { u_int bitmap=needs_clear_cache[i]; if(bitmap) { - u_int start,end; + u_char *start, *end; for(j=0;j<32;j++) { if(bitmap&(1<