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

Clean-ups: comments, ticks per sec output, don't restore r13 twice.

Browse Source
This commit is contained in:
gbeauche 2005-06-28 16:50:30 +00:00
parent 38d03d02e9
commit 7ac6ad2f46
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SheepShaver/src/Unix/main_unix.cpp
View File

@ -257,8 +257,8 @@ static void build_sigregs(sigregs *srp, machine_regs *mrp)
// Global variables (exported) // Global variables (exported)
#if !EMULATED_PPC #if !EMULATED_PPC
void *TOC = NULL; // Pointer to Thread Local Storage (r2) void *TOC = NULL; // Pointer to Thread Local Storage (r2)
void *R13 = NULL; // Pointer to .sdata section (r13 under Linux) void *R13 = NULL; // Pointer to .sdata section (r13 under Linux)
#endif #endif
uint32 RAMBase; // Base address of Mac RAM uint32 RAMBase; // Base address of Mac RAM
uint32 RAMSize; // Size of Mac RAM uint32 RAMSize; // Size of Mac RAM
@ -1389,7 +1389,7 @@ static void *tick_func(void *arg)
} }
uint64 end = GetTicks_usec(); uint64 end = GetTicks_usec();
D(bug("%Ld ticks in %Ld usec = %f ticks/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start))); D(bug("%lld ticks in %lld usec = %f ticks/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
return NULL; return NULL;
} }

1
SheepShaver/src/Unix/ppc_asm.S
View File

@ -245,7 +245,6 @@ C_SYMBOL_NAME(jump_to_rom):
// Restore PowerPC registers // Restore PowerPC registers
lwz r1,XLM_EMUL_RETURN_STACK(0) lwz r1,XLM_EMUL_RETURN_STACK(0)
RESTORE_SYSTEM_R2 RESTORE_SYSTEM_R2
RESTORE_SYSTEM_R13
lmw r13,20(r1) lmw r13,20(r1)
lfd f14,20+19*4+0*8(r1) lfd f14,20+19*4+0*8(r1)
lfd f15,20+19*4+1*8(r1) lfd f15,20+19*4+1*8(r1)