profiler disables LoadTestPatches

Author: niko1point0

rewrite/src/hooks/dll/load_decomp.c

@@ -7,15 +7,20 @@ void LoadDecomp()
 {
     const u32 testAddr = 0x80600000;
     const u32 decompAddr = 0x80200000;
+    const u32 profilerAddr = 0x80500000;
     char dummy;
+	
     ND_LOAD_InitCD();
-    ND_LOAD_XnfFile("\\TESTS.BIN;1", testAddr, &dummy);
-    LoadTestPatches();
+	
+	#ifndef REWRITE_PROFILER
+		ND_LOAD_XnfFile("\\TESTS.BIN;1", testAddr, &dummy);
+		LoadTestPatches();
+	#endif
+	
     ND_LOAD_XnfFile("\\DECOMP.BIN;1", decompAddr, &dummy);
 
-	#ifdef REWRITE_PROFILER // ctr/profiler.h
-    const u32 profilerAddr = 0x80500000;
-    ND_LOAD_XnfFile("\\PROFILER.BIN;1", profilerAddr, &dummy);
-	LoadProfilerPatches();
+	#ifdef REWRITE_PROFILER
+		ND_LOAD_XnfFile("\\PROFILER.BIN;1", profilerAddr, &dummy);
+		LoadProfilerPatches();
 	#endif
 }

rewrite/src/profiler/benchmark.h

@@ -22,6 +22,8 @@ void RunTest_RW_COLL_PPTE_STACK()
 	{
 		COLL_ProjectPointToEdge(&out, &v1, &v2, &point);
 	}
+	
+	ND_printf("Done\n");
 }
 
 void RunTest_ND_COLL_PPTE_STACK()
@@ -36,14 +38,13 @@ void RunTest_ND_COLL_PPTE_STACK()
 	SVec3 v2 = {0xFD00, 0x2EC, 0xEA58};
 	SVec3 point = {0xFD6F, 0x2F5, 0xEDCE};
 
-	// Revert the Hook from OG -> DECOMP
-	PatchFunction_Beg((u32*)(&ND_COLL_ProjectPointToEdge));
-	
 	// million
 	for(int i = 0; i < 1000000; i++)
 	{
 		ND_COLL_ProjectPointToEdge(&out, &v1, &v2, &point);
 	}
+	
+	ND_printf("Done\n");
 }
 
 void RunTest_RW_COLL_PPTE_SCRATCH()
@@ -74,6 +75,8 @@ void RunTest_RW_COLL_PPTE_SCRATCH()
 	{
 		COLL_ProjectPointToEdge(out, v1, v2, point);
 	}
+	
+	ND_printf("Done\n");
 }
 
 void RunTest_ND_COLL_PPTE_SCRATCH()
@@ -99,14 +102,13 @@ void RunTest_ND_COLL_PPTE_SCRATCH()
 	point->v[1] = 0x2F5;
 	point->v[2] = 0xEDCE;
 
-	// Revert the Hook from OG -> DECOMP
-	PatchFunction_Beg((u32*)(&ND_COLL_ProjectPointToEdge));
-	
 	// million
 	for(int i = 0; i < 1000000; i++)
 	{
 		ND_COLL_ProjectPointToEdge(out, v1, v2, point);
 	}
+	
+	ND_printf("Done\n");
 }
 
 // Always run RW (rewrite) before OG (original)

rewrite/src/profiler/profiler.c

@@ -131,8 +131,10 @@ void RunTest()
 		ND_EnterCriticalSection();
 
 		ND_ResetRCnt(0xf2000001);
+		ND_printf("%d\n", ND_GetRCnt(0xf2000001));
 		tests[testIndex].funcPtr();
 		tests[testIndex].val = ND_GetRCnt(0xf2000001);
+		ND_printf("%d\n", ND_GetRCnt(0xf2000001));
 
 		ND_ExitCriticalSection();