diff --git a/em.c b/em.c index a086d42..04ff7dd 100644 --- a/em.c +++ b/em.c @@ -8634,7 +8634,7 @@ dfcmdr: case 011: TRACE(T_FLOW, " LH\n"); if (*(int *)&ea < 0) { - TRACE(T_FLOW, " ea=%x, immu32=%lx, gr%d=%x\n", ea, immu32, dr, getgr32(dr)); + TRACE(T_FLOW, " ea=%x, immu32=%x, gr%d=%x\n", ea, immu32, dr, getgr32(dr)); putgr16(dr, immu32 >> 16); } else putgr16(dr, get16(ea)); @@ -9239,7 +9239,7 @@ imodepcl: case 055: if (*(int *)&ea < 0) { TRACE(T_FLOW, " ACP\n"); - TRACE(T_INST, " before acp, gr%d=%o/%o, immu32=%lu, CP(dr)=%d\n", dr, getgr32(dr)>>16, getgr32(dr)&0xFFFF, immu32, EACP(getgr32(dr))); + TRACE(T_INST, " before acp, gr%d=%o/%o, immu32=%u, CP(dr)=%d\n", dr, getgr32(dr)>>16, getgr32(dr)&0xFFFF, immu32, EACP(getgr32(dr))); utempl = EACP(getgr32(dr)); utempl += *(int *)&immu32; putgr32(dr, CPEA(getgr32(dr), utempl)); diff --git a/makefile b/makefile index e099a0c..8071a07 100644 --- a/makefile +++ b/makefile @@ -14,7 +14,7 @@ em: # production (Intel) emp: # production (PowerPC) - cc -arch ppc -DREV=\"${REV}\" -DNOTRACE -DFAST -DNOMEM -O -c em.c -fobey-inline -mdynamic-no-pic -Idongle/mx/ppc/api;g++ -arch ppc -o em em.o dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation + cc -arch ppc -mmacosx-version-min=10.4 -DNOREGS -DREV=\"${REV}\" -DNOTRACE -DFAST -DNOMEM -O -c em.c -fobey-inline -mdynamic-no-pic -Idongle/mx/ppc/api;g++ -arch ppc -o em em.o dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation strip em rm em.o @@ -27,7 +27,7 @@ debug: # gdb (Intel) debugp: # gdb (PowerPC) - cc -arch ppc -DREV=\"${REV}\" -DNOREGS -g -O0 -DNOTRACE -DFAST -c em.c -fobey-inline -mdynamic-no-pic -Idongle/mx/ppc/api;g++ -arch ppc -o em em.o dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation + cc -arch ppc -mmacosx-version-min=10.4 -DREV=\"${REV}\" -DNOREGS -g -O0 -DNOTRACE -DFAST -c em.c -fobey-inline -mdynamic-no-pic -Idongle/mx/ppc/api;g++ -arch ppc -o em em.o dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation rm em.o @@ -38,7 +38,7 @@ trace: # tracing + gdb (Intel) tracep: # tracing + gdb (PowerPC) - cc -arch ppc -DREV=\"${REV}\" -DNOREGS -g -O0 -DNOFAST -c em.c -fobey-inline -mdynamic-no-pic -Idongle/mx/ppc/api;g++ -arch ppc -o em em.o dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation + cc -arch ppc -mmacosx-version-min=10.4 -DREV=\"${REV}\" -DNOREGS -g -O0 -DNOFAST -c em.c -fobey-inline -mdynamic-no-pic -Idongle/mx/ppc/api;g++ -arch ppc -o em em.o dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation vfy: # prod + tracing to verify em changes (Intel) @@ -48,7 +48,7 @@ vfy: # prod + tracing to verify em changes (Intel) vfyp: # prod + tracing to verify em changes (PowerPC) - cc -arch ppc -DREV=\"\" -O -DFAST -c em.c -fobey-inline -mdynamic-no-pic -Idongle/mx/ppc/api;g++ -arch ppc -o em em.o dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation + cc -arch ppc -mmacosx-version-min=10.4 -DREV=\"\" -O -DFAST -c em.c -fobey-inline -mdynamic-no-pic -Idongle/mx/ppc/api;g++ -arch ppc -o em em.o dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation fixed: # fixed clock rate, gdb (Intel) @@ -59,7 +59,7 @@ fixed: # fixed clock rate, gdb (Intel) fixedp: # fixed clock rate, gdb (PowerPC) - cc -arch ppc -DREV=\"${REV}\" -DFIXEDCLOCK -DNOIDLE -DNOREGS -g -O0 -DFAST -c em.c -fobey-inline -mdynamic-no-pic -Idongle/mx/ppc/api;g++ -arch ppc -o em em.o dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation + cc -arch ppc -mmacosx-version-min=10.4 -DREV=\"${REV}\" -DFIXEDCLOCK -DNOIDLE -DNOREGS -g -O0 -DFAST -c em.c -fobey-inline -mdynamic-no-pic -Idongle/mx/ppc/api;g++ -arch ppc -o em em.o dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation rm em.o