More interning.

pawn-lang · Oct 16, 2023 · 323413e · 323413e
1 parent fd9a357
commit 323413e
Show file tree

Hide file tree

Showing 21 changed files with 170 additions and 177 deletions.
diff --git a/YSI_Coding/y_timers/y_timers_impl.inc b/YSI_Coding/y_timers/y_timers_impl.inc
@@ -344,13 +344,13 @@ stock _y@T:_Timer_D(const func[], interval, const {_, _@yT}:action, who, results
 				{
 					if (!results[who])
 					{
-						results[who] = YSI_SetTimerEx__(func, interval, true, "i", who);
+						results[who] = YSI_SetTimerEx__(func, interval, true, YSI_gcI, who);
 					}
 				}
 			}
 			else if (!results[who])
 			{
-				results[who] = YSI_SetTimerEx__(func, interval, true, "i", who);
+				results[who] = YSI_SetTimerEx__(func, interval, true, YSI_gcI, who);
 			}
 		}
 	}

diff --git a/YSI_Core/y_core/y_interning.inc b/YSI_Core/y_core/y_interning.inc
@@ -131,6 +131,16 @@ stock const
 stock const
 	YSI_gcIIII[] = "iiii";
 
+/*-------------------------------------------------------------------------*//**
+ * <library>y_interning</library>
+ * <remarks>
+ *   The string <c>f</c> defined just once for repeated use.
+ * </remarks>
+ *//*------------------------------------------------------------------------**/
+
+stock const
+	YSI_gcF[] = "f";
+
 /*-------------------------------------------------------------------------*//**
  * <library>y_interning</library>
  * <remarks>
@@ -141,6 +151,16 @@ stock const
 stock const
 	YSI_gcS[] = "s";
 
+/*-------------------------------------------------------------------------*//**
+ * <library>y_interning</library>
+ * <remarks>
+ *   The string <c>si</c> defined just once for repeated use.
+ * </remarks>
+ *//*------------------------------------------------------------------------**/
+
+stock const
+	YSI_gcSI[] = "si";
+
 /*-------------------------------------------------------------------------*//**
  * <library>y_interning</library>
  * <remarks>

diff --git a/YSI_Core/y_core/y_samp_natives.inc b/YSI_Core/y_core/y_samp_natives.inc
@@ -134,19 +134,25 @@ static stock const
 
 @_yT(addr);
 
+static moskmdfkod;
+
 @_yT(addr)
 {
 	// Reset the frame.
 	#emit POP.pri
 	#emit SCTRL        5
 	// Get the return address (always 0).
+	printf("1");
 	#emit POP.alt
 	// Decrease the parameter count.
 	#emit POP.pri
 	#emit ADD.C        __m1_cell
 	// Get the target address.
 	#emit SWAP.pri
 	#emit PUSH.alt
+	#emit STOR.pri moskmdfkod
+	printf("2: %08x", moskmdfkod);
+	#emit LOAD.pri moskmdfkod
 	#emit SCTRL        __cip
 }
 
@@ -175,9 +181,10 @@ native YSI_SetTimerEx__(const funcname[], interval, bool:repeating, const format
  * </remarks>
  *//*------------------------------------------------------------------------**/
 
-stock SetTimerAddr(addr, time, bool:repeat)
+stock SetTimerAddr(addr, const name[], time, bool:repeat)
 {
-	return YSI_SetTimerEx__(YSI_gscTimerStub, time, repeat, "i", addr);
+	printf("Setting timer %s = %08x", name, addr);
+	return YSI_SetTimerEx__(YSI_gscTimerStub, time, repeat, YSI_gcI, addr);
 }
 
 #if defined _ALS_SetTimer
@@ -186,11 +193,12 @@ stock SetTimerAddr(addr, time, bool:repeat)
 #define _ALS_SetTimer
 
 // Force all function passed to `SetTimer` to have no parameters.
-#define @yS2:addressof(%0<%9><>) @yS2:addressof(%0<>)
+//#define @yS2:addressof(%0<%9><>) @yS2:addressof(%0<>)
+#define @yS2:addressof(%0<%9><>),%9, @yS2:addressof(%0<>),#%0,
 
-#define SetTimer(&%0,%1) SetTimerAddr(_:@yS2:addressof(%0<>),%1)
-#define YSI_SetTimer__(&%0,%1) SetTimerAddr(_:@yS2:addressof(%0<>),%1)
-#define SetTimerAddr(&%0,%1) SetTimerAddr(_:@yS2:addressof(%0<>),%1)
+#define SetTimer(&%0,%1) SetTimerAddr(_:@yS2:addressof(%0<>),#%0,%1)
+#define YSI_SetTimer__(&%0,%1) SetTimerAddr(_:@yS2:addressof(%0<>),#%0,%1)
+#define SetTimerAddr(&%0,%1) SetTimerAddr(_:@yS2:addressof(%0<>),#%0,%1)
 
 /*-------------------------------------------------------------------------*//**
  * <library>y_samp_natives</library>
@@ -199,10 +207,11 @@ stock SetTimerAddr(addr, time, bool:repeat)
  * </remarks>
  *//*------------------------------------------------------------------------**/
 
-stock SetTimerExAddr(addr, time, bool:repeat, const fmt[], GLOBAL_TAG_TYPES:...)
+stock SetTimerExAddr(addr, const name[], time, bool:repeat, const fmt[], GLOBAL_TAG_TYPES:...)
 {
 	Q@ = "i",
 	strcat(Q@, fmt, sizeof (Q@));
+	printf("Setting timer %s = %08x, %s, %s", name, addr, fmt, Q@);
 
 	// Shuffle the parameters a bit, so it becomes:
 	// (time, repeat, "i" + fmt, addr)
@@ -248,14 +257,16 @@ stock SetTimerExAddr(addr, time, bool:repeat, const fmt[], GLOBAL_TAG_TYPES:...)
 
 // Normal addressof.
 // TODO: Extract the format specifier.
-#define @yS0:@yS1:addressof(%0<%8>) addressof(%0<%8>)
+//#define @yS0:@yS1:addressof(%0<%8>) addressof(%0<%8>)
+#define @yS0:@yS1:addressof(%0<%8>),#%9, addressof(%0<%8>),#%0,
 // Ensure the parameters are correct.
 #define Y_HOOKS_ADDRESSOF(%0(%1)) (O@D_:O@A_())?(((_:%0(%1)),O@V_)?1:2):(O@V_)
-#define @yS1:addressof(%0),%1,%2,%3,%4) (Y_HOOKS_ADDRESSOF(%0(%4))),%1,%2,%3,%4)
+//#define @yS1:addressof(%0),%1,%2,%3,%4) (Y_HOOKS_ADDRESSOF(%0(%4))),%1,%2,%3,%4)
+#define @yS1:addressof(%0),#%9,%1,%2,%3,%4) (Y_HOOKS_ADDRESSOF(%0(%4))),#%0,%1,%2,%3,%4)
 
-#define SetTimerEx(&%0,%1) SetTimerExAddr(_:@yS0:@yS1:addressof(%0),%1)
-#define YSI_SetTimerEx__(&%0,%1) SetTimerExAddr(_:@yS0:@yS1:addressof(%0),%1)
-#define SetTimerExAddr(&%0,%1) SetTimerExAddr(_:@yS0:@yS1:addressof(%0),%1)
+#define SetTimerEx(&%0,%1) SetTimerExAddr(_:@yS0:@yS1:addressof(%0),#%0,%1)
+#define YSI_SetTimerEx__(&%0,%1) SetTimerExAddr(_:@yS0:@yS1:addressof(%0),#%0,%1)
+#define SetTimerExAddr(&%0,%1) SetTimerExAddr(_:@yS0:@yS1:addressof(%0),#%0,%1)
 
 /*-------------------------------------------------------------------------*//**
  * <library>y_samp_natives</library>