Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-10-17 08:25:43 +00:00
Code Issues Projects Releases Wiki Activity

Enable FLIGHT_RECORDER for generated code but don't record registers in

Browse Source 
that case (yet).
This commit is contained in:
gbeauche 2005-06-04 16:47:14 +00:00
parent a4caa8ab09
commit 08c4acd21f
3 changed files with 63 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
BasiliskII/src/uae_cpu/compiler/compemu_support.cpp
View File

@ -6738,6 +6738,19 @@ static void compile_block(cpu_history* pc_hist, int blocklen)
cputbl=cpufunctbl; cputbl=cpufunctbl;
comptbl=compfunctbl; comptbl=compfunctbl;
} }
#if FLIGHT_RECORDER
{
mov_l_ri(S1, get_virtual_address((uae_u8 *)(pc_hist[i].location)) | 1);
clobber_flags();
remove_all_offsets();
int arg = readreg_specific(S1,4,REG_PAR1);
prepare_for_call_1();
unlock2(arg);
prepare_for_call_2();
raw_call((uintptr)m68k_record_step);
}
#endif
failure = 1; // gb-- defaults to failure state failure = 1; // gb-- defaults to failure state
if (comptbl[opcode] && optlev>1) { if (comptbl[opcode] && optlev>1) {
@ -7025,6 +7038,9 @@ void exec_nostats(void)
{ {
for (;;) { for (;;) {
uae_u32 opcode = GET_OPCODE; uae_u32 opcode = GET_OPCODE;
#if FLIGHT_RECORDER
m68k_record_step(m68k_getpc());
#endif
(*cpufunctbl[opcode])(opcode); (*cpufunctbl[opcode])(opcode);
if (end_block(opcode) || SPCFLAGS_TEST(SPCFLAG_ALL)) { if (end_block(opcode) || SPCFLAGS_TEST(SPCFLAG_ALL)) {
return; /* We will deal with the spcflags in the caller */ return; /* We will deal with the spcflags in the caller */

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

@ -55,12 +55,14 @@ cpuop_func *cpufunctbl[65536];
#if FLIGHT_RECORDER #if FLIGHT_RECORDER
struct rec_step { struct rec_step {
uae_u32 pc;
#if FLIGHT_RECORDER >= 2
uae_u32 d[8]; uae_u32 d[8];
uae_u32 a[8]; uae_u32 a[8];
uae_u32 pc; #endif
}; };
const int LOG_SIZE = 8192; const int LOG_SIZE = 32768;
static rec_step log[LOG_SIZE]; static rec_step log[LOG_SIZE];
static int log_ptr = -1; // First time initialization static int log_ptr = -1; // First time initialization
@ -72,10 +74,16 @@ static const char *log_filename(void)
void m68k_record_step(uaecptr pc) void m68k_record_step(uaecptr pc)
{ {
for (int i = 0; i < 8; i++) { #if FLIGHT_RECORDER >= 2
log[log_ptr].d[i] = m68k_dreg(regs, i); /* XXX: if LSB is set, we are recording from generated code and we
log[log_ptr].a[i] = m68k_areg(regs, i); don't support registers recording yet. */
if ((pc & 1) == 0) {
for (int i = 0; i < 8; i++) {
log[log_ptr].d[i] = m68k_dreg(regs, i);
log[log_ptr].a[i] = m68k_areg(regs, i);
}
} }
#endif
log[log_ptr].pc = pc; log[log_ptr].pc = pc;
log_ptr = (log_ptr + 1) % LOG_SIZE; log_ptr = (log_ptr + 1) % LOG_SIZE;
} }
@ -87,19 +95,34 @@ static void dump_log(void)
return; return;
for (int i = 0; i < LOG_SIZE; i++) { for (int i = 0; i < LOG_SIZE; i++) {
int j = (i + log_ptr) % LOG_SIZE; int j = (i + log_ptr) % LOG_SIZE;
fprintf(f, "pc %08x\n", log[j].pc); uae_u32 pc = log[j].pc & ~1;
fprintf(f, "d0 %08x d1 %08x d2 %08x d3 %08x\n", log[j].d[0], log[j].d[1], log[j].d[2], log[j].d[3]); fprintf(f, "pc %08x", pc);
fprintf(f, "d4 %08x d5 %08x d6 %08x d7 %08x\n", log[j].d[4], log[j].d[5], log[j].d[6], log[j].d[7]); #if FLIGHT_RECORDER >= 2
fprintf(f, "a0 %08x a1 %08x a2 %08x a3 %08x\n", log[j].a[0], log[j].a[1], log[j].a[2], log[j].a[3]); fprintf(f, "\n");
fprintf(f, "a4 %08x a5 %08x a6 %08x a7 %08x\n", log[j].a[4], log[j].a[5], log[j].a[6], log[j].a[7]); if ((log[j].pc & 1) == 0) {
fprintf(f, "d0 %08x d1 %08x d2 %08x d3 %08x\n", log[j].d[0], log[j].d[1], log[j].d[2], log[j].d[3]);
fprintf(f, "d4 %08x d5 %08x d6 %08x d7 %08x\n", log[j].d[4], log[j].d[5], log[j].d[6], log[j].d[7]);
fprintf(f, "a0 %08x a1 %08x a2 %08x a3 %08x\n", log[j].a[0], log[j].a[1], log[j].a[2], log[j].a[3]);
fprintf(f, "a4 %08x a5 %08x a6 %08x a7 %08x\n", log[j].a[4], log[j].a[5], log[j].a[6], log[j].a[7]);
}
#else
fprintf(f, " | ");
#endif
#if ENABLE_MON #if ENABLE_MON
disass_68k(f, log[j].pc); disass_68k(f, pc);
#endif #endif
} }
fclose(f); fclose(f);
} }
#endif #endif
#if ENABLE_MON
static void dump_regs(void)
{
m68k_dumpstate(NULL);
}
#endif
#define COUNT_INSTRS 0 #define COUNT_INSTRS 0
#if COUNT_INSTRS #if COUNT_INSTRS
@ -1152,15 +1175,21 @@ void m68k_reset (void)
fpu_reset(); fpu_reset();
#if FLIGHT_RECORDER #if FLIGHT_RECORDER
#if ENABLE_MON
if (log_ptr == -1) {
// Install "log" command in mon
mon_add_command("log", dump_log, "log Dump m68k emulation log\n");
}
#endif
log_ptr = 0; log_ptr = 0;
memset(log, 0, sizeof(log)); memset(log, 0, sizeof(log));
#endif #endif
#if ENABLE_MON
static bool first_time = true;
if (first_time) {
first_time = false;
mon_add_command("regs", dump_regs, "regs Dump m68k emulator registers\n");
#if FLIGHT_RECORDER
// Install "log" command in mon
mon_add_command("log", dump_log, "log Dump m68k emulation log\n");
#endif
}
#endif
} }
void m68k_emulop_return(void) void m68k_emulop_return(void)

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

@ -282,7 +282,7 @@ extern struct cputbl op_smalltbl_3_ff[];
extern struct cputbl op_smalltbl_4_ff[]; extern struct cputbl op_smalltbl_4_ff[];
#if FLIGHT_RECORDER #if FLIGHT_RECORDER
extern void m68k_record_step(uaecptr); extern void m68k_record_step(uaecptr) REGPARAM;
#endif #endif
extern void m68k_do_execute(void); extern void m68k_do_execute(void);
extern void m68k_execute(void); extern void m68k_execute(void);