Switch to using register names in all assembly.

Author: Alex Cole

amx_base.inc

@@ -43,8 +43,8 @@
 #endif
 
 #if __pawn_build >= 10
-	#define HasSysreqD() (bool:(__emit(zero.pri, lctrl 9, eq.c.pri 0)))
-	#define HasReloc() (bool:(__emit(zero.pri, lctrl 9, const.alt 512, and, eq.c.pri 0)))
+	#define HasSysreqD() (bool:(__emit(zero.pri, lctrl __flg, eq.c.pri 0)))
+	#define HasReloc() (bool:(__emit(zero.pri, lctrl __flg, const.alt 512, and, eq.c.pri 0)))
 #else
 	forward bool:HasSysreqD();
 	forward bool:HasReloc();
@@ -68,9 +68,9 @@ stock GetAmxBaseAddressNow() {
 	assert(HasReloc());
 
 	new cod = 0, dat = 0;
-	#emit lctrl 0
+	#emit lctrl __cod
 	#emit stor.s.pri cod
-	#emit lctrl 1
+	#emit lctrl __dat
 	#emit stor.s.pri dat
 
 	// Get code section start address relative to data.
@@ -84,7 +84,7 @@ stock GetAmxBaseAddressNow() {
 	// Get absolute address from the CALL instruction.
 	new fn_addr_reloc = 0, call_addr = 0;
 	GetAmxBaseAddress_helper();
-	#emit lctrl 6
+	#emit lctrl __cip
 	#emit stor.s.pri call_addr
 	#if cellbits == 32
 		call_addr = call_addr - 12 + code_start;
@@ -117,7 +117,7 @@ stock bool:HasSysreqD() {
 	// SA:MP doesn't have the AMX flags in register 9, open.mp does.  Thus if
 	// `pri` is 0 it wasn't set by the control register.
 	#emit zero.pri
-	#emit lctrl 9 // flags
+	#emit lctrl __flg // flags
 	#emit eq.c.pri 0
 	#emit retn
 
@@ -129,7 +129,7 @@ stock bool:HasReloc() {
 	// SA:MP doesn't have the AMX flags in register 9, open.mp does.  Thus if
 	// `pri` is 0 it wasn't set by the control register.
 	#emit zero.pri
-	#emit lctrl 9 // flags
+	#emit lctrl __flg // flags
 	#emit const.alt 512
 	#emit and
 	#emit eq.c.pri 0

amx_header.inc

@@ -198,7 +198,7 @@ forward PrintAmxHeader();
 /// <library>amx_assembly amx_header</library>
 stock GetRawAmxHeader(plain_amxhdr[AMX_HDR_CELLS]) {
 	new address = 0;
-	#emit lctrl 1  // DAT
+	#emit lctrl __dat  // DAT
 	#emit neg      // -DAT
 	#emit stor.s.pri address
 

amx_jit.inc

@@ -39,7 +39,7 @@
 /// <library>amx_assembly amx_jit</library>
 stock GetJITGeneratorVersion() {
 	#emit zero.pri
-	#emit lctrl 7
+	#emit lctrl __jit
 	#emit retn
 	return 0;
 }
@@ -50,7 +50,7 @@ stock GetAmxJITBaseAddress() {
 	// so short, checking if it had been done before would have been longer than
 	// just repeating the calculation.
 	#emit zero.pri
-	#emit lctrl 8
+	#emit lctrl __jmp
 	#emit retn
 	return 0;
 }
@@ -61,7 +61,7 @@ stock ResolveJITAddress(addr) {
 	// nothing.  Could make it try detect if this is already JIT resolved, i.e.
 	// is a return address.
 	#emit load.s.pri addr
-	#emit lctrl 8
+	#emit lctrl __jmp
 	#emit retn
 	return 0;
 }

amx_memory.inc

@@ -157,8 +157,8 @@ stock GetAmxHeapBase() {
 	const cells2 = 1 * cellbytes;
 	// Initial heap pointer.  Not stored in an accessible register so read it
 	// straight from the original header.
-	#emit lctrl 1  // DAT
-	#emit neg      // -DAT
+	#emit lctrl __dat  // DAT
+	#emit neg          // -DAT
 	#emit add.c cells0 // -DAT + 20
 	#emit push.pri
 	#emit lref.s.pri cells1
@@ -171,23 +171,23 @@ stock GetAmxHeapBase() {
 stock GetAmxHeapTop()
 {
 	// Current heap pointer.
-	#emit lctrl 2
+	#emit lctrl __hea
 	#emit retn
 	return 0;
 }
 
 /// <library>amx_assembly amx_memory</library>
 stock GetAmxStackBase()
 {
-	#emit lctrl 3
+	#emit lctrl __stp
 	#emit retn
 	return 0;
 }
 
 /// <library>amx_assembly amx_memory</library>
 stock GetAmxStackBottom() {
 	const cells0 = 3 * cellbytes;
-	#emit lctrl 4
+	#emit lctrl __stk
 	#emit add.c cells0
 	#emit retn
 	return 0;
@@ -207,29 +207,28 @@ stock GetAmxFrame()
 stock SetAmxHeapTop(ptr)
 {
 	#emit load.s.pri ptr
-	#emit sctrl 2
+	#emit sctrl __hea
 }
 
 /// <library>amx_assembly amx_memory</library>
 stock SetAmxStackBottom(ptr) {
 	const cells0 = 1 * cellbytes;
-	static
-		cip = 0;
+	static cip = 0;
 	// We need to be tricky here, because the return value is on the stack.
 	#emit load.s.alt ptr
 	// Store the return address.
 	#emit load.s.pri cells0
 	#emit stor.pri cip
 	// Reset the frame.
 	#emit load.s.pri 0
-	#emit sctrl 5
+	#emit sctrl __frm
 	// Modify the stack.
 	#emit move.pri
-	#emit sctrl 4
+	#emit sctrl __stk
 	// Return.
 	#emit load.pri cip
-	#emit sctrl 8
-	#emit sctrl 6
+	#emit sctrl __jmp
+	#emit sctrl __cip
 }
 
 /// <library>amx_assembly amx_memory</library>
@@ -241,12 +240,12 @@ stock SetAmxFrame(ptr) {
 	#emit load.s.alt cells0
 	// Modify the frame.
 	#emit load.s.pri ptr
-	#emit sctrl 5
+	#emit sctrl __frm
 	// Return.
 	#emit move.pri
 	#emit stack cells1
-	#emit sctrl 8
-	#emit sctrl 6
+	#emit sctrl __jmp
+	#emit sctrl __cip
 }
 
 /// <library>amx_assembly amx_memory</library>
@@ -255,12 +254,12 @@ stock SetAmxNextInstructionPointer(ptr) {
 	#emit load.s.alt ptr
 	// Reset the frame.
 	#emit load.s.pri 0
-	#emit sctrl 5
+	#emit sctrl __frm
 	// Return.
 	#emit move.pri
 	#emit stack cells0
-	#emit sctrl 8
-	#emit sctrl 6
+	#emit sctrl __jmp
+	#emit sctrl __cip
 }
 
 #if __pawn_build >= 10

codescan.inc

@@ -875,24 +875,24 @@ static stock CodeScanCall(const cs[CodeScanMatcher], matcher__, csState[CodeScan
 		#emit PUSH.S     param
 		#emit PUSH.S     csState
 		#emit PUSH.C     cells0
-		#emit LCTRL      6
+		#emit LCTRL      __cip
 		#emit ADD.C      cells1
-		#emit LCTRL      8
+		#emit LCTRL      __jmp
 		#emit PUSH.pri
 		#emit LOAD.S.pri func
-		#emit SCTRL      6
+		#emit SCTRL      __cip
 		#emit STOR.S.pri func
 	} else {
 		const cells2 = 1 * cellbytes;
 		const cells3 = 9 * cellbytes;
 		#emit PUSH.S     csState
 		#emit PUSH.C     cells2
-		#emit LCTRL      6
+		#emit LCTRL      __cip
 		#emit ADD.C      cells3
-		#emit LCTRL      8
+		#emit LCTRL      __jmp
 		#emit PUSH.pri
 		#emit LOAD.S.pri func
-		#emit SCTRL      6
+		#emit SCTRL      __cip
 		#emit STOR.S.pri func
 	}
 	return func;