From 7ac6ad2f46a3716b165456c5b0126238e31b6f1c Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Tue, 28 Jun 2005 16:50:30 +0000
Subject: [PATCH] Clean-ups: comments, ticks per sec output, don't restore r13
 twice.

---
 SheepShaver/src/Unix/main_unix.cpp | 6 +++---
 SheepShaver/src/Unix/ppc_asm.S     | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/SheepShaver/src/Unix/main_unix.cpp b/SheepShaver/src/Unix/main_unix.cpp
index 2c9aec36..b5f03516 100644
--- a/SheepShaver/src/Unix/main_unix.cpp
+++ b/SheepShaver/src/Unix/main_unix.cpp
@@ -257,8 +257,8 @@ static void build_sigregs(sigregs *srp, machine_regs *mrp)
 
 // Global variables (exported)
 #if !EMULATED_PPC
-void *TOC = NULL;			// Pointer to Thread Local Storage (r2)
-void *R13 = NULL;			// Pointer to .sdata section (r13 under Linux)
+void *TOC = NULL;		// Pointer to Thread Local Storage (r2)
+void *R13 = NULL;		// Pointer to .sdata section (r13 under Linux)
 #endif
 uint32 RAMBase;			// Base address of Mac RAM
 uint32 RAMSize;			// Size of Mac RAM
@@ -1389,7 +1389,7 @@ static void *tick_func(void *arg)
 	}
 
 	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;
 }
 
diff --git a/SheepShaver/src/Unix/ppc_asm.S b/SheepShaver/src/Unix/ppc_asm.S
index 83761b20..3175d632 100644
--- a/SheepShaver/src/Unix/ppc_asm.S
+++ b/SheepShaver/src/Unix/ppc_asm.S
@@ -245,7 +245,6 @@ C_SYMBOL_NAME(jump_to_rom):
 	// Restore PowerPC registers
 	lwz	r1,XLM_EMUL_RETURN_STACK(0)
 	RESTORE_SYSTEM_R2
-	RESTORE_SYSTEM_R13
 	lmw	r13,20(r1)
 	lfd	f14,20+19*4+0*8(r1)
 	lfd	f15,20+19*4+1*8(r1)