Allow atexit to be used with -run

Add atexit code to tccrun.c and added testcase 128

herman ten brugge committed 3 years ago

Commit ac0604a1 parent 065b4013 files · +51 −0Browse files

Unified · Split

3 files

tccrun.c +29 −0
tests/tests2/128_run_atexit.c +20 −0
tests/tests2/128_run_atexit.expect +2 −0

 static void set_exception_handler(void);
 static int _rt_error(void *fp, void *ip, const char *fmt, va_list ap);
 static void rt_exit(int code);
+static void init_atexit(void);
+static void run_atexit(void);
+static int rt_atexit(void (*function)(void));
 #endif /* CONFIG_TCC_BACKTRACE */
 /* defined when included from lib/bt-exe.c */
     if (s1->do_debug)
         tcc_add_symbol(s1, "exit", rt_exit);
 #endif
+    tcc_add_symbol(s1, "atexit", rt_atexit);
     if (tcc_relocate(s1, TCC_RELOCATE_AUTO) < 0)
         return -1;
     prog_main = (void*)get_sym_addr(s1, s1->runtime_main, 1, 1);
     errno = 0; /* clean errno value */
     fflush(stdout);
     fflush(stderr);
+    init_atexit();
     /* These aren't C symbols, so don't need leading underscore handling.  */
     run_cdtors(s1, "__init_array_start", "__init_array_end", argc, argv, envp);
 #ifdef CONFIG_TCC_BACKTRACE
         ret = prog_main(argc, argv, envp);
     }
     run_cdtors(s1, "__fini_array_start", "__fini_array_end", 0, NULL, NULL);
+    run_atexit();
     if ((s1->dflag & 16) && ret)
         fprintf(s1->ppfp, "[returns %d]\n", ret), fflush(s1->ppfp);
     return ret;
     exit(code);
 }
+#define	NR_AT_EXIT	32
+static int nr_atexit = 0;
+static void (*at_exitfunc[NR_AT_EXIT])(void);
+static void init_atexit(void)
+{
+    nr_atexit = 0;
+}
+static void run_atexit(void)
+{
+    while (nr_atexit)
+	at_exitfunc[--nr_atexit]();
+}
+static int rt_atexit(void (*function)(void))
+{
+    if (nr_atexit < NR_AT_EXIT)
+	at_exitfunc[nr_atexit++] = function;
+    return 1;
+}
 /* ------------------------------------------------------------- */
 #ifndef _WIN32

tests/tests2/128_run_atexit.c+20−0

@@ -0,0 +1,20 @@
	1	#include <stdio.h>
	2	#include <stdlib.h>
	3
	4	void cleanup1(void)
	5	{
	6	printf ("cleanup1\n");
	7	}
	8
	9	void cleanup2(void)
	10	{
	11	printf ("cleanup2\n");
	12	}
	13
	14	int main(int argc, char **argv)
	15	{
	16	atexit(cleanup1);
	17	atexit(cleanup2);
	18	return 0;
	19	}
	20

tests/tests2/128_run_atexit.expect+2−0

@@ -0,0 +1,2 @@
	1	cleanup2
	2	cleanup1

Allow atexit to be used with -run

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code