Merge remote-tracking branch 'upstream/mob'

Author: TheTechsTech

.github/workflows/build.yml

@@ -29,25 +29,37 @@ jobs:
     - name: make & test tcc (aarch64-osx)
       run: ./configure && make && make test -k
 
-  test-x86-win32:
-    runs-on: windows-2019
-    timeout-minutes: 6
+  test-x86_64-win32:
+    runs-on: windows-2025
+    timeout-minutes: 4
     steps:
     - uses: actions/checkout@v4
     - name: make & test tcc (x86_64-win32)
       shell: cmd
       run: |
+        echo ::group:: setup msys mingw64-gcc
         set MSYS2_PATH_TYPE=inherit
         set MSYSTEM=MINGW64
         set CHERE_INVOKING=yes
+        C:\msys64\usr\bin\bash -l -c "pacman -S --noconfirm mingw-w64-x86_64-gcc"
+        echo ::endgroup::
         C:\msys64\usr\bin\bash -l -c "./configure && make && make test -k"
+
+  test-i386-win32:
+    runs-on: windows-2025
+    timeout-minutes: 4
+    steps:
+    - uses: actions/checkout@v4
     - name: make & test tcc (i386-win32)
       shell: cmd
       run: |
+        echo ::group:: setup msys mingw32-gcc
         set MSYS2_PATH_TYPE=inherit
         set MSYSTEM=MINGW32
         set CHERE_INVOKING=yes
-        C:\msys64\usr\bin\bash -l -c "./configure && make clean all && make test -k"
+        C:\msys64\usr\bin\bash -l -c "pacman -S --noconfirm mingw-w64-i686-gcc"
+        echo ::endgroup::
+        C:\msys64\usr\bin\bash -l -c "./configure && make all && make test -k"
 
   test-x86_64-centos:
     runs-on: ubuntu-latest
@@ -70,7 +82,7 @@ jobs:
 
   test-armv7-linux:
     runs-on: ubuntu-22.04
-    timeout-minutes: 6
+    timeout-minutes: 8
     steps:
     - uses: actions/checkout@v4
     - uses: uraimo/run-on-arch-action@v3
@@ -88,14 +100,14 @@ jobs:
 
   test-aarch64-linux:
     runs-on: ubuntu-22.04
-    timeout-minutes: 6
+    timeout-minutes: 8
     steps:
     - uses: actions/checkout@v4
     - uses: uraimo/run-on-arch-action@v3
       name: make & test tcc (aarch64-linux)
       with:
         arch: aarch64
-        distro: ubuntu22.04
+        distro: ubuntu24.04
         githubToken: ${{ github.token }}
         install: |
           apt-get update -q -y
@@ -106,7 +118,7 @@ jobs:
 
   test-riscv64-linux:
     runs-on: ubuntu-22.04
-    timeout-minutes: 6
+    timeout-minutes: 8
     steps:
     - uses: actions/checkout@v4
     - uses: uraimo/run-on-arch-action@v3

Makefile

@@ -252,8 +252,11 @@ LDFLAGS += -g
 endif
 
 # convert "include/tccdefs.h" to "tccdefs_.h"
-%_.h : include/%.h conftest.c
-	$S$(CC) -DC2STR $(filter %.c,$^) -o c2str.exe && ./c2str.exe $< $@
+%_.h : include/%.h c2str.exe
+	$S./c2str.exe $< $@
+
+c2str.exe : conftest.c
+	$S$(CC) -DC2STR $< -o $@
 
 # target specific object rule
 $(X)%.o : %.c $(LIBTCC_INC)

arm-gen.c

@@ -1311,10 +1311,6 @@ static int copy_params(int nb_args, struct plan *plan, int todo)
   if (++pass < 2)
     goto again;
 
-  /* Manually free remaining registers since next parameters are loaded
-   * manually, without the help of gv(int). */
-  save_regs(nb_args);
-
   if(todo) {
     o(0xE8BD0000|todo); /* pop {todo} */
     for(pplan = plan->clsplans[CORE_STRUCT_CLASS]; pplan; pplan = pplan->prev) {
@@ -1354,6 +1350,8 @@ void gfunc_call(int nb_args)
     gbound_args(nb_args);
 #endif
 
+  save_regs(nb_args + 1);
+
 #ifdef TCC_ARM_EABI
   if (float_abi == ARM_HARD_FLOAT) {
     variadic = (vtop[-nb_args].type.ref->f.func_type == FUNC_ELLIPSIS);

arm64-gen.c

@@ -997,6 +997,8 @@ ST_FUNC void gfunc_call(int nb_args)
     int variadic = (vtop[-nb_args].type.ref->f.func_type == FUNC_ELLIPSIS);
     int var_nb_arg = n_func_args(&vtop[-nb_args].type);
 
+    save_regs(nb_args + 1);
+
 #ifdef CONFIG_TCC_BCHECK
     if (tcc_state->do_bounds_check)
         gbound_args(nb_args);
@@ -1101,9 +1103,6 @@ ST_FUNC void gfunc_call(int nb_args)
             // value in floating-point registers
             if ((vtop->type.t & VT_BTYPE) == VT_STRUCT) {
                 uint32_t j, sz, n = arm64_hfa(&vtop->type, &sz);
-                // save regs because struct may overwrite previous func call result
-                save_regs(0);
-
                 vtop->type.t = VT_PTR;
                 gaddrof();
                 gv(RC_R30);
@@ -1129,7 +1128,6 @@ ST_FUNC void gfunc_call(int nb_args)
             vswap();
     }
 
-    save_regs(0);
     arm64_gen_bl_or_b(0);
     --vtop;
     if (stack & 0xfff)

i386-asm.c

@@ -1002,21 +1002,24 @@ ST_FUNC void asm_opcode(TCCState *s1, int opcode)
     modrm_index = -1;
     modreg_index = -1;
     if (pa->instr_type & OPC_MODRM) {
-#ifdef TCC_TARGET_X86_64
 	if (!nb_ops) {
 	    /* A modrm opcode without operands is a special case (e.g. mfence).
 	       It has a group and acts as if there's an register operand 0 */
 	    i = 0;
 	    ops[i].type = OP_REG;
+#ifdef TCC_TARGET_X86_64
 	    if (pa->sym == TOK_ASM_endbr64)
 	      ops[i].reg = 2; // dx
 	    else if (pa->sym >= TOK_ASM_lfence && pa->sym <= TOK_ASM_sfence)
   	      ops[i].reg = 0; // ax
+#else
+	    if (pa->sym == TOK_ASM_endbr32)
+	      ops[i].reg = 3; // bx
+#endif
 	    else
 	      tcc_error("bad MODR/M opcode without operands");
 	    goto modrm_found;
 	}
-#endif
         /* first look for an ea operand */
         for(i = 0;i < nb_ops; i++) {
             if (op_type[i] & OP_EA)

i386-asm.h

@@ -37,7 +37,10 @@
      DEF_ASM_OP0(pause, 0xf390)
      DEF_ASM_OP0(xlat, 0xd7)
 
-     /* strings */
+    /* Control-Flow Enforcement */
+    DEF_ASM_OP0L(endbr32, 0xf30f1e, 7, OPC_MODRM)
+
+    /* strings */
 ALT(DEF_ASM_OP0L(cmpsb, 0xa6, 0, OPC_BWLX))
 ALT(DEF_ASM_OP0L(scmpb, 0xa6, 0, OPC_BWLX))
 

i386-gen.c

@@ -406,6 +406,8 @@ ST_FUNC void gfunc_call(int nb_args)
         gbound_args(nb_args);
 #endif
 
+    save_regs(nb_args + 1);
+
     args_size = 0;
     for(i = 0;i < nb_args; i++) {
         if ((vtop->type.t & VT_BTYPE) == VT_STRUCT) {
@@ -463,7 +465,7 @@ ST_FUNC void gfunc_call(int nb_args)
         }
         vtop--;
     }
-    save_regs(0); /* save used temporary registers */
+
     func_sym = vtop->type.ref;
     func_call = func_sym->f.func_call;
     /* fast call case */