amx: imply AMX_TOKENTHREADING when AMX_DONT_RELOCATE is set.

All assembler cores: remove OP_SYSREQ_D & OP_SYSREQ_ND opcodes when AMX_DONT_RELOCATE is set.
GNU assembler cores: copy C preprocessor macros to assembler equates (so these cores can be built with GCC).
Cortex M0 core: various bug fixes.
Compiler: #pragma opcodeset.

Author: compuphase

amx/amx.c

@@ -14,7 +14,7 @@
  *  License for the specific language governing permissions and limitations
  *  under the License.
  *
- *  Version: $Id: amx.c 6966 2023-07-20 18:46:01Z thiadmer $
+ *  Version: $Id: amx.c 6973 2023-08-05 20:07:04Z thiadmer $
  */
 
 #define WIN32_LEAN_AND_MEAN
@@ -101,7 +101,8 @@
   #define AMX_CLONE             /* amx_Clone() */
   #define AMX_EXEC              /* amx_Exec() */
   #define AMX_FLAGS             /* amx_Flags() */
-  #define AMX_INIT              /* amx_Init() and amx_InitJIT() */
+  #define AMX_INIT              /* amx_Init() */
+  #define AMX_JIT               /* amx_InitJIT() and other JIT support */
   #define AMX_MEMINFO           /* amx_MemInfo() */
   #define AMX_NAMELENGTH        /* amx_NameLength() */
   #define AMX_NATIVEINFO        /* amx_NativeInfo() */
@@ -146,7 +147,10 @@
   #define AMX_ALTCORE
 #endif
 #if !defined AMX_NO_PACKED_OPC && !defined AMX_TOKENTHREADING
-  #define AMX_TOKENTHREADING    /* packed opcodes require token threading */
+  #define AMX_TOKENTHREADING    /* packed opcodes require token threading (or switch threading) */
+#endif
+#if defined AMX_DONT_RELOCATE
+  #define AMX_TOKENTHREADING    /* direct threading cannot be used when opcodes cannot be relocated */
 #endif
 
 #if defined __64BIT__
@@ -564,25 +568,27 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, const cell *params)
    * This trick cannot work in the JIT, because the program would need to
    * be re-JIT-compiled after patching a P-code instruction.
    */
-  assert((amx->flags & AMX_FLAG_JITC)==0 || amx->sysreq_d==0);
-  if (amx->sysreq_d!=0) {
-    /* at the point of the call, the CIP pseudo-register points directly
-     * behind the SYSREQ(.N) instruction and its parameter(s)
-     */
-    unsigned char *code=amx->code+(int)amx->cip-sizeof(cell);
-    if (amx->flags & AMX_FLAG_SYSREQN)		/* SYSREQ.N has 2 parameters */
-      code-=sizeof(cell);
-    assert(amx->code!=NULL);
-    assert(amx->cip>=4 && amx->cip<(hdr->dat - hdr->cod));
-    assert(sizeof(f)<=sizeof(cell)); /* function pointer must fit in a cell */
-    assert(*(cell*)code==index);
-    #if defined AMX_TOKENTHREADING || !(defined __GNUC__ || defined __ICC || defined AMX_ASM || defined AMX_JIT)
-      assert(!(amx->flags & AMX_FLAG_SYSREQN) && *(cell*)(code-sizeof(cell))==OP_SYSREQ
-             || (amx->flags & AMX_FLAG_SYSREQN) && *(cell*)(code-sizeof(cell))==OP_SYSREQ_N);
-    #endif
-    *(cell*)(code-sizeof(cell))=amx->sysreq_d;
-    *(cell*)code=(cell)(intptr_t)f;
-  } /* if */
+  #if !defined AMX_DONT_RELOCATE
+    assert((amx->flags & AMX_FLAG_JITC)==0 || amx->sysreq_d==0);
+    if (amx->sysreq_d!=0) {
+      /* at the point of the call, the CIP pseudo-register points directly
+       * behind the SYSREQ(.N) instruction and its parameter(s)
+       */
+      unsigned char *code=amx->code+(int)amx->cip-sizeof(cell);
+      if (amx->flags & AMX_FLAG_SYSREQN)    /* SYSREQ.N has 2 parameters */
+        code-=sizeof(cell);
+      assert(amx->code!=NULL);
+      assert(amx->cip>=4 && amx->cip<(hdr->dat - hdr->cod));
+      assert(sizeof(f)<=sizeof(cell)); /* function pointer must fit in a cell */
+      assert(*(cell*)code==index);
+      #if defined AMX_TOKENTHREADING || !(defined __GNUC__ || defined __ICC || defined AMX_ASM || defined AMX_JIT)
+        assert(!(amx->flags & AMX_FLAG_SYSREQN) && *(cell*)(code-sizeof(cell))==OP_SYSREQ
+               || (amx->flags & AMX_FLAG_SYSREQN) && *(cell*)(code-sizeof(cell))==OP_SYSREQ_N);
+      #endif
+      *(cell*)(code-sizeof(cell))=amx->sysreq_d;
+      *(cell*)code=(cell)(intptr_t)f;
+    } /* if */
+  #endif
 
   /* Note:
    *   params[0] == number of bytes for the additional parameters passed to the native function
@@ -1334,13 +1340,13 @@ int AMXAPI amx_Init(AMX *amx,void *program)
         char pathbuf[PROC_PIDPATHINFO_MAXSIZE];
         int ret=proc_pidpath(getpid(), pathbuf, sizeof(pathbuf));
         if (ret>0) {
-		  char ptr=strrchr(pathbuf,'/');
-		  assert(ptr!=NULL);
+          char ptr=strrchr(pathbuf,'/');
+          assert(ptr!=NULL);
           *ptr='\0';
           asprintf(&ptr,"%s/%s",pathbuf,libname);
-		  assert(ptr!=NULL);
+          assert(ptr!=NULL);
           hlib=dlopen(ptr,RTLD_NOW);
-		  free(ptr);
+          free(ptr);
         }
         if (hlib==NULL) {
           /* if failed, try to search elsewhere */
@@ -1457,16 +1463,6 @@ int AMXAPI amx_InitJIT(AMX *amx, void *reloc_table, void *native_code)
   return (res == 0) ? AMX_ERR_NONE : AMX_ERR_INIT_JIT;
 }
 
-#else /* #if defined AMX_JIT */
-
-int AMXAPI amx_InitJIT(AMX *amx,void *compiled_program,void *reloc_table)
-{
-  (void)amx;
-  (void)compiled_program;
-  (void)reloc_table;
-  return AMX_ERR_INIT_JIT;
-}
-
 #endif  /* #if defined AMX_JIT */
 
 #endif  /* AMX_INIT */

amx/amxexec_arm7.s

@@ -29,7 +29,7 @@
 ;   License for the specific language governing permissions and limitations
 ;   under the License.
 ;
-;   Version: $Id: amxexec_arm7.s 6131 2020-04-29 19:47:15Z thiadmer $
+;   Version: $Id: amxexec_arm7.s 6973 2023-08-05 20:07:04Z thiadmer $
 
 
     AREA    amxexec_data, DATA, READONLY
@@ -1033,6 +1033,10 @@ OP_CASETBL_OVL
     mov r11, #AMX_ERR_INVINSTR  ; these instructions are no longer supported
     b   amx_exit
 
+
+   ; patched instructions
+ IF :LNOT::DEF:AMX_DONT_RELOCATE
+
 OP_SYSREQ_D                     ; tested
     GETPARAM r12                ; address of native function in r12
     ; store stack and heap state AMX state
@@ -1084,6 +1088,15 @@ OP_SYSREQ_ND                    ; tested
     bne amx_exit                ; yes -> quit
     NEXT
 
+ ELSE  ; AMX_DONT_RELOCATE
+
+OP_SYSREQ_D
+OP_SYSREQ_ND
+    mov r11, #AMX_ERR_INVINSTR  ; relocation disabled -> patched instructions should not be present
+    b   amx_exit
+
+ ENDIF ; AMX_DONT_RELOCATE
+
 
     ; overlay instructions
  IF :LNOT::DEF:AMX_NO_OVERLAY

amx/amxexec_arm7_gas.s

@@ -15,7 +15,7 @@
 @   machine.
 @
 @
-@   Copyright (c) CompuPhase, 2006-2020
+@   Copyright (c) CompuPhase, 2006-2023
 @
 @   Licensed under the Apache License, Version 2.0 (the "License"); you may not
 @   use this file except in compliance with the License. You may obtain a copy
@@ -29,11 +29,34 @@
 @   License for the specific language governing permissions and limitations
 @   under the License.
 @
-@   Version: $Id: amxexec_arm7_gas.s 6131 2020-04-29 19:47:15Z thiadmer $
+@   Version: $Id: amxexec_arm7_gas.s 6973 2023-08-05 20:07:04Z thiadmer $
 
     .file   "amxexec_arm7_gas.s"
     .syntax unified
 
+
+@ Copy GCC preprocessor definitions to assembler equates, so that the assembler
+@ file can be built with 'gcc' as well as 'as'.
+#if defined BIG_ENDIAN
+  .equ BIG_ENDIAN, 1
+#endif
+#if defined AMX_DONT_RELOCATE
+  .equ AMX_DONT_RELOCATE, 1
+#endif
+#if defined AMX_NO_MACRO_INSTR
+  .equ AMX_NO_MACRO_INSTR, 1
+#endif
+#if defined AMX_NO_OVERLAY
+  .equ AMX_NO_OVERLAY, 1
+#endif
+#if defined AMX_NO_PACKED_OPC
+  .equ AMX_NO_PACKED_OPC, 1
+#endif
+#if define AMX_TOKENTHREADING
+  .equ AMX_TOKENTHREADING, 1
+#endif
+
+
 .ifndef AMX_NO_PACKED_OPC
   .ifndef AMX_TOKENTHREADING
     .equ AMX_TOKENTHREADING, 1 @ packed opcodes require token threading
@@ -1024,6 +1047,10 @@ amx_exec_run:
     mov r11, #AMX_ERR_INVINSTR  @ these instructions are no longer supported
     b   .amx_exit
 
+
+    @ patched instructions
+.ifndef AMX_DONT_RELOCATE
+
 .OP_SYSREQ_D:                   @ tested
     GETPARAM r12                @ address of native function in r12
     @ store stack and heap state AMX state
@@ -1075,6 +1102,15 @@ amx_exec_run:
     bne .amx_exit               @ yes -> quit
     NEXT
 
+.else   @ AMX_DONT_RELOCATE
+
+.OP_SYSREQ_D:
+.OP_SYSREQ_ND:
+    mov r11, #AMX_ERR_INVINSTR  @ relocation disabled -> patched instructions should not be present
+    b   .amx_exit
+
+.endif  @ AMX_DONT_RELOCATE
+
 
     @ overlay instructions
 .ifndef AMX_NO_OVERLAY