Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix some format warnings

This commit is contained in:
Alexei Svitkine 2017-12-02 12:39:30 -05:00
parent 75324c10d0
commit a472d9ab63
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BasiliskII/src/uae_cpu/memory.cpp
View File

@ -89,7 +89,7 @@ static void REGPARAM2 dummy_bput (uaecptr, uae_u32) REGPARAM;
uae_u32 REGPARAM2 dummy_lget (uaecptr addr)
{
if (illegal_mem)
write_log ("Illegal lget at %08lx\n", addr);
write_log ("Illegal lget at %08x\n", addr);
return 0;
}
@ -97,7 +97,7 @@ uae_u32 REGPARAM2 dummy_lget (uaecptr addr)
uae_u32 REGPARAM2 dummy_wget (uaecptr addr)
{
if (illegal_mem)
write_log ("Illegal wget at %08lx\n", addr);
write_log ("Illegal wget at %08x\n", addr);
return 0;
}
@ -105,7 +105,7 @@ uae_u32 REGPARAM2 dummy_wget (uaecptr addr)
uae_u32 REGPARAM2 dummy_bget (uaecptr addr)
{
if (illegal_mem)
write_log ("Illegal bget at %08lx\n", addr);
write_log ("Illegal bget at %08x\n", addr);
return 0;
}
@ -113,17 +113,17 @@ uae_u32 REGPARAM2 dummy_bget (uaecptr addr)
void REGPARAM2 dummy_lput (uaecptr addr, uae_u32 l)
{
if (illegal_mem)
write_log ("Illegal lput at %08lx\n", addr);
write_log ("Illegal lput at %08x\n", addr);
}
void REGPARAM2 dummy_wput (uaecptr addr, uae_u32 w)
{
if (illegal_mem)
write_log ("Illegal wput at %08lx\n", addr);
write_log ("Illegal wput at %08x\n", addr);
}
void REGPARAM2 dummy_bput (uaecptr addr, uae_u32 b)
{
if (illegal_mem)
write_log ("Illegal bput at %08lx\n", addr);
write_log ("Illegal bput at %08x\n", addr);
}
/* Mac RAM (32 bit addressing) */
@ -268,19 +268,19 @@ uae_u32 REGPARAM2 rom_bget(uaecptr addr)
void REGPARAM2 rom_lput(uaecptr addr, uae_u32 b)
{
if (illegal_mem)
write_log ("Illegal ROM lput at %08lx\n", addr);
write_log ("Illegal ROM lput at %08x\n", addr);
}
void REGPARAM2 rom_wput(uaecptr addr, uae_u32 b)
{
if (illegal_mem)
write_log ("Illegal ROM wput at %08lx\n", addr);
write_log ("Illegal ROM wput at %08x\n", addr);
}
void REGPARAM2 rom_bput(uaecptr addr, uae_u32 b)
{
if (illegal_mem)
write_log ("Illegal ROM bput at %08lx\n", addr);
write_log ("Illegal ROM bput at %08x\n", addr);
}
uae_u8 *REGPARAM2 rom_xlate(uaecptr addr)

22
BasiliskII/src/uae_cpu/newcpu.cpp
View File

@ -373,7 +373,7 @@ uae_s32 ShowEA (int reg, amodes mode, wordsizes size, char *buf)
if (dp & 4) base += dispreg;
addr = base + outer;
sprintf (buffer,"(%s%c%d.%c*%d+%ld)+%ld == $%08lx", name,
sprintf (buffer,"(%s%c%d.%c*%d+%d)+%d == $%08lx", name,
dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W',
1 << ((dp >> 9) & 3),
disp,outer,
@ -420,7 +420,7 @@ uae_s32 ShowEA (int reg, amodes mode, wordsizes size, char *buf)
if (dp & 4) base += dispreg;
addr = base + outer;
sprintf (buffer,"(%s%c%d.%c*%d+%ld)+%ld == $%08lx", name,
sprintf (buffer,"(%s%c%d.%c*%d+%d)+%d == $%08lx", name,
dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W',
1 << ((dp >> 9) & 3),
disp,outer,
@ -1257,7 +1257,7 @@ void REGPARAM2 op_illg (uae_u32 opcode)
return;
}
write_log ("Illegal instruction: %04x at %08lx\n", opcode, pc);
write_log ("Illegal instruction: %04x at %08x\n", opcode, pc);
#if USE_JIT && JIT_DEBUG
compiler_dumpstate();
#endif
@ -1473,11 +1473,11 @@ void m68k_disasm (uaecptr addr, uaecptr *nextpc, int cnt)
}
if (ccpt != 0) {
if (cctrue(dp->cc))
printf (" == %08lx (TRUE)", newpc);
printf (" == %08x (TRUE)", newpc);
else
printf (" == %08lx (FALSE)", newpc);
printf (" == %08x (FALSE)", newpc);
} else if ((opcode & 0xff00) == 0x6100) /* BSR */
printf (" == %08lx", newpc);
printf (" == %08x", newpc);
printf ("\n");
}
if (nextpc)
@ -1488,19 +1488,19 @@ void m68k_dumpstate (uaecptr *nextpc)
{
int i;
for (i = 0; i < 8; i++){
printf ("D%d: %08lx ", i, m68k_dreg(regs, i));
printf ("D%d: %08x ", i, m68k_dreg(regs, i));
if ((i & 3) == 3) printf ("\n");
}
for (i = 0; i < 8; i++){
printf ("A%d: %08lx ", i, m68k_areg(regs, i));
printf ("A%d: %08x ", i, m68k_areg(regs, i));
if ((i & 3) == 3) printf ("\n");
}
if (regs.s == 0) regs.usp = m68k_areg(regs, 7);
if (regs.s && regs.m) regs.msp = m68k_areg(regs, 7);
if (regs.s && regs.m == 0) regs.isp = m68k_areg(regs, 7);
printf ("USP=%08lx ISP=%08lx MSP=%08lx VBR=%08lx\n",
printf ("USP=%08x ISP=%08x MSP=%08x VBR=%08x\n",
regs.usp,regs.isp,regs.msp,regs.vbr);
printf ("T=%d%d S=%d M=%d X=%d N=%d Z=%d V=%d C=%d IMASK=%d\n",
printf ("T=%d%d S=%d M=%d X=%ld N=%ld Z=%ld V=%ld C=%ld IMASK=%d\n",
regs.t1, regs.t0, regs.s, regs.m,
GET_XFLG, GET_NFLG, GET_ZFLG, GET_VFLG, GET_CFLG, regs.intmask);
@ -1509,5 +1509,5 @@ void m68k_dumpstate (uaecptr *nextpc)
m68k_disasm(m68k_getpc (), nextpc, 1);
if (nextpc)
printf ("next PC: %08lx\n", *nextpc);
printf ("next PC: %08x\n", *nextpc);
}

4
BasiliskII/src/uae_cpu/newcpu.h
View File

@ -204,7 +204,7 @@ static __inline__ void m68k_setpc (uaecptr newpc)
#if ENABLE_MON
if (IS_BREAK_POINT(newpc)) {
printf("Stopped at break point address: %08lx. Last PC: %08lx\n", newpc, previous_pc);
printf("Stopped at break point address: %08x. Last PC: %08x\n", newpc, previous_pc);
m68k_dumpstate(NULL);
const char *arg[4] = {"mon", "-m", "-r", NULL};
mon(3, arg);
@ -221,7 +221,7 @@ static __inline__ void m68k_incpc (uae_s32 delta)
#if ENABLE_MON
uaecptr next_pc = m68k_getpc();
if (IS_BREAK_POINT(next_pc)) {
printf("Stopped at break point address: %08lx. Last PC: %08lx\n", next_pc, previous_pc);
printf("Stopped at break point address: %08x. Last PC: %08x\n", next_pc, previous_pc);
m68k_dumpstate(NULL);
const char *arg[4] = {"mon", "-m", "-r", NULL};
mon(3, arg);