fix some printf format strings

This commit is contained in:
Flyinghead 2019-02-16 14:16:50 +01:00
parent 914e362873
commit 35bb81b195
2 changed files with 13 additions and 13 deletions

View File

@ -119,7 +119,7 @@ RuntimeBlockInfo* bm_GetBlock(void* dynarec_code)
}
else
{
printf("bm_GetBlock(%08x) failed ..\n",dynarec_code);
printf("bm_GetBlock(%p) failed ..\n",dynarec_code);
return 0;
}
}
@ -140,7 +140,7 @@ void bm_AddBlock(RuntimeBlockInfo* blk)
all_blocks.push_back(blk);
if (blkmap.find(blk)!=blkmap.end())
{
printf("DUP: %08X %08X %08X %08X\n", (*blkmap.find(blk))->addr,(*blkmap.find(blk))->code,blk->addr,blk->code);
printf("DUP: %08X %p %08X %p\n", (*blkmap.find(blk))->addr,(*blkmap.find(blk))->code,blk->addr,blk->code);
verify(false);
}
blkmap.insert(blk);
@ -411,9 +411,9 @@ void bm_WriteBlockMap(const string& file)
printf("Writing block map !\n");
for (size_t i=0; i<all_blocks.size(); i++)
{
fprintf(f,"block: %d:%08X:%08X:%d:%d:%d\n",all_blocks[i]->BlockType,all_blocks[i]->addr,all_blocks[i]->code,all_blocks[i]->host_code_size,all_blocks[i]->guest_cycles,all_blocks[i]->guest_opcodes);
fprintf(f,"block: %d:%08X:%p:%d:%d:%d\n",all_blocks[i]->BlockType,all_blocks[i]->addr,all_blocks[i]->code,all_blocks[i]->host_code_size,all_blocks[i]->guest_cycles,all_blocks[i]->guest_opcodes);
for(size_t j=0;j<all_blocks[i]->oplist.size();j++)
fprintf(f,"\top: %d:%d:%s\n",j,all_blocks[i]->oplist[j].guest_offs,all_blocks[i]->oplist[j].dissasm().c_str());
fprintf(f,"\top: %zd:%d:%s\n",j,all_blocks[i]->oplist[j].guest_offs,all_blocks[i]->oplist[j].dissasm().c_str());
}
fclose(f);
printf("Finished writing block map\n");
@ -444,7 +444,7 @@ void sh4_jitsym(FILE* out)
{
for (size_t i=0; i<all_blocks.size(); i++)
{
fprintf(out,"%08p %d %08X\n",all_blocks[i]->code,all_blocks[i]->host_code_size,all_blocks[i]->addr);
fprintf(out,"%p %d %08X\n",all_blocks[i]->code,all_blocks[i]->host_code_size,all_blocks[i]->addr);
}
}
@ -473,7 +473,7 @@ void bm_PrintTopBlocks()
double sel_hops=0;
for (size_t i=0;i<(all_blocks.size()/100);i++)
{
printf("Block %08X: %06X, r: %d (c: %d, s: %d, h: %d) (r: %.2f%%, c: %.2f%%, h: %.2f%%)\n",
printf("Block %08X: %p, r: %d (c: %d, s: %d, h: %d) (r: %.2f%%, c: %.2f%%, h: %.2f%%)\n",
all_blocks[i]->addr, all_blocks[i]->code,all_blocks[i]->runs,
all_blocks[i]->guest_cycles,all_blocks[i]->guest_opcodes,all_blocks[i]->host_opcodes,
@ -489,7 +489,7 @@ void bm_PrintTopBlocks()
size_t i;
for (i=all_blocks.size()/100;sel_hops/total_hops<50;i++)
{
printf("Block %08X: %06X, r: %d (c: %d, s: %d, h: %d) (r: %.2f%%, c: %.2f%%, h: %.2f%%)\n",
printf("Block %08X: %p, r: %d (c: %d, s: %d, h: %d) (r: %.2f%%, c: %.2f%%, h: %.2f%%)\n",
all_blocks[i]->addr, all_blocks[i]->code,all_blocks[i]->runs,
all_blocks[i]->guest_cycles,all_blocks[i]->guest_opcodes,all_blocks[i]->host_opcodes,
@ -593,21 +593,21 @@ void print_blocks()
if (f)
{
fprintf(f,"block: %08X\n",blk);
fprintf(f,"block: %p\n",blk);
fprintf(f,"addr: %08X\n",blk->addr);
fprintf(f,"hash: %s\n",blk->hash());
fprintf(f,"hash_rloc: %s\n",blk->hash(false,true));
fprintf(f,"code: %08X\n",blk->code);
fprintf(f,"code: %p\n",blk->code);
fprintf(f,"runs: %d\n",blk->runs);
fprintf(f,"BlockType: %d\n",blk->BlockType);
fprintf(f,"NextBlock: %08X\n",blk->NextBlock);
fprintf(f,"BranchBlock: %08X\n",blk->BranchBlock);
fprintf(f,"pNextBlock: %08X\n",blk->pNextBlock);
fprintf(f,"pBranchBlock: %08X\n",blk->pBranchBlock);
fprintf(f,"pNextBlock: %p\n",blk->pNextBlock);
fprintf(f,"pBranchBlock: %p\n",blk->pBranchBlock);
fprintf(f,"guest_cycles: %d\n",blk->guest_cycles);
fprintf(f,"guest_opcodes: %d\n",blk->guest_opcodes);
fprintf(f,"host_opcodes: %d\n",blk->host_opcodes);
fprintf(f,"il_opcodes: %d\n",blk->oplist.size());
fprintf(f,"il_opcodes: %zd\n",blk->oplist.size());
u32 hcode=0;
s32 gcode=-1;

View File

@ -29,7 +29,7 @@ void RegWriteInfo(shil_opcode* ops, shil_param p,size_t ord)
{
if (RegisterWrite[p._reg+i]>=RegisterRead[p._reg+i] && RegisterWrite[p._reg+i]!=0xFFFFFFFF) //if last read was before last write, and there was a last write
{
printf("DEAD OPCODE %d %d!\n",RegisterWrite[p._reg+i],ord);
printf("DEAD OPCODE %d %zd!\n",RegisterWrite[p._reg+i],ord);
ops[RegisterWrite[p._reg+i]].Flow=1; //the last write was unused
}
RegisterWrite[p._reg+i]=ord;